X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth_cram.c;h=14772b03e09edb42f72bf8711cc021c32830ad59;hp=3843ca34f88f1559fbd99f21844382caaf8bbef6;hb=22601f25ede6703ba7cd06ee84eddd2045308570;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index 3843ca3..14772b0 100644
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -17,11 +17,12 @@
 #include "imap_private.h"
 #include "auth.h"
 
-#include "md5.h"
 #define MD5_BLOCK_LEN 64
 #define MD5_DIGEST_LEN 16
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
+#include <lib-hash/hash.h>
+#include "lib/debug.h"
 
 /* forward declarations */
 static void hmac_md5 (const char *password, char *challenge,
@@ -41,7 +42,7 @@ imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA * idata, const char *method)
   mutt_message _("Authenticating (CRAM-MD5)...");
 
   /* get auth info */
-  if (mutt_account_getuser (&idata->conn->account))
+  if (mutt_account_getlogin (&idata->conn->account))
     return IMAP_AUTH_FAILURE;
   if (mutt_account_getpass (&idata->conn->account))
     return IMAP_AUTH_FAILURE;
@@ -59,17 +60,17 @@ imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA * idata, const char *method)
   while (rc == IMAP_CMD_CONTINUE);
 
   if (rc != IMAP_CMD_RESPOND) {
-    dprint (1, (debugfile, "Invalid response from server: %s\n", ibuf));
+    debug_print (1, ("Invalid response from server: %s\n", ibuf));
     goto bail;
   }
 
   if ((len = mutt_from_base64 (obuf, idata->cmd.buf + 2)) == -1) {
-    dprint (1, (debugfile, "Error decoding base64 response.\n"));
+    debug_print (1, ("Error decoding base64 response.\n"));
     goto bail;
   }
 
   obuf[len] = '\0';
-  dprint (2, (debugfile, "CRAM challenge: %s\n", obuf));
+  debug_print (2, ("CRAM challenge: %s\n", obuf));
 
   /* The client makes note of the data and then responds with a string
    * consisting of the user name, a space, and a 'digest'. The latter is
@@ -93,15 +94,15 @@ imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA * idata, const char *method)
             hmac_response[9], hmac_response[10], hmac_response[11],
             hmac_response[12], hmac_response[13], hmac_response[14],
             hmac_response[15]);
-  dprint (2, (debugfile, "CRAM response: %s\n", obuf));
+  debug_print (2, ("CRAM response: %s\n", obuf));
 
   /* XXX - ibuf must be long enough to store the base64 encoding of obuf, 
    * plus the additional debris
    */
 
   mutt_to_base64 ((unsigned char *) ibuf, (unsigned char *) obuf,
-                  safe_strlen (obuf), sizeof (ibuf) - 2);
-  safe_strcat (ibuf, sizeof (ibuf), "\r\n");
+                  m_strlen(obuf), sizeof (ibuf) - 2);
+  m_strcat(ibuf, sizeof(ibuf), "\r\n");
   mutt_socket_write (idata->conn, ibuf);
 
   do
@@ -109,7 +110,7 @@ imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA * idata, const char *method)
   while (rc == IMAP_CMD_CONTINUE);
 
   if (rc != IMAP_CMD_OK) {
-    dprint (1, (debugfile, "Error receiving server response.\n"));
+    debug_print (1, ("Error receiving server response.\n"));
     goto bail;
   }
 
@@ -133,8 +134,8 @@ static void hmac_md5 (const char *password, char *challenge,
   unsigned int secret_len, chal_len;
   int i;
 
-  secret_len = safe_strlen (password);
-  chal_len = safe_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 */
@@ -142,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);