Changeset 5198:9cfb5ac98e26 for imap/auth_cram.c

Timestamp:

2007-08-27 11:07:42 (17 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Update auth_cram for new MD5 code (untested).

Files:

• imap/auth_cram.c (modified) (3 diffs)

imap/auth_cram.c

@@ -135 +135 @@
   unsigned char* response)
 {
-  MD5_CTX ctx;
+  struct md5_ctx ctx;
   unsigned char ipad[MD5_BLOCK_LEN], opad[MD5_BLOCK_LEN];
   unsigned char secret[MD5_BLOCK_LEN+1];
@@ -149 +149 @@
   if (secret_len > MD5_BLOCK_LEN)
   {
-    MD5Init (&ctx);
-    MD5Update (&ctx, (unsigned char*) password, secret_len);
-    MD5Final (hash_passwd, &ctx);
+    md5_buffer (password, secret_len, hash_passwd);
     strfcpy ((char*) secret, (char*) hash_passwd, MD5_DIGEST_LEN);
     secret_len = MD5_DIGEST_LEN;
@@ -170 +168 @@
 
   /* inner hash: challenge and ipadded secret */
-  MD5Init (&ctx);
-  MD5Update (&ctx, ipad, MD5_BLOCK_LEN);
-  MD5Update (&ctx, (unsigned char*) challenge, chal_len);
-  MD5Final (response, &ctx);
+  md5_init_ctx (&ctx);
+  md5_process_bytes (ipad, MD5_BLOCK_LEN, &ctx);
+  md5_process_bytes (challenge, chal_len, &ctx);
+  md5_finish_ctx (&ctx, response);
 
   /* outer hash: inner hash and opadded secret */
-  MD5Init (&ctx);
-  MD5Update (&ctx, opad, MD5_BLOCK_LEN);
-  MD5Update (&ctx, response, MD5_DIGEST_LEN);
-  MD5Final (response, &ctx);
+  md5_init_ctx (&ctx);
+  md5_process_bytes (opad, MD5_BLOCK_LEN, &ctx);
+  md5_process_bytes (response, MD5_DIGEST_LEN, &ctx);
+  md5_finish_ctx (&ctx, response);
 }