[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /auth lonauth.pm

[raeburn]

raeburn		Thu Aug 11 09:24:13 2016 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/auth	lonauth.pm 
  Log:
  - For 2.11
    - Backport 1.139 (part)
  
  
Index: loncom/auth/lonauth.pm
diff -u loncom/auth/lonauth.pm:1.121.2.13 loncom/auth/lonauth.pm:1.121.2.14
--- loncom/auth/lonauth.pm:1.121.2.13	Mon Jan 26 22:25:41 2015
+++ loncom/auth/lonauth.pm	Thu Aug 11 09:24:13 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.121.2.13 2015/01/26 22:25:41 raeburn Exp $
+# $Id: lonauth.pm,v 1.121.2.14 2016/08/11 09:24:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -356,26 +356,7 @@
         (undef,$form{'iptoken'}) = split('=',$iptokenstr);
     }
 
-    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($form{'upass'.$i},0,16))));
-
-	$chunk.=
-	    $cipher->decrypt(unpack("a8",pack("H16",substr($form{'upass'.$i},16,16))));
-
-	$chunk=substr($chunk,1,ord(substr($chunk,0,1)));
-	$upass.=$chunk;
-    }
+    my $upass = &Apache::loncommon::des_decrypt($key,$form{'upass0'});
 
 # ---------------------------------------------------------------- Authenticate