X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=rpa.c;h=3f236ce945c40f56154aa9e75fc033b62e2519ef;hb=87bcf29364c4640edb87cc2186b965d1a564d70c;hp=e404e6aa8da48904239b3a6bdf57d16820294bdd;hpb=f6b7a3a3a1512c1a877f39b5bc606dcef2fcd922;p=~andy%2Ffetchmail

diff --git a/rpa.c b/rpa.c
index e404e6aa..3f236ce9 100644
--- a/rpa.c
+++ b/rpa.c
@@ -9,19 +9,24 @@
 
   The sole entry point is POP3_auth_rpa()
 
+  For license terms, see the file COPYING in this directory.
+
  ***********************************************************************/
 
 #include  "config.h"
 
 #if defined(POP3_ENABLE) && defined(RPA_ENABLE)
 #include  <stdio.h>
+#include  <stdlib.h>
 #include  <unistd.h>
 #include  <ctype.h>
-#include  <string.h> 
+#include  <string.h>
+#include  <sys/types.h>
 
 #include  "socket.h"
 #include  "fetchmail.h"
-#include  "md5.h"
+#include  "fm_md5.h"
+#include  "gettext.h"
 
 #ifdef TESTMODE
 extern unsigned char line1[];
@@ -31,23 +36,21 @@ extern unsigned char line3[];
 extern int linecount;
 #endif
 
-#ifndef NO_PROTO
-  /* prototypes for internal functions */
-  static int  POP3_rpa_resp(unsigned char* argbuf, int socket );
-  static void LenAppend(unsigned char** pptr, int len);
-  static int  LenSkip(unsigned char** pptr, int rxlen);
-  static int  DecBase64(unsigned char* bufp);
-  static void EncBase64(unsigned char* bufp, int len);
-  static void ToUnicode(unsigned char** pptr, unsigned char delim,
-			unsigned char* buf, int* plen, int conv);
-  static int  SetRealmService(unsigned char* bufp);
-  static void GenChallenge(unsigned char* buf, int len);
-  static int  DigestPassphrase(unsigned char* passphrase,
+/* prototypes for internal functions */
+static int  POP3_rpa_resp(char* argbuf, int socket );
+static void LenAppend(char** pptr, int len);
+static int  LenSkip(char** pptr, int rxlen);
+static int  DecBase64(char* bufp);
+static void EncBase64(char* bufp, int len);
+static void ToUnicode(char** pptr, char delim, unsigned char* buf, int* plen,
+			int conv);
+static int  SetRealmService(char* bufp);
+static void GenChallenge(unsigned char* buf, int len);
+static int  DigestPassphrase(char* passphrase,
 			       unsigned char* rbuf, int unicodeit);
-  static void CompUserResp();
-  static int  CheckUserAuth();
-  static void md5(unsigned char* in, int len, unsigned char* out);
-#endif
+static void CompUserResp(void);
+static int  CheckUserAuth(void);
+static void md5(const void* in, int len, unsigned char* out);
 
 /* RPA protocol definitions */
 
@@ -104,23 +107,23 @@ unsigned char   Kus[Kusl];                  /* Session key           */
   globals:       read outlevel.
  *********************************************************************/
 
-int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
+int POP3_auth_rpa (char *userid, char *passphrase, int socket)
 {
     int      ok,rxlen,verh,verl,i,rll;
-    unsigned char buf [POPBUFSIZE];
-    unsigned char *bufp;
+    char buf [POPBUFSIZE];
+    char *bufp;
     int      status,aulin,kuslin;
-    char* stdec[4] = { "Success" ,
-		       "Restricted user (something wrong with account)" ,
-		       "Invalid userid or passphrase" ,
-		       "Deity error" };
+    const char* stdec[4] = { N_("Success") ,
+		       N_("Restricted user (something wrong with account)") ,
+		       N_("Invalid userid or passphrase") ,
+		       N_("Deity error") };
 
     /* Initiate RPA authorisation */
 
     SockPrintf(socket,"AUTH RPA\r\n");
 
     if (outlevel >= O_MONITOR)
-	error(0, 0, "> AUTH RPA\n");
+	report(stdout, "> AUTH RPA\n");
 
     /* Create unicode user name in Nu.              */
     /* Create MD5 digest of user's passphrase in Pu */
@@ -134,7 +137,7 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
     if ((ok = POP3_rpa_resp(buf,socket)) != 0)
     {
 	if (outlevel > O_SILENT && outlevel < O_MONITOR)
-	    error(0, 0, "%s\n",buf);
+	    report(stdout, "%s\n",buf);
 
 	return(ok);
     }
@@ -156,17 +159,17 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
     SockPrintf(socket,"%s\r\n",buf);
 #endif
     if (outlevel >= O_MONITOR)
-	error(0, 0, "> %s\n",buf);
+	report(stdout, "> %s\n",buf);
     if ((ok = POP3_rpa_resp(buf,socket)) != 0)
     {
 	if (outlevel > O_SILENT && outlevel < O_MONITOR)
-	    error(0, 0, "%s\n",buf);
+	    report(stdout, "%s\n",buf);
 	return(ok);
     }
     if ((rxlen = DecBase64(buf)) == 0)
     {
 	if (outlevel > O_SILENT)
-	    error(0, 0, "RPA token 2: Base64 decode error\n");
+	    report(stderr, GT_("RPA token 2: Base64 decode error\n"));
 	return(PS_RPA);
     }
     bufp = buf;
@@ -175,37 +178,37 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
 
     /* Interpret Token 2 */
 
-    verh = *(bufp++); verl = *(bufp++);
+    verh = (unsigned char)*(bufp++); verl = (unsigned char)*(bufp++);
     if (outlevel >= O_DEBUG)
-	error(0, 0, "Service chose RPA version %d.%d\n",verh,verl);
-    Csl  = *(bufp++);
+	report(stdout, GT_("Service chose RPA version %d.%d\n"),verh,verl);
+    Csl  = (unsigned char)*(bufp++);
     memcpy(Cs, bufp, Csl);
     bufp += Csl;
     if (outlevel >= O_DEBUG)
     {
-	error(0, 0, "Service challenge (l=%d):",Csl);
+	report(stdout, GT_("Service challenge (l=%d):\n"),Csl);
 	for (i=0; i<Csl; i++)
-	    error_build("%02X ",Cs[i]);
-	error_complete(0, 0, "");
+	    report_build(stdout, "%02X ",Cs[i]);
+	report_complete(stdout, "\n");
     }
     memcpy(Ts, bufp, Tsl);
     Ts[Tsl] = 0;
     bufp += Tsl;
     if (outlevel >= O_DEBUG)
-	error(0, 0, "Service timestamp %s\n",Ts);
-    rll = *(bufp++) << 8; rll = rll | *(bufp++);
+	report(stdout, GT_("Service timestamp %s\n"),Ts);
+    rll = (unsigned char)*(bufp++) << 8; rll = rll | (unsigned char)*(bufp++);
     if ((bufp-buf+rll) != rxlen)
     {
 	if (outlevel > O_SILENT)
-	    error(0, 0, "RPA token 2 length error\n");
+	    report(stderr, GT_("RPA token 2 length error\n"));
 	return(PS_RPA);
     }
     if (outlevel >= O_DEBUG)
-	error(0, 0, "Realm list: %s\n",bufp);
+	report(stdout, GT_("Realm list: %s\n"),bufp);
     if (SetRealmService(bufp) != 0)
     {
 	if (outlevel > O_SILENT)
-	    error(0, 0, "RPA error in service@realm string\n");
+	    report(stderr, GT_("RPA error in service@realm string\n"));
 	return(PS_RPA);
     }
 
@@ -232,17 +235,17 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
     SockPrintf(socket,"%s\r\n",buf);
 #endif
     if (outlevel >= O_MONITOR)
-	error(0, 0, "> %s\n",buf);
+	report(stdout, "> %s\n",buf);
     if ((ok = POP3_rpa_resp(buf,socket)) != 0)
     {
 	if (outlevel > O_SILENT && outlevel < O_MONITOR)
-	    error(0, 0, "%s\n",buf);
+	    report(stdout, "%s\n",buf);
 	return(ok);
     }
     if ((rxlen = DecBase64(buf)) == 0)
     {
 	if (outlevel > O_SILENT)
-	    error(0, 0, "RPA token 4: Base64 decode error\n");
+	    report(stderr, GT_("RPA token 4: Base64 decode error\n"));
 	return(PS_RPA);
     }
     bufp = buf;
@@ -250,13 +253,13 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
 
     /* Interpret Token 4 */
 
-    aulin = *(bufp++);
+    aulin = (unsigned char)*(bufp++);
     if (outlevel >= O_DEBUG)
     {
-	error(0, 0, "User authentication (l=%d):",aulin);
+	report(stdout, GT_("User authentication (l=%d):\n"),aulin);
 	for (i=0; i<aulin; i++)
-	    error_build("%02X ",bufp[i]);
-	error_complete(0, 0, "");
+	    report_build(stdout, "%02X ",bufp[i]);
+	report_complete(stdout, "\n");
     }
     if (aulin == Aul) memcpy(Au, bufp, Aul);
     bufp += aulin;
@@ -267,46 +270,49 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
     {
 	status = *(bufp++);
 	if (outlevel >= O_DEBUG)
-	    error(0, 0, "RPA status: %02X\n",status);
+	    report(stdout, GT_("RPA status: %02X\n"),status);
     }
     else status = 0;
     if ((bufp - buf) != rxlen)
     {
 	if (outlevel > O_SILENT)
-	    error(0, 0, "RPA token 4 length error\n");
+	    report(stderr, GT_("RPA token 4 length error\n"));
 	return(PS_RPA);
     }
     if (status != 0)
     {
-	if (outlevel > O_SILENT)
-	    if (status < 4)
-		error(0, 0, "RPA rejects you: %s\n",stdec[status]);
-	    else
-		error(0, 0, "RPA rejects you, reason unknown\n");
+	if (outlevel > O_SILENT) {
+	    if (status < 4) {
+		report(stderr, GT_("RPA rejects you: %s\n"),GT_(stdec[status]));
+	    } else {
+		report(stderr, GT_("RPA rejects you, reason unknown\n"));
+	    }
+	}
 	return(PS_AUTHFAIL);
     }
     if (Aul != aulin)
     {
-	error(0, 0, "RPA User Authentication length error: %d\n",aulin);
+	report(stderr, 
+	       GT_("RPA User Authentication length error: %d\n"),aulin);
 	return(PS_RPA);
     }
     if (Kusl != kuslin)
     {
-	error(0, 0, "RPA Session key length error: %d\n",kuslin);
+	report(stderr, GT_("RPA Session key length error: %d\n"),kuslin);
 	return(PS_RPA);
     }
     if (CheckUserAuth() != 0)
     {
 	if (outlevel > O_SILENT)
-	    error(0, 0, "RPA _service_ auth fail. Spoof server?\n");
+	    report(stderr, GT_("RPA _service_ auth fail. Spoof server?\n"));
 	return(PS_AUTHFAIL);
     }
     if (outlevel >= O_DEBUG)
     {
-	error(0, 0, "Session key established:");
+	report(stdout, GT_("Session key established:\n"));
 	for (i=0; i<Kusl; i++)
-	    error_build("%02X ",Kus[i]);
-	error_complete(0, 0, "");
+	    report_build(stdout, "%02X ",Kus[i]);
+	report_complete(stdout, "\n");
     }
 
     /* Assemble Token 5 in buf and send (not in ver 2 though)  */
@@ -324,17 +330,17 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
 	SockPrintf(socket,"%s\r\n",buf);
 #endif
 	if (outlevel >= O_MONITOR)
-	    error(0, 0, "> %s\n",buf);
+	    report(stdout, "> %s\n",buf);
 	if ((ok = POP3_rpa_resp(buf,socket)) != 0)
 	{
 	    if (outlevel > O_SILENT && outlevel < O_MONITOR)
-		error(0, 0, "%s\n",buf);
+		report(stdout, "%s\n",buf);
 	    return(ok);
 	}
     }
 
     if (outlevel > O_SILENT)
-	error(0, 0, "RPA authorisation complete\n");
+	report(stdout, GT_("RPA authorisation complete\n"));
 
     return(PS_SUCCESS);
 }
@@ -353,9 +359,7 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
   globals:       reads outlevel.
  *********************************************************************/
 
-static int POP3_rpa_resp (argbuf,socket)
-unsigned char *argbuf;
-int socket;
+static int POP3_rpa_resp (char *argbuf, int socket)
 {
     int ok;
     char buf [POPBUFSIZE];
@@ -363,7 +367,7 @@ int socket;
     int sockrc;
 
     if (outlevel >= O_DEBUG)
-	error(0, 0,  "Get response\n");
+	report(stdout,  GT_("Get response\n"));
 #ifndef TESTMODE
     sockrc = gen_recv(socket, buf, sizeof(buf));
 #else
@@ -371,7 +375,7 @@ int socket;
     if (linecount == 1) strcpy(buf,line1);
     if (linecount == 2) strcpy(buf,line2);
     if (linecount == 3) strcpy(buf,line3);
-/*  error(0, 0, "--> "); fflush(stderr);  */
+/*  report(stdout, "--> "); fflush(stderr);  */
 /*  scanf("%s",&buf)                         */
     sockrc = PS_SUCCESS;
 #endif
@@ -393,7 +397,7 @@ int socket;
     else
 	ok = PS_SOCKET;
     if (outlevel >= O_DEBUG)
-	error(0, 0,  "Get response return %d [%s]\n", ok, buf);
+	report(stdout,  GT_("Get response return %d [%s]\n"), ok, buf);
     buf[sockrc] = 0;
     return(ok);
 }
@@ -412,10 +416,10 @@ int socket;
   globals:       none
  *********************************************************************/
 
-static void LenAppend(pptr,len)
-unsigned char **pptr;
-int  len;
+static void LenAppend(char **pptr_, int len)
 {
+    unsigned char **pptr = (unsigned char **)pptr_;
+
     if (len < 0x80)
     {
 	**pptr = len; (*pptr)++;
@@ -446,48 +450,47 @@ int  len;
   globals:       reads outlevel.
  *********************************************************************/
 
-int LenSkip(pptr,rxlen)
-unsigned char **pptr;
-int rxlen;
+int LenSkip(char **pptr, int rxlen)
 {
     int len;
-    unsigned char *save;
+    char *save;
     save = *pptr;
-    if (**pptr != HDR)
+    if ((unsigned char)**pptr != HDR)
     {
-	if (outlevel > O_SILENT) error(0, 0, "Hdr not 60\n");
+	if (outlevel > O_SILENT)
+	    report(stderr, GT_("Hdr not 60\n"));
 	return(0);
     }
     (*pptr)++;
-    if (((**pptr) & 0x80) == 0 )
+    if (((unsigned char)(**pptr) & 0x80) == 0 )
     {
-	len = **pptr; (*pptr)++;
+	len = (unsigned char)**pptr; (*pptr)++;
     }
-    else if ((**pptr) == 0x81)
+    else if ((unsigned char)(**pptr) == 0x81)
     {
-	len = *(*pptr+1); (*pptr) += 2;
+	len = (unsigned char)*(*pptr+1); (*pptr) += 2;
     }
-    else if ((**pptr) == 0x82)
+    else if ((unsigned char)(**pptr) == 0x82)
     {
-	len = ((*(*pptr+1)) << 8) | *(*pptr+2);
+	len = ((unsigned char)(*(*pptr+1)) << 8) | (unsigned char)*(*pptr+2);
 	(*pptr) += 3;
     }
     else len = 0;
     if (len==0)
     {
 	if (outlevel>O_SILENT)
-	    error(0, 0, "Token length error\n");
+	    report(stderr, GT_("Token length error\n"));
     }
     else if (((*pptr-save)+len) != rxlen)
     {
 	if (outlevel>O_SILENT)
-	    error(0, 0, "Token Length %d disagrees with rxlen %d\n",len,rxlen);
+	    report(stderr, GT_("Token Length %d disagrees with rxlen %d\n"),len,rxlen);
 	len = 0;
     }
     else if (memcmp(*pptr,MECH,11))
     {
 	if (outlevel > O_SILENT)
-	    error(0, 0, "Mechanism field incorrect\n");
+	    report(stderr, GT_("Mechanism field incorrect\n"));
 	len = 0;
     }
     else (*pptr) += 11;  /* Skip mechanism field */
@@ -507,27 +510,26 @@ int rxlen;
   globals:       reads outlevel.
  *********************************************************************/
 
-static int DecBase64(bufp)
-unsigned char *bufp;
+static int DecBase64(char *bufp)
 {
-    unsigned int   new, bits=0, cnt=0, i, part=0;
+    unsigned int   newx, bits=0, cnt=0, i, part=0;
     unsigned char  ch;
-    unsigned char* outp=bufp;
-    unsigned char* inp=bufp;
-    while((ch=*(inp++)) != 0)
+    char* outp=bufp;
+    char* inp=bufp;
+    while((ch=(unsigned char)*(inp++)) != 0)
     {
 	if ((ch != '=') && (ch != ' ') && (ch != '\n') && (ch != '\r'))
 	{
-	    if      ((ch>='A') && (ch <= 'Z'))   new = ch - 'A';
-	    else if ((ch>='a') && (ch <= 'z'))   new = ch - 'a' + 26;
-	    else if ((ch>='0') && (ch <= '9'))   new = ch - '0' + 52;
-	    else if ( ch=='+'                )   new = 62;
-	    else if ( ch=='/'                )   new = 63;
+	    if      ((ch>='A') && (ch <= 'Z'))   newx = ch - 'A';
+	    else if ((ch>='a') && (ch <= 'z'))   newx = ch - 'a' + 26;
+	    else if ((ch>='0') && (ch <= '9'))   newx = ch - '0' + 52;
+	    else if ( ch=='+'                )   newx = 62;
+	    else if ( ch=='/'                )   newx = 63;
 	    else {
-		error(0, 0,  "dec64 error at char %d: %x\n", inp - bufp, ch);
+	        report(stderr,  GT_("dec64 error at char %d: %x\n"), (int)(inp - bufp), ch);
 		return(0);
 	    }
-	    part=((part & 0x3F)*64) + new;
+	    part=((part & 0x3F)*64) + newx;
 	    bits += 6;
 	    if (bits >= 8)
 	    {
@@ -539,12 +541,12 @@ unsigned char *bufp;
     }
     if (outlevel >= O_MONITOR)
     {
-	error(0, 0, "Inbound binary data:\n");
+	report(stdout, GT_("Inbound binary data:\n"));
 	for (i=0; i<cnt; i++)
 	{
-	    error_build("%02X ",bufp[i]);
+	    report_build(stdout, "%02X ",(unsigned char)bufp[i]);
 	    if (((i % 16)==15) || (i==(cnt-1)))
-		error_complete(0, 0, "");
+		report_complete(stdout, "\n");
 	}
     }
     return(cnt);
@@ -566,23 +568,21 @@ unsigned char *bufp;
   globals:       reads outlevel;
  *********************************************************************/
 
-static void EncBase64(bufp,len)
-unsigned char *bufp;
-int  len;
+static void EncBase64(char *bufp, int len)
 {
-    unsigned char* outp;
+    char* outp;
     unsigned char  c1,c2,c3;
     char x[]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
     int  i;
 
     if (outlevel >= O_MONITOR)
     {
-	error(0, 0, "Outbound data:\n");
+	report(stdout, GT_("Outbound data:\n"));
 	for (i=0; i<len; i++)
 	{
-	    error_build("%02X ",bufp[i]);
+	    report_build(stdout, "%02X ",(unsigned char)bufp[i]);
 	    if (((i % 16)==15) || (i==(len-1)))
-		error_complete(0, 0, "");
+		report_complete(stdout, "\n");
 	}
     }
     outp = bufp + (((len-1)/3)*4);
@@ -590,9 +590,9 @@ int  len;
     /* So we can do the update in place, start at the far end! */
     for (i=((len-1)/3)*3; i>=0; i-=3)
     {
-	c1 = bufp[i];
-	if ((i+1) < len) c2 = bufp[i+1]; else c2=0;
-	if ((i+2) < len) c3 = bufp[i+2]; else c3=0;
+	c1 = (unsigned char)bufp[i];
+	if ((i+1) < len) c2 = (unsigned char)bufp[i+1]; else c2=0;
+	if ((i+2) < len) c3 = (unsigned char)bufp[i+2]; else c3=0;
 	*(outp) = x[c1/4];
 	*(outp+1) = x[((c1 & 3)*16) + (c2/16)];
 	if ((i+1) < len) *(outp+2) = x[((c2 & 0x0F)*4) + (c3/64)];
@@ -620,12 +620,9 @@ int  len;
   globals:       reads outlevel;
  *********************************************************************/
 
-static void ToUnicode(pptr,delim,buf,plen,conv)
-unsigned char **pptr; /* input string  */
-unsigned char delim;
-unsigned char *buf;   /* output buffer */
-int  *plen;
-int conv;
+static void ToUnicode(char **pptr /* input string*/,
+	char delim, unsigned char *buf /* output buffer */,
+	int *plen, int conv)
 {
     unsigned char *p;
     int i;
@@ -634,7 +631,7 @@ int conv;
     {
 	*(p++) = 0;
 	if (conv)
-	    *(p++) = tolower(**pptr);
+	    *(p++) = tolower((unsigned char)**pptr);
 	else
 	    *(p++) = (**pptr);
 	(*plen) += 2;
@@ -643,17 +640,17 @@ int conv;
     if ( ((**pptr)!=delim) && ((**pptr)!=0) && ((*plen)==STRMAX) )
     {
 	if (outlevel > O_SILENT)
-	    error(0, 0, "RPA String too long\n");
+	    report(stderr, GT_("RPA String too long\n"));
 	*plen = 0;
     }
     if (outlevel >= O_DEBUG)
     {
-	error(0, 0, "Unicode:");
+	report(stdout, GT_("Unicode:\n"));
 	for (i=0; i<(*plen); i++)
 	{
-	    error_build("%02X ",buf[i]);
+	    report_build(stdout, "%02X ",buf[i]);
 	    if (((i % 16)==15) || (i==((*plen)-1)))
-		error_complete(0, 0, "");
+		report_complete(stdout, "\n");
 	}
     }
 }
@@ -671,8 +668,7 @@ int conv;
                  writes Ns Nsl Nr Nrl
  *********************************************************************/
 
-static int SetRealmService(bufp)
-unsigned char* bufp;
+static int SetRealmService(char *bufp)
 {
     /* For the moment we pick the first available realm. It would */
     /* make more sense to verify that the realm which the user    */
@@ -700,9 +696,7 @@ unsigned char* bufp;
                  reads /dev/random
  *********************************************************************/
 
-static void GenChallenge(buf,len)
-unsigned char *buf;
-int  len;
+static void GenChallenge(unsigned char *buf, int len)
 {
     int  i;
     FILE *devrandom;
@@ -710,27 +704,27 @@ int  len;
     devrandom = fopen("/dev/urandom","rb");
     if (devrandom == NULL && outlevel > O_SILENT)
     {
-	error(0, 0, "RPA Failed open of /dev/urandom. This shouldn't\n");
-	error(0, 0, "    prevent you logging in, but means you\n");
-	error(0, 0, "    cannot be sure you are talking to the\n");
-	error(0, 0, "    service that you think you are (replay\n");
-	error(0, 0, "    attacks by a dishonest service are possible.)\n");
+	report(stdout, GT_("RPA Failed open of /dev/urandom. This shouldn't\n"));
+	report(stdout, GT_("    prevent you logging in, but means you\n"));
+	report(stdout, GT_("    cannot be sure you are talking to the\n"));
+	report(stdout, GT_("    service that you think you are (replay\n"));
+	report(stdout, GT_("    attacks by a dishonest service are possible.)\n"));
     }
 
     for(i=0; i<len; i++)
 	buf[i] = devrandom ? fgetc(devrandom) : random();
 
     if (devrandom)
-	fclose(devrandom);
+	fclose(devrandom);	/* should be safe, file mode was "r" */
 
     if (outlevel >= O_DEBUG)
     {
-	error(0, 0, "User challenge:");
+	report(stdout, GT_("User challenge:\n"));
 	for (i=0; i<len; i++)
 	  {
-	  error_build("%02X ",buf[i]);
+	  report_build(stdout, "%02X ",buf[i]);
 	  if (((i % 16)==15) || (i==(len-1)))
-	    error_complete(0, 0, "");
+	    report_complete(stdout, "\n");
 	  }
     }
 }
@@ -751,14 +745,12 @@ int  len;
                  writes Pu.
  *********************************************************************/
 
-static int DigestPassphrase(passphrase,rbuf,unicodeit)
-unsigned char *passphrase;
-unsigned char *rbuf;
-int unicodeit;
+static int DigestPassphrase(char *passphrase,unsigned char *rbuf,
+	int unicodeit)
 {
     int   len;
     unsigned char  workarea[STRMAX];
-    unsigned char* ptr;
+    char* ptr;
 
     if (unicodeit)  /* Option in spec. Yuck. */
     {
@@ -766,14 +758,10 @@ int unicodeit;
 	ToUnicode(&ptr, '\0', workarea, &len, 0); /* No case conv here */
 	if (len == 0)
 	    return(PS_SYNTAX);
-	ptr = workarea;
+	md5(workarea,len,rbuf);
     }
     else
-    {
-	ptr = rbuf;
-	len = strlen(passphrase);
-    }
-    md5(ptr,len,rbuf);
+	md5(rbuf,strlen(passphrase),rbuf);
     return(0);
 }
 
@@ -790,7 +778,7 @@ int unicodeit;
                  writes Ru.
  *********************************************************************/
 
-static void CompUserResp()
+static void CompUserResp(void)
 {
     unsigned char  workarea[Pul+48+STRMAX*5+Tsl+Pul];
     unsigned char* p;
@@ -822,7 +810,7 @@ static void CompUserResp()
                  writes Ru.
  *********************************************************************/
 
-static int CheckUserAuth()
+static int CheckUserAuth(void)
 {
     unsigned char  workarea[Pul+48+STRMAX*7+Tsl+Pul];
     unsigned char* p;
@@ -873,22 +861,20 @@ static int CheckUserAuth()
   globals:       reads outlevel
  *********************************************************************/
 
-static void md5(in,len,out)
-unsigned char*    in;
-int      len;
-unsigned char*    out;
+static void md5(const void *in_,int len,unsigned char *out)
 {
     int      i;
     MD5_CTX  md5context;
+    const unsigned char *in = (const unsigned char *)in_;
 
     if (outlevel >= O_DEBUG)
     {
-	error(0, 0, "MD5 being applied to data block:\n");
+	report(stdout, GT_("MD5 being applied to data block:\n"));
 	for (i=0; i<len; i++)
 	{
-	    error_build("%02X ",in[i]);
+	    report_build(stdout, "%02X ",in[i]);
 	    if (((i % 16)==15) || (i==(len-1)))
-		error_complete(0, 0, "");
+		report_complete(stdout, "\n");
 	}
     }
     MD5Init(   &md5context );
@@ -896,12 +882,12 @@ unsigned char*    out;
     MD5Final(  out, &md5context );
     if (outlevel >= O_DEBUG)
     {
-	error(0, 0, "MD5 result is: ");
+	report(stdout, GT_("MD5 result is:\n"));
 	for (i=0; i<16; i++)
 	{
-	    error_build("%02X ",out[i]);
+	    report_build(stdout, "%02X ",out[i]);
 	}
-	error_complete(0, 0, "");
+	report_complete(stdout, "\n");
     }
 }
 #endif /* POP3_ENABLE && RPA_ENABLE */