X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fauth_cram.c;h=3843ca34f88f1559fbd99f21844382caaf8bbef6;hb=d9ae612d6dba4f68f46a1a81eb77a326849f9184;hp=8b10f33a860acb60c74b934553939f27614ae55c;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281;p=apps%2Fmadmutt.git

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index 8b10f33..3843ca3 100644
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -1,19 +1,10 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1999-2000 Brendan Cully <brendan@kublai.com>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 /* IMAP login/authentication code */
@@ -25,11 +16,13 @@
 #include "mutt.h"
 #include "imap_private.h"
 #include "auth.h"
-#include "md5.h"
 
+#include "md5.h"
 #define MD5_BLOCK_LEN 64
 #define MD5_DIGEST_LEN 16
 
+#include "lib/intl.h"
+
 /* forward declarations */
 static void hmac_md5 (const char *password, char *challenge,
                       unsigned char *response);
@@ -107,7 +100,7 @@ imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA * idata, const char *method)
    */
 
   mutt_to_base64 ((unsigned char *) ibuf, (unsigned char *) obuf,
-                  strlen (obuf), sizeof (ibuf) - 2);
+                  safe_strlen (obuf), sizeof (ibuf) - 2);
   safe_strcat (ibuf, sizeof (ibuf), "\r\n");
   mutt_socket_write (idata->conn, ibuf);
 
@@ -140,8 +133,8 @@ static void hmac_md5 (const char *password, char *challenge,
   unsigned int secret_len, chal_len;
   int i;
 
-  secret_len = strlen (password);
-  chal_len = strlen (challenge);
+  secret_len = safe_strlen (password);
+  chal_len = safe_strlen (challenge);
 
   /* passwords longer than MD5_BLOCK_LEN bytes are substituted with their MD5
    * digests */