Attempt merging from 6.3.24.

[~andy/fetchmail] / md5ify.c

diff --git a/md5ify.c b/md5ify.c
index 62f7cc27d6a147f6893c17f8b5479c4dcf0ce327..41dd2e7ae35457cdea5ee3f1e8441937d40bb3fa 100644 (file)
--- a/md5ify.c
+++ b/md5ify.c
@@ -12,16 +12,13 @@
 
 #include <stdio.h>
 #include <string.h>
-
-#if defined(STDC_HEADERS)
 #include <string.h>
-#endif
 
-#include "md5.h"
+#include "fetchmail.h"
+#include "fm_md5.h"
 
 char *
-MD5Digest (s)
-unsigned char *s;
+MD5Digest (unsigned const char *s)
 {
   int i;
   MD5_CTX context;
@@ -29,9 +26,9 @@ unsigned char *s;
   static char ascii_digest [33];
 
   MD5Init(&context);
-  MD5Update(&context, s, strlen(s));
+  MD5Update(&context, s, strlen((const char *)s));
   MD5Final(digest, &context);
-  
+
   for (i = 0;  i < 16;  i++) 
     sprintf(ascii_digest+2*i, "%02x", digest[i]);