#include <unistd.h>
#include <ctype.h>
#include <string.h>
+#include <sys/types.h>
#include "socket.h"
#include "fetchmail.h"
-#include "md5.h"
+#include "fm_md5.h"
#include "i18n.h"
#ifdef TESTMODE
unsigned char* rbuf, int unicodeit);
static void CompUserResp();
static int CheckUserAuth();
- static void md5(void* in, int len, unsigned char* out);
+ static void md5(const void* in, int len, unsigned char* out);
#endif
/* RPA protocol definitions */
char buf [POPBUFSIZE];
char *bufp;
int status,aulin,kuslin;
- char* stdec[4] = { N_("Success") ,
+ const char* stdec[4] = { N_("Success") ,
N_("Restricted user (something wrong with account)") ,
N_("Invalid userid or passphrase") ,
N_("Deity error") };
globals: reads outlevel.
*********************************************************************/
-static int POP3_rpa_resp (argbuf,socket)
-char *argbuf;
-int socket;
+static int POP3_rpa_resp (char *argbuf, int socket)
{
int ok;
char buf [POPBUFSIZE];
globals: none
*********************************************************************/
-static void LenAppend(pptr_,len)
-char **pptr_;
-int len;
+static void LenAppend(char **pptr_, int len)
{
unsigned char **pptr = (unsigned char **)pptr_;
globals: reads outlevel.
*********************************************************************/
-int LenSkip(pptr,rxlen)
-char **pptr;
-int rxlen;
+int LenSkip(char **pptr, int rxlen)
{
int len;
char *save;
globals: reads outlevel.
*********************************************************************/
-static int DecBase64(bufp)
-char *bufp;
+static int DecBase64(char *bufp)
{
unsigned int newx, bits=0, cnt=0, i, part=0;
unsigned char ch;
else if ( ch=='+' ) newx = 62;
else if ( ch=='/' ) newx = 63;
else {
- report(stderr, GT_("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) + newx;
globals: reads outlevel;
*********************************************************************/
-static void EncBase64(bufp,len)
-char *bufp;
-int len;
+static void EncBase64(char *bufp, int len)
{
char* outp;
unsigned char c1,c2,c3;
globals: reads outlevel
*********************************************************************/
-static void md5(void *in_,int len,unsigned char *out)
+static void md5(const void *in_,int len,unsigned char *out)
{
int i;
MD5_CTX md5context;
- unsigned char *in = in_;
+ const unsigned char *in = (const unsigned char *)in_;
if (outlevel >= O_DEBUG)
{
MD5Final( out, &md5context );
if (outlevel >= O_DEBUG)
{
- report(stdout, GT_("MD5 result is: \n"));
+ report(stdout, GT_("MD5 result is:\n"));
for (i=0; i<16; i++)
{
report_build(stdout, "%02X ",out[i]);