From 39508cb784394c3ba3e6bdce5e19ddace6210060 Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Sat, 02 Feb 2008 12:50:06 -0500
Subject: [PATCH] * fixed #1484629 * some cs
---
program/lib/imap.inc | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index 6ef1e29..8cb5d4a 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -258,13 +258,15 @@
}
// generate hash
- $hash = md5(iil_xor($pass,$opad) . pack("H*",md5(iil_xor($pass, $ipad) . base64_decode($encChallenge))));
+ $hash = iil_xor($pass,$opad);
+ $hash .= pack("H*",md5(iil_xor($pass, $ipad) . base64_decode($encChallenge)));
+ $hash = md5($hash);
// generate reply
- $reply = base64_encode($user . ' ' . $hash);
+ $reply = base64_encode('"' . $user . '" "' . $hash . '"');
// send result, get reply
- fputs($conn->fp, $reply."\r\n");
+ fputs($conn->fp, $reply . "\r\n");
$line = iil_ReadLine($conn->fp, 1024);
// process result
@@ -273,7 +275,7 @@
$conn->errorNum = 0;
return $conn->fp;
}
- $conn->error .= 'Authentication for '.$user.' failed (AUTH): "';
+ $conn->error .= 'Authentication for ' . $user . ' failed (AUTH): "';
$conn->error .= htmlspecialchars($line) . '"';
$conn->errorNum = -2;
return false;
@@ -498,13 +500,16 @@
$conn->message.="$line\n";
if ($line[0] == "+") {
- $conn->message.='Got challenge: '.htmlspecialchars($line)."\n";
+ $conn->message .= 'Got challenge: ' . htmlspecialchars($line)."\n";
+
//got a challenge string, try CRAM-5
$result = iil_C_Authenticate($conn, $user, $password, substr($line,2));
- $conn->message.= "Tried CRAM-MD5: $result \n";
+
+ $conn->message .= "Tried CRAM-MD5: $result \n";
} else {
- $conn->message.='No challenge ('.htmlspecialchars($line)."), try plain\n";
- $auth = "plain";
+ $conn->message .='No challenge ('.htmlspecialchars($line)."), try plain\n";
+
+ $auth = 'plain';
}
}
--
Gitblit v1.9.1