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

Merge branch 'v2.0' (fix versions)

This commit is contained in:
Xavier 2019-09-03 23:14:45 +02:00
parent afd915f64c a74f676773
commit ba7f8695f7
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}
}

2
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/Fail.pm
View File

@ -6,6 +6,6 @@ sub run {
return $_[0]->SERVER_ERROR;
}
our $VERSION = '2.0.6';
our $VERSION = '2.1.0';
1;

2
lemonldap-ng-handler/lib/Plack/Middleware/Auth/LemonldapNG.pm
View File

@ -1,7 +1,7 @@
package Plack::Middleware::Auth::LemonldapNG;
our $AUTHORITY = 'cpan:GUIMARD';
our $VERSION = '2.1.0';
our $VERSION = '2.1.0';
our $llclass = 'Lemonldap::NG::Handler::Server';
use strict;

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Net/LDAP.pm
View File

@ -12,7 +12,7 @@ use Unicode::String qw(utf8);
use Scalar::Util 'weaken';
use utf8;
our $VERSION = '2.1.0';
our $VERSION = '2.1.0';
our $ppLoaded = 0;
BEGIN {