X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=cram.c;h=f7559e6d9668792ef42c30ebd6dc1327c1e5a5cb;hb=f16d8d23439b5569f0c2e1af22494708b507f277;hp=ee97475a54aa23a3cbf49000f6273ddd7110647c;hpb=88b314909859b90a8b957e1c2975cb32e7e53375;p=~andy%2Ffetchmail

diff --git a/cram.c b/cram.c
index ee97475a..f7559e6d 100644
--- a/cram.c
+++ b/cram.c
@@ -8,23 +8,21 @@
 #include  <stdio.h>
 #include  <string.h>
 #include  <ctype.h>
-#if defined(STDC_HEADERS)
 #include  <stdlib.h>
-#endif
 #include  "fetchmail.h"
 #include  "socket.h"
 
-#include  "i18n.h"
-#include "md5.h"
+#include  "gettext.h"
+#include "fm_md5.h"
 
-void hmac_md5 (char *password,  size_t pass_len,
-               char *challenge, size_t chal_len,
+void hmac_md5 (const unsigned char *password,  size_t pass_len,
+               const unsigned char *challenge, size_t chal_len,
                unsigned char *response,  size_t resp_len)
 {
     int i;
     unsigned char ipad[64];
     unsigned char opad[64];
-    char hash_passwd[16];
+    unsigned char hash_passwd[16];
 
     MD5_CTX ctx;
     
@@ -60,7 +58,7 @@ void hmac_md5 (char *password,  size_t pass_len,
     MD5Final (response, &ctx);
 }
 
-int do_cram_md5 (int sock, char *command, struct query *ctl, char *strip)
+int do_cram_md5 (int sock, const char *command, struct query *ctl, const char *strip)
 /* authenticate as per RFC2195 */
 {
     int result;
@@ -110,8 +108,8 @@ int do_cram_md5 (int sock, char *command, struct query *ctl, char *strip)
      * (including angle-brackets).
      */
 
-    hmac_md5(ctl->password, strlen(ctl->password),
-              msg_id, strlen (msg_id),
+    hmac_md5((unsigned char *)ctl->password, strlen(ctl->password),
+              (unsigned char *)msg_id, strlen (msg_id),
               response, sizeof (response));
 
     snprintf (reply, sizeof(reply),