summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-06-18 06:44:39 +0000
committerthomascube <thomas@roundcube.net>2008-06-18 06:44:39 +0000
commit1fb78c57ccd93c5fd58c2c42a82824dae738417c (patch)
tree3aa4e760d99e4205d3f1cf6077442791ca29fe8e
parentccd944ea2100e59a71ed39781b2164dc58029ace (diff)
Revert changes from r994 and make cram-md5 work again (#1484819)
-rw-r--r--program/include/rcube_imap.php4
-rw-r--r--program/lib/imap.inc12
2 files changed, 7 insertions, 9 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 7f3fd9a1b..fb3870b29 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -102,7 +102,7 @@ class rcube_imap
* @return boolean TRUE on success, FALSE on failure
* @access public
*/
- function connect($host, $user, $pass, $port=143, $use_ssl=null, $auth_type='check')
+ function connect($host, $user, $pass, $port=143, $use_ssl=null, $auth_type=null)
{
global $ICL_SSL, $ICL_PORT, $IMAP_USE_INTERNAL_DATE;
@@ -119,7 +119,7 @@ class rcube_imap
$ICL_PORT = $port;
$IMAP_USE_INTERNAL_DATE = false;
- $this->conn = iil_Connect($host, $user, $pass, array('imap' => $auth_type));
+ $this->conn = iil_Connect($host, $user, $pass, array('imap' => $auth_type ? $auth_type : 'check'));
$this->host = $host;
$this->user = $user;
$this->pass = $pass;
diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index e2cd724da..7a1ac0aa7 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -297,12 +297,10 @@ function iil_C_Authenticate(&$conn, $user, $pass, $encChallenge) {
}
// generate hash
- $hash = iil_xor($pass,$opad);
- $hash .= pack("H*", md5(iil_xor($pass, $ipad) . base64_decode($encChallenge)));
- $hash = md5($hash);
+ $hash = md5(iil_xor($pass,$opad) . pack("H*", md5(iil_xor($pass, $ipad) . base64_decode($encChallenge))));
// generate reply
- $reply = base64_encode('"' . $user . '" "' . $hash . '"');
+ $reply = base64_encode($user . ' ' . $hash);
// send result, get reply
iil_PutLine($conn->fp, $reply);
@@ -544,9 +542,9 @@ function iil_Connect($host, $user, $password) {
//do CRAM-MD5 authentication
iil_PutLine($conn->fp, "a000 AUTHENTICATE CRAM-MD5");
$line = trim(iil_ReadLine($conn->fp, 1024));
-
+
$conn->message .= "$line\n";
-
+
if ($line[0] == '+') {
$conn->message .= 'Got challenge: ' . htmlspecialchars($line) . "\n";
@@ -556,7 +554,7 @@ function iil_Connect($host, $user, $password) {
$conn->message .= "Tried CRAM-MD5: $result \n";
} else {
$conn->message .='No challenge ('.htmlspecialchars($line)."), try plain\n";
- $auth = 'plain';
+ $auth = 'plain';
}
}