X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fauth.php;h=3bd8f86f6a30d0b93b55c8b17dd3bf42ee3c216b;hb=3ab350426ee70647e8d97a0e85744d76315b5e84;hp=0de160c91499c646c2a6927eefc7de09c9b64b37;hpb=47a2932647c61c732b649a27b5dc7853bb6388ff;p=squirrelmail.git

diff --git a/functions/auth.php b/functions/auth.php
index 0de160c9..3bd8f86f 100644
--- a/functions/auth.php
+++ b/functions/auth.php
@@ -3,7 +3,7 @@
 /**
  * auth.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Contains functions used to do authentication.
@@ -49,7 +49,7 @@ function is_logged_in() {
         if (!sqsession_is_registered('session_expired_location')) {
            sqsession_register($session_expired_location,'session_expired_location');
         }
-        include_once( '../functions/display_messages.php' );
+        include_once( SM_PATH . 'functions/display_messages.php' );
         logout_error( _("You must be logged in to access this page.") );
         exit;
     }
@@ -59,10 +59,9 @@ function cram_md5_response ($username,$password,$challenge) {
 
 /* Given the challenge from the server, supply the response using
    cram-md5 (See RFC 2195 for details)
-   NOTE: Requires mhash extension to PHP
 */
 $challenge=base64_decode($challenge);
-$hash=bin2hex(mhash(MHASH_MD5,$challenge,$password));
+$hash=bin2hex(hmac_md5($challenge,$password));
 $response=base64_encode($username . " " . $hash) . "\r\n";
 return $response;
 }
@@ -73,12 +72,12 @@ function digest_md5_response ($username,$password,$challenge,$service,$host) {
   $result=digest_md5_parse_challenge($challenge);
   
 // verify server supports qop=auth
-  $qop = explode(",",$result['qop']);
+  // $qop = explode(",",$result['qop']);
   //if (!in_array("auth",$qop)) {
     // rfc2831: client MUST fail if no qop methods supported
    // return false;
   //}
-  $cnonce = base64_encode(bin2hex(mhash(MHASH_MD5, microtime())));
+  $cnonce = base64_encode(bin2hex(hmac_md5(microtime())));
   $ncount = "00000001";
 
   /* This can be auth (authentication only), auth-int (integrity protection), or
@@ -93,18 +92,18 @@ function digest_md5_response ($username,$password,$challenge,$service,$host) {
   $string_a1 = utf8_encode($username).":";
   $string_a1 .= utf8_encode($result['realm']).":";
   $string_a1 .= utf8_encode($password);
-  $string_a1 = mhash(MHASH_MD5, $string_a1);
+  $string_a1 = hmac_md5($string_a1);
   $A1 = $string_a1 . ":" . $result['nonce'] . ":" . $cnonce;
-  $A1 = bin2hex(mhash(MHASH_MD5, $A1));
+  $A1 = bin2hex(hmac_md5($A1));
   $A2 = "AUTHENTICATE:$digest_uri_value";
   // If qop is auth-int or auth-conf, A2 gets a little extra
   if ($qop_value != 'auth') {
     $A2 .= ':00000000000000000000000000000000';
   }
-  $A2 = bin2hex(mhash(MHASH_MD5, $A2));
+  $A2 = bin2hex(hmac_md5($A2));
 
   $string_response = $result['nonce'] . ':' . $ncount . ':' . $cnonce . ':' . $qop_value;
-  $response_value = bin2hex(mhash(MHASH_MD5, $A1.":".$string_response.":".$A2));
+  $response_value = bin2hex(hmac_md5($A1.":".$string_response.":".$A2));
 
   $reply = 'charset=utf-8,username="' . $username . '",realm="' . $result["realm"] . '",';
   $reply .= 'nonce="' . $result['nonce'] . '",nc=' . $ncount . ',cnonce="' . $cnonce . '",';
@@ -120,7 +119,7 @@ function digest_md5_parse_challenge($challenge) {
    returns an array. See the RFC for details on what's in the challenge string.
 */
   $challenge=base64_decode($challenge);
-  while (strlen($challenge)) {
+  while (isset($challenge)) {
     if ($challenge{0} == ',') { // First char is a comma, must not be 1st time through loop
       $challenge=substr($challenge,1);
     }
@@ -142,7 +141,11 @@ function digest_md5_parse_challenge($challenge) {
     } else {
       // We're in a "simple" value - explode to next comma
       $val=explode(',',$challenge,2);
-      $challenge=$val[1];
+      if (isset($val[1])) {
+	  	$challenge=$val[1];
+	  } else {
+	    unset($challenge);
+	  }
       $value=$val[0];
     }
     $parsed["$key"]=$value;
@@ -150,4 +153,30 @@ function digest_md5_parse_challenge($challenge) {
   return $parsed;
 }
 
+function hmac_md5($data, $key='') {
+    // Creates a HMAC digest that can be used for auth purposes
+    // See RFCs 2104, 2617, 2831
+    // Uses mhash() extension if available
+    if (extension_loaded('mhash')) {
+      if ($key== '') {
+        $mhash=mhash(MHASH_MD5,$data);
+      } else {
+        $mhash=mhash(MHASH_MD5,$data,$key);
+      }
+      return $mhash;
+    }
+    if (!$key) {
+         return pack('H*',md5($data));
+    }
+    $key = str_pad($key,64,chr(0x00));
+    if (strlen($key) > 64) {
+        $key = pack("H*",md5($key));
+    }
+    $k_ipad =  $key ^ str_repeat(chr(0x36), 64) ;
+    $k_opad =  $key ^ str_repeat(chr(0x5c), 64) ;
+    /* Heh, let's get recursive. */
+    $hmac=hmac_md5($k_opad . pack("H*",md5($k_ipad . $data)) );
+    return $hmac;
+}
+
 ?>