From 254464339ec2b164905be726922649ad9672bd83 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Sun, 18 Apr 2010 16:54:33 +0200 Subject: Fix MD5Digest prototype and remove unneeded type casts. --- fetchmail.h | 2 +- fm_md5.h | 2 +- pop3.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fetchmail.h b/fetchmail.h index bc9abf03..40ab2eb8 100644 --- 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 6fccc526..5243c51b 100644 --- a/fm_md5.h +++ b/fm_md5.h @@ -8,7 +8,7 @@ #ifdef HAVE_MD5_H #include #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 90d91bf2..abd690e8 100644 --- 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); -- cgit v1.2.3