rationalize list handling in mutt a bit.

[apps/madmutt.git] / imap / auth_cram.c

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index e4ea149..0438a82 100644 (file)
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -17,12 +17,12 @@
 #include "imap_private.h"
 #include "auth.h"
 
-#include "md5.h"
 #define MD5_BLOCK_LEN 64
 #define MD5_DIGEST_LEN 16
 
 #include <lib-lib/macros.h>
-#include "lib/debug.h"
+#include <lib-lib/debug.h>
+#include <lib-hash/hash.h>
 
 /* forward declarations */
 static void hmac_md5 (const char *password, char *challenge,
@@ -102,7 +102,7 @@ imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA * idata, const char *method)
 
   mutt_to_base64 ((unsigned char *) ibuf, (unsigned char *) obuf,
                   m_strlen(obuf), sizeof (ibuf) - 2);
-  str_cat (ibuf, sizeof (ibuf), "\r\n");
+  m_strcat(ibuf, sizeof(ibuf), "\r\n");
   mutt_socket_write (idata->conn, ibuf);
 
   do
@@ -143,14 +143,14 @@ static void hmac_md5 (const char *password, char *challenge,
     MD5Init (&ctx);
     MD5Update (&ctx, (unsigned char *) password, secret_len);
     MD5Final (hash_passwd, &ctx);
-    strfcpy ((char *) secret, (char *) hash_passwd, MD5_DIGEST_LEN);
+    m_strcpy((char *)secret, MD5_DIGEST_LEN, (char *)hash_passwd);
     secret_len = MD5_DIGEST_LEN;
   }
   else
-    strfcpy ((char *) secret, password, sizeof (secret));
+    m_strcpy((char *)secret, sizeof(secret), password);
 
-  memset (ipad, 0, sizeof (ipad));
-  memset (opad, 0, sizeof (opad));
+  p_clear(ipad, 1);
+  p_clear(opad, 1);
   memcpy (ipad, secret, secret_len);
   memcpy (opad, secret, secret_len);