dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix bad hmac (no effect on LLNG itself but bug with future node handler)"

Browse Source 
I'll update node handler to avoid breaking change
This commit is contained in:
Xavier 2019-09-03 23:00:02 +02:00
parent 3e9a424090
commit a74f676773
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lemonldap-ng-common/lib/Lemonldap/NG/Common/Crypto.pm
View File

@ -14,7 +14,7 @@ use MIME::Base64;
use Digest::SHA;
use bytes;
our $VERSION = '2.0.6';
our $VERSION = '2.0.0';
my ( $newIv, $randG, $hash );
$hash = \&Digest::SHA::sha256;
@ -78,18 +78,19 @@ sub _getCipher {
sub encrypt {
my ( $self, $data, $low ) = @_;
# pad $data so that its length be multiple of 16 bytes
my $l = bytes::length($data) % 16;
$data .= "\0" x ( 16 - $l ) unless ( $l == 0 );
my $iv =
$low
? bytes::substr( Digest::SHA::sha1( rand() . time . {} ), 0, IV_LENGTH )
: $newIv->();
$data = $hash->($data) . $data;
# pad $data so that its length be multiple of 16 bytes
my $l = bytes::length($data) % 16;
$data .= "\0" x ( 16 - $l ) unless ( $l == 0 );
my $hmac = $hash->($data);
eval {
$data =
encode_base64( $iv . $self->_getCipher->set_iv($iv)->encrypt($data),
encode_base64(
$iv . $self->_getCipher->set_iv($iv)->encrypt( $hmac . $data ),
'' );
};
if ($@) {
@ -125,16 +126,16 @@ sub decrypt {
}
my $hmac = bytes::substr( $data, 0, HMAC_LENGTH );
$data = bytes::substr( $data, HMAC_LENGTH );
# Obscure Perl re bug...
$data .= "\0";
$data =~ s/\0*$//;
if ( $hash->($data) ne $hmac ) {
$msg = "Bad MAC";
return undef;
}
else {
$msg = '';
# Obscure Perl re bug...
$data .= "\0";
$data =~ s/\0*$//;
return $data;
}
}