X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fauth_cram.c;h=2b8e130252c8417916a5ba50c5ec43badf32e3af;hb=2ea77d3b2827ba23feb756ce2fb936565ae38998;hp=3cf9c5f03b07f22962f3be2667d49fec1b7efdad;hpb=fb514a63a7f58b76577fb30bfa260ad1b9239c41;p=apps%2Fmadmutt.git

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index 3cf9c5f..2b8e130 100644
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -21,7 +21,7 @@
 #define MD5_BLOCK_LEN 64
 #define MD5_DIGEST_LEN 16
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/debug.h"
 
 /* forward declarations */
@@ -101,8 +101,8 @@ imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA * idata, const char *method)
    */
 
   mutt_to_base64 ((unsigned char *) ibuf, (unsigned char *) obuf,
-                  mutt_strlen (obuf), sizeof (ibuf) - 2);
-  safe_strcat (ibuf, sizeof (ibuf), "\r\n");
+                  m_strlen(obuf), sizeof (ibuf) - 2);
+  str_cat (ibuf, sizeof (ibuf), "\r\n");
   mutt_socket_write (idata->conn, ibuf);
 
   do
@@ -134,8 +134,8 @@ static void hmac_md5 (const char *password, char *challenge,
   unsigned int secret_len, chal_len;
   int i;
 
-  secret_len = mutt_strlen (password);
-  chal_len = mutt_strlen (challenge);
+  secret_len = m_strlen(password);
+  chal_len = m_strlen(challenge);
 
   /* passwords longer than MD5_BLOCK_LEN bytes are substituted with their MD5
    * digests */
@@ -149,8 +149,8 @@ static void hmac_md5 (const char *password, char *challenge,
   else
     strfcpy ((char *) secret, password, sizeof (secret));
 
-  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);