]> source.dussan.org Git - redmine.git/commitdiff
Use Digest::SHA instead of Digest::SHA1 in Redmine.pm (#10242).
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Wed, 15 Feb 2012 19:25:16 +0000 (19:25 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Wed, 15 Feb 2012 19:25:16 +0000 (19:25 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8882 e93f8b46-1217-0410-a6f0-8f06a7374b81

extra/svn/Redmine.pm

index 31f204d8a79eaf684bd71ac9438992baeaf3d785..fcc87ca131bb7e3bb5572e4ffae4b189acea7293 100644 (file)
@@ -99,7 +99,7 @@ use strict;
 use warnings FATAL => 'all', NONFATAL => 'redefine';
 
 use DBI;
-use Digest::SHA1;
+use Digest::SHA;
 # optional module for LDAP authentication
 my $CanUseLDAPAuth = eval("use Authen::Simple::LDAP; 1");
 
@@ -327,7 +327,7 @@ sub is_member {
   my $dbh         = connect_database($r);
   my $project_id  = get_project_identifier($r);
 
-  my $pass_digest = Digest::SHA1::sha1_hex($redmine_pass);
+  my $pass_digest = Digest::SHA::sha1_hex($redmine_pass);
 
   my $access_mode = defined $read_only_methods{$r->method} ? "R" : "W";
 
@@ -346,7 +346,7 @@ sub is_member {
 
       unless ($auth_source_id) {
                                my $method = $r->method;
-          my $salted_password = Digest::SHA1::sha1_hex($salt.$pass_digest);
+          my $salted_password = Digest::SHA::sha1_hex($salt.$pass_digest);
                                        if ($hashed_password eq $salted_password && (($access_mode eq "R" && $permissions =~ /:browse_repository/) || $permissions =~ /:commit_access/) ) {
               $ret = 1;
               last;