X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=cram.c;h=f7559e6d9668792ef42c30ebd6dc1327c1e5a5cb;hb=40fe452223b5cc0ff5dbae0efa8551d7e96c1a5c;hp=16591b8d9540a960df6f7a06786b62f7a043f5fa;hpb=05cb2b9c62b323a1278c81b6cbe00b2e4186b4f4;p=~andy%2Ffetchmail

diff --git a/cram.c b/cram.c
index 16591b8d..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 (const char *password,  size_t pass_len,
-               const 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;
     
@@ -110,8 +108,8 @@ int do_cram_md5 (int sock, const char *command, struct query *ctl, const char *s
      * (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),