initial files for using vcard in the gui

[squirrelmail.git] / functions / auth.php

diff --git a/functions/auth.php b/functions/auth.php
index cb149dad2dc47ef7967f9bcd6c5cbd607adb3fb3..85eb8ff3bdf8299948d77e062a5552684d126615 100644 (file)
--- 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.
@@ -18,7 +18,7 @@ if (! isset($smtp_auth_mech)) {
 }
 
 if (! isset($imap_auth_mech)) {
-  $imap_auth_mech = 'plain';
+  $imap_auth_mech = 'login';
 }
 
 if (! isset($use_imap_tls)) {
@@ -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;
     }
@@ -61,7 +61,7 @@ function cram_md5_response ($username,$password,$challenge) {
    cram-md5 (See RFC 2195 for details)
 */
 $challenge=base64_decode($challenge);
-$hash=bin2hex(hmac($challenge,$password));
+$hash=bin2hex(hmac_md5($challenge,$password));
 $response=base64_encode($username . " " . $hash) . "\r\n";
 return $response;
 }
@@ -77,7 +77,7 @@ function digest_md5_response ($username,$password,$challenge,$service,$host) {
     // rfc2831: client MUST fail if no qop methods supported
    // return false;
   //}
-  $cnonce = base64_encode(bin2hex(hmac(microtime())));
+  $cnonce = base64_encode(bin2hex(hmac_md5(microtime())));
   $ncount = "00000001";
 
   /* This can be auth (authentication only), auth-int (integrity protection), or
@@ -92,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 = hmac($string_a1);
+  $string_a1 = hmac_md5($string_a1);
   $A1 = $string_a1 . ":" . $result['nonce'] . ":" . $cnonce;
-  $A1 = bin2hex(hmac($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(hmac($A2));
+  $A2 = bin2hex(hmac_md5($A2));
 
   $string_response = $result['nonce'] . ':' . $ncount . ':' . $cnonce . ':' . $qop_value;
-  $response_value = bin2hex(hmac($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 . '",';
@@ -153,7 +153,7 @@ function digest_md5_parse_challenge($challenge) {
   return $parsed;
 }
 
-function hmac($data, $key='') {
+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
@@ -174,8 +174,8 @@ function hmac($data, $key='') {
     }
     $k_ipad =  $key ^ str_repeat(chr(0x36), 64) ;
     $k_opad =  $key ^ str_repeat(chr(0x5c), 64) ;
-    /* Heh, let's get re-entrant. PHP is so kinky */
-    $hmac=hmac($k_opad . pack("H*",md5($k_ipad . $data)) );
+    /* Heh, let's get recursive. */
+    $hmac=hmac_md5($k_opad . pack("H*",md5($k_ipad . $data)) );
     return $hmac;
 }