projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finanzübersichtsbericht: wiederkehrende Rechnungen berücksichtigen
[kivitendo-erp.git]
/
SL
/
Auth
/
Password.pm
diff --git
a/SL/Auth/Password.pm
b/SL/Auth/Password.pm
index
5f876ce
..
5ae75ea
100644
(file)
--- a/
SL/Auth/Password.pm
+++ b/
SL/Auth/Password.pm
@@
-3,29
+3,24
@@
package SL::Auth::Password;
use strict;
use Carp;
use strict;
use Carp;
+use Digest::MD5 ();
+use Digest::SHA ();
sub hash {
my ($class, %params) = @_;
sub hash {
my ($class, %params) = @_;
- if (!$params{algorithm}) {
- $params{algorithm} = 'SHA1';
- $params{fallback_algorithm} = 'MD5';
- }
+ $params{algorithm} ||= 'SHA256S';
- if ($params{algorithm} eq 'SHA1') {
- if (eval { require Digest::SHA1; 1 }) {
- return '{SHA1}' . Digest::SHA1::sha1_hex($params{password});
+ my $salt = $params{algorithm} =~ m/S$/ ? $params{login} : '';
-
} elsif ($params{fallback_algorithm}
) {
-
return $class->hash_password(%params, algorithm => $params{fallback_algorithm
});
+
if ($params{algorithm} =~ m/^SHA256/
) {
+
return '{' . $params{algorithm} . '}' . Digest::SHA::sha256_hex($salt . $params{password
});
- } else {
- die 'Digest::SHA1 not available';
- }
+ } elsif ($params{algorithm} =~ m/^SHA1/) {
+ return '{' . $params{algorithm} . '}' . Digest::SHA::sha1_hex($salt . $params{password});
- } elsif ($params{algorithm} eq 'MD5') {
- require Digest::MD5;
- return '{MD5}' . Digest::MD5::md5_hex($params{password});
+ } elsif ($params{algorithm} =~ m/^MD5/) {
+ return '{' . $params{algorithm} . '}' . Digest::MD5::md5_hex($salt . $params{password});
} elsif ($params{algorithm} eq 'CRYPT') {
return '{CRYPT}' . crypt($params{password}, substr($params{login}, 0, 2));
} elsif ($params{algorithm} eq 'CRYPT') {
return '{CRYPT}' . crypt($params{password}, substr($params{login}, 0, 2));