Fix MD5Digest prototype and remove unneeded type casts.

diff --git a/fetchmail.h b/fetchmail.h
index bc9abf03c4766493d6a3297bb075f6343d13be3e..40ab2eb8944d1de30fca1a5e903db52224e9a64a 100644 (file)
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -651,7 +651,7 @@ extern char currentwd[1024], rcfiledir[1024];
 struct query *hostalloc(struct query *); 
 int parsecmdline (int, char **, struct runctl *, struct query *);
 char *prependdir (const char *, const char *);
-unsigned char *MD5Digest (unsigned const char *);
+char *MD5Digest (unsigned const char *);
 void hmac_md5 (const unsigned char *, size_t, const unsigned char *, size_t, unsigned char *, size_t);
 int POP3_auth_rpa(char *, char *, int socket);
 typedef RETSIGTYPE (*SIGHANDLERTYPE) (int);

diff --git a/fm_md5.h b/fm_md5.h
index 6fccc526347747f00a45ef9b3ae5f400e963c8ab..5243c51be2b6c058ea13f9e6b0cc6eda4a74c0b1 100644 (file)
--- a/fm_md5.h
+++ b/fm_md5.h
@@ -8,7 +8,7 @@
 #ifdef HAVE_MD5_H
 #include <md5.h>
 #else
-
+#include "fetchmail.h"
 #ifndef HEADER_MD5_H
 /* Try to avoid clashes with OpenSSL */
 #define HEADER_MD5_H 

diff --git a/pop3.c b/pop3.c
index 90d91bf2a9a0a77da0b8599db6e4195d236f7579..abd690e8096c7e1968bd8b7fc490aaf588825ea5 100644 (file)
--- a/pop3.c
+++ b/pop3.c
@@ -690,7 +690,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
        msg = (char *)xmalloc((end-start+1) + strlen(ctl->password) + 1);
        strcpy(msg,start);
        strcat(msg,ctl->password);
-       strcpy((char *)ctl->digest, (char *)MD5Digest((unsigned char *)msg));
+       strcpy((char *)ctl->digest, MD5Digest((unsigned char *)msg));
        free(msg);
 
        ok = gen_transact(sock, "APOP %s %s", ctl->remotename, ctl->digest);