X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth_cram.c;h=4a54f48ec8ad1089075df315c8743843706aeda5;hp=de5686093c6d51847f31f5a36538b745a87a3c69;hb=5f6b586de5a46f2359a4fc392fd89f1716d847a3;hpb=814a01519c9605d479201b99eb16c97b0ad8635d

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index de56860..4a54f48 100644
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -42,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;
@@ -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,
-                  safe_strlen (obuf), sizeof (ibuf) - 2);
-  safe_strcat (ibuf, sizeof (ibuf), "\r\n");
+                  str_len (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 = safe_strlen (password);
-  chal_len = safe_strlen (challenge);
+  secret_len = str_len (password);
+  chal_len = str_len (challenge);
 
   /* passwords longer than MD5_BLOCK_LEN bytes are substituted with their MD5
    * digests */