proxmox-mirrors/pve-access-control
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-access-control synced 2025-08-07 11:43:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drop libdigest-hmac-perl dependency

Browse Source 
Its functionality is provided by perl core's Digest::SHA
module now.
This commit is contained in:
Wolfgang Bumiller 2016-07-01 10:15:27 +02:00 committed by Fabian Grünbichler
parent 175d238cc9
commit b10d0e266b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/AccessControl.pm
View File

@ -9,7 +9,6 @@ use Net::SSLeay;
use Net::IP; use Net::IP;
use MIME::Base64; use MIME::Base64;
use Digest::SHA; use Digest::SHA;
use Digest::HMAC_SHA1;
use URI::Escape; use URI::Escape;
use LWP::UserAgent; use LWP::UserAgent;
use PVE::Tools qw(run_command lock_file file_get_contents split_list safe_print); use PVE::Tools qw(run_command lock_file file_get_contents split_list safe_print);
@ -1184,7 +1183,8 @@ sub yubico_compute_param_sig {
$paramstr .= "$key=$param->{$key}"; $paramstr .= "$key=$param->{$key}";
} }
my $sig = uri_escape(encode_base64(Digest::HMAC_SHA1::hmac_sha1($paramstr, decode_base64($api_key || '')), '')); # hmac_sha1_base64 does not add '=' padding characters, so we use encode_base64
my $sig = uri_escape(encode_base64(Digest::SHA::hmac_sha1($paramstr, decode_base64($api_key || '')), ''));
return ($paramstr, $sig); return ($paramstr, $sig);
} }
@ -1202,7 +1202,7 @@ sub yubico_verify_otp {
$url = 'http://api2.yubico.com/wsapi/2.0/verify' if !defined($url); $url = 'http://api2.yubico.com/wsapi/2.0/verify' if !defined($url);
my $params = { my $params = {
nonce => Digest::HMAC_SHA1::hmac_sha1_hex(time(), rand()), nonce => Digest::SHA::hmac_sha1_hex(time(), rand()),
id => $api_id, id => $api_id,
otp => uri_escape($otp), otp => uri_escape($otp),
timestamp => 1, timestamp => 1,

2
control.in
View File

@ -3,7 +3,7 @@ Version: @@VERSION@@-@@PKGRELEASE@@
Section: perl Section: perl
Priority: optional Priority: optional
Architecture: @@ARCH@@ Architecture: @@ARCH@@
Depends: libc6 (>= 2.3), perl (>= 5.6.0-16), libcrypt-openssl-rsa-perl, libcrypt-openssl-random-perl, libjson-xs-perl, libjson-perl, libterm-readline-gnu-perl,libnet-ldap-perl, libpve-common-perl, pve-cluster, libauthen-pam-perl, libnet-ssleay-perl, libdigest-hmac-perl, liburi-perl, libwww-perl, oathtool, libmime-base32-perl Depends: libc6 (>= 2.3), perl (>= 5.6.0-16), libcrypt-openssl-rsa-perl, libcrypt-openssl-random-perl, libjson-xs-perl, libjson-perl, libterm-readline-gnu-perl,libnet-ldap-perl, libpve-common-perl, pve-cluster, libauthen-pam-perl, libnet-ssleay-perl, liburi-perl, libwww-perl, oathtool, libmime-base32-perl
Maintainer: Proxmox Support Team <support@proxmox.com> Maintainer: Proxmox Support Team <support@proxmox.com>
Description: Proxmox VE access control library Description: Proxmox VE access control library
This package contains the role based user management and access This package contains the role based user management and access