--- loncom/auth/lonauth.pm	2015/03/06 21:56:41	1.138
+++ loncom/auth/lonauth.pm	2016/02/17 19:15:40	1.139
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.138 2015/03/06 21:56:41 raeburn Exp $
+# $Id: lonauth.pm,v 1.139 2016/02/17 19:15:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -346,8 +346,8 @@ sub handler {
         (undef,$form{'iptoken'}) = split('=',$iptokenstr);
     }
 
-    my $upass = $ENV{HTTPS} ? join("", @form{qw(upass0 upass1 upass2)}) 
-        : decrypt($key, @form{qw(upass0 upass1 upass2)});
+    my $upass = $ENV{HTTPS} ? $form{'upass0'} 
+        : &Apache::loncommon::des_decrypt($key,$form{'upass0'});
 
 # ---------------------------------------------------------------- Authenticate
 
@@ -525,34 +525,6 @@ 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 {
     my ($r,$form,$authhost,$domdesc) = @_;
     return unless (ref($form) eq 'HASH');