Diff for /loncom/auth/lonauth.pm between versions 1.138 and 1.139

version 1.138, 2015/03/06 21:56:41 version 1.139, 2016/02/17 19:15:40
Line 346  sub handler { Line 346  sub handler {
         (undef,$form{'iptoken'}) = split('=',$iptokenstr);          (undef,$form{'iptoken'}) = split('=',$iptokenstr);
     }      }
   
     my $upass = $ENV{HTTPS} ? join("", @form{qw(upass0 upass1 upass2)})      my $upass = $ENV{HTTPS} ? $form{'upass0'}
         : decrypt($key, @form{qw(upass0 upass1 upass2)});          : &Apache::loncommon::des_decrypt($key,$form{'upass0'});
   
 # ---------------------------------------------------------------- Authenticate  # ---------------------------------------------------------------- Authenticate
   
Line 525  sub handler { Line 525  sub handler {
     }      }
 }  }
   
 sub decrypt {  
     my ($key, @chunks) = @_;  
   
     my $keybin = pack("H16",$key);  
   
     my $cipher;  
     if ($Crypt::DES::VERSION >= 2.03) {  
         $cipher = new Crypt::DES $keybin;  
     } else {  
         $cipher = new DES $keybin;  
     }  
   
     my $upass='';  
     for (my $i=0;$i<=2;$i++) {  
         my $chunk =  
             $cipher->decrypt(  
                 unpack("a8",pack("H16",substr($chunks[$i],0,16))));  
   
         $chunk .=  
             $cipher->decrypt(  
                 unpack("a8",pack("H16",substr($chunks[$i],16,16))));  
   
         $chunk = substr($chunk,1,ord(substr($chunk,0,1)));  
         $upass .= $chunk;  
     }  
     return $upass;  
 }  
   
 sub check_can_host {  sub check_can_host {
     my ($r,$form,$authhost,$domdesc) = @_;      my ($r,$form,$authhost,$domdesc) = @_;
     return unless (ref($form) eq 'HASH');      return unless (ref($form) eq 'HASH');

Removed from v.1.138  
changed lines
  Added in v.1.139


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>