aboutsummaryrefslogtreecommitdiffstats
path: root/rpa.c
diff options
context:
space:
mode:
Diffstat (limited to 'rpa.c')
-rw-r--r--rpa.c128
1 files changed, 64 insertions, 64 deletions
diff --git a/rpa.c b/rpa.c
index f295e47d..1ecc2116 100644
--- a/rpa.c
+++ b/rpa.c
@@ -120,7 +120,7 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
SockPrintf(socket,"AUTH RPA\r\n");
if (outlevel >= O_MONITOR)
- progress(0, 0, "> AUTH RPA\n");
+ report(stdout, 0, "> AUTH RPA\n");
/* Create unicode user name in Nu. */
/* Create MD5 digest of user's passphrase in Pu */
@@ -134,7 +134,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)
- progress(0, 0, "%s\n",buf);
+ report(stdout, 0, "%s\n",buf);
return(ok);
}
@@ -156,17 +156,17 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
SockPrintf(socket,"%s\r\n",buf);
#endif
if (outlevel >= O_MONITOR)
- progress(0, 0, "> %s\n",buf);
+ report(stdout, 0, "> %s\n",buf);
if ((ok = POP3_rpa_resp(buf,socket)) != 0)
{
if (outlevel > O_SILENT && outlevel < O_MONITOR)
- progress(0, 0, "%s\n",buf);
+ report(stdout, 0, "%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, 0, _("RPA token 2: Base64 decode error\n"));
return(PS_RPA);
}
bufp = buf;
@@ -177,35 +177,35 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
verh = *(bufp++); verl = *(bufp++);
if (outlevel >= O_DEBUG)
- progress(0, 0, _("Service chose RPA version %d.%d\n"),verh,verl);
+ report(stdout, 0, _("Service chose RPA version %d.%d\n"),verh,verl);
Csl = *(bufp++);
memcpy(Cs, bufp, Csl);
bufp += Csl;
if (outlevel >= O_DEBUG)
{
- progress(0, 0, _("Service challenge (l=%d):"),Csl);
+ report(stdout, 0, _("Service challenge (l=%d):"),Csl);
for (i=0; i<Csl; i++)
- progress_build("%02X ",Cs[i]);
- progress_complete(0, 0, "");
+ report_build(stdout, "%02X ",Cs[i]);
+ report_complete(stdout, 0, "");
}
memcpy(Ts, bufp, Tsl);
Ts[Tsl] = 0;
bufp += Tsl;
if (outlevel >= O_DEBUG)
- progress(0, 0, _("Service timestamp %s\n"),Ts);
+ report(stdout, 0, _("Service timestamp %s\n"),Ts);
rll = *(bufp++) << 8; rll = rll | *(bufp++);
if ((bufp-buf+rll) != rxlen)
{
if (outlevel > O_SILENT)
- error(0, 0, _("RPA token 2 length error\n"));
+ report(stderr, 0, _("RPA token 2 length error\n"));
return(PS_RPA);
}
if (outlevel >= O_DEBUG)
- progress(0, 0, _("Realm list: %s\n"),bufp);
+ report(stdout, 0, _("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, 0, _("RPA error in service@realm string\n"));
return(PS_RPA);
}
@@ -232,17 +232,17 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
SockPrintf(socket,"%s\r\n",buf);
#endif
if (outlevel >= O_MONITOR)
- progress(0, 0, "> %s\n",buf);
+ report(stdout, 0, "> %s\n",buf);
if ((ok = POP3_rpa_resp(buf,socket)) != 0)
{
if (outlevel > O_SILENT && outlevel < O_MONITOR)
- progress(0, 0, "%s\n",buf);
+ report(stdout, 0, "%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, 0, _("RPA token 4: Base64 decode error\n"));
return(PS_RPA);
}
bufp = buf;
@@ -253,10 +253,10 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
aulin = *(bufp++);
if (outlevel >= O_DEBUG)
{
- progress(0, 0, _("User authentication (l=%d):"),aulin);
+ report(stdout, 0, _("User authentication (l=%d):"),aulin);
for (i=0; i<aulin; i++)
- progress_build("%02X ",bufp[i]);
- progress_complete(0, 0, "");
+ report_build(stdout, "%02X ",bufp[i]);
+ report_complete(stdout, 0, "");
}
if (aulin == Aul) memcpy(Au, bufp, Aul);
bufp += aulin;
@@ -267,46 +267,46 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
{
status = *(bufp++);
if (outlevel >= O_DEBUG)
- progress(0, 0, _("RPA status: %02X\n"),status);
+ report(stdout, 0, _("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, 0, _("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]));
+ report(stderr, 0, _("RPA rejects you: %s\n"),_(stdec[status]));
else
- error(0, 0, _("RPA rejects you, reason unknown\n"));
+ report(stderr, 0, _("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, 0, _("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, 0, _("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, 0, _("RPA _service_ auth fail. Spoof server?\n"));
return(PS_AUTHFAIL);
}
if (outlevel >= O_DEBUG)
{
- progress(0, 0, _("Session key established:"));
+ report(stdout, 0, _("Session key established:"));
for (i=0; i<Kusl; i++)
- progress_build("%02X ",Kus[i]);
- progress_complete(0, 0, "");
+ report_build(stdout, "%02X ",Kus[i]);
+ report_complete(stdout, 0, "");
}
/* Assemble Token 5 in buf and send (not in ver 2 though) */
@@ -324,17 +324,17 @@ int POP3_auth_rpa (unsigned char *userid, unsigned char *passphrase, int socket)
SockPrintf(socket,"%s\r\n",buf);
#endif
if (outlevel >= O_MONITOR)
- progress(0, 0, "> %s\n",buf);
+ report(stdout, 0, "> %s\n",buf);
if ((ok = POP3_rpa_resp(buf,socket)) != 0)
{
if (outlevel > O_SILENT && outlevel < O_MONITOR)
- progress(0, 0, "%s\n",buf);
+ report(stdout, 0, "%s\n",buf);
return(ok);
}
}
if (outlevel > O_SILENT)
- progress(0, 0, _("RPA authorisation complete\n"));
+ report(stdout, 0, _("RPA authorisation complete\n"));
return(PS_SUCCESS);
}
@@ -363,7 +363,7 @@ int socket;
int sockrc;
if (outlevel >= O_DEBUG)
- progress(0, 0, _("Get response\n"));
+ report(stdout, 0, _("Get response\n"));
#ifndef TESTMODE
sockrc = gen_recv(socket, buf, sizeof(buf));
#else
@@ -371,7 +371,7 @@ int socket;
if (linecount == 1) strcpy(buf,line1);
if (linecount == 2) strcpy(buf,line2);
if (linecount == 3) strcpy(buf,line3);
-/* progress(0, 0, "--> "); fflush(stderr); */
+/* report(stdout, 0, "--> "); fflush(stderr); */
/* scanf("%s",&buf) */
sockrc = PS_SUCCESS;
#endif
@@ -393,7 +393,7 @@ int socket;
else
ok = PS_SOCKET;
if (outlevel >= O_DEBUG)
- progress(0, 0, _("Get response return %d [%s]\n"), ok, buf);
+ report(stdout, 0, _("Get response return %d [%s]\n"), ok, buf);
buf[sockrc] = 0;
return(ok);
}
@@ -455,7 +455,7 @@ int rxlen;
save = *pptr;
if (**pptr != HDR)
{
- if (outlevel > O_SILENT) error(0, 0, _("Hdr not 60\n"));
+ if (outlevel > O_SILENT) report(stderr, 0, _("Hdr not 60\n"));
return(0);
}
(*pptr)++;
@@ -476,18 +476,18 @@ int rxlen;
if (len==0)
{
if (outlevel>O_SILENT)
- error(0, 0, _("Token length error\n"));
+ report(stderr, 0, _("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, 0, _("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, 0, _("Mechanism field incorrect\n"));
len = 0;
}
else (*pptr) += 11; /* Skip mechanism field */
@@ -524,7 +524,7 @@ unsigned char *bufp;
else if ( ch=='+' ) new = 62;
else if ( ch=='/' ) new = 63;
else {
- error(0, 0, _("dec64 error at char %d: %x\n"), inp - bufp, ch);
+ report(stderr, 0, _("dec64 error at char %d: %x\n"), inp - bufp, ch);
return(0);
}
part=((part & 0x3F)*64) + new;
@@ -539,12 +539,12 @@ unsigned char *bufp;
}
if (outlevel >= O_MONITOR)
{
- progress(0, 0, _("Inbound binary data:\n"));
+ report(stdout, 0, _("Inbound binary data:\n"));
for (i=0; i<cnt; i++)
{
- progress_build("%02X ",bufp[i]);
+ report_build(stdout, "%02X ",bufp[i]);
if (((i % 16)==15) || (i==(cnt-1)))
- progress_complete(0, 0, "");
+ report_complete(stdout, 0, "");
}
}
return(cnt);
@@ -577,12 +577,12 @@ int len;
if (outlevel >= O_MONITOR)
{
- progress(0, 0, _("Outbound data:\n"));
+ report(stdout, 0, _("Outbound data:\n"));
for (i=0; i<len; i++)
{
- progress_build("%02X ",bufp[i]);
+ report_build(stdout, "%02X ",bufp[i]);
if (((i % 16)==15) || (i==(len-1)))
- progress_complete(0, 0, "");
+ report_complete(stdout, 0, "");
}
}
outp = bufp + (((len-1)/3)*4);
@@ -643,17 +643,17 @@ int conv;
if ( ((**pptr)!=delim) && ((**pptr)!=0) && ((*plen)==STRMAX) )
{
if (outlevel > O_SILENT)
- error(0, 0, _("RPA String too long\n"));
+ report(stderr, 0, _("RPA String too long\n"));
*plen = 0;
}
if (outlevel >= O_DEBUG)
{
- progress(0, 0, _("Unicode:"));
+ report(stdout, 0, _("Unicode:"));
for (i=0; i<(*plen); i++)
{
- progress_build("%02X ",buf[i]);
+ report_build(stdout, "%02X ",buf[i]);
if (((i % 16)==15) || (i==((*plen)-1)))
- progress_complete(0, 0, "");
+ report_complete(stdout, 0, "");
}
}
}
@@ -710,11 +710,11 @@ int len;
devrandom = fopen("/dev/urandom","rb");
if (devrandom == NULL && outlevel > O_SILENT)
{
- progress(0, 0, _("RPA Failed open of /dev/urandom. This shouldn't\n"));
- progress(0, 0, _(" prevent you logging in, but means you\n"));
- progress(0, 0, _(" cannot be sure you are talking to the\n"));
- progress(0, 0, _(" service that you think you are (replay\n"));
- progress(0, 0, _(" attacks by a dishonest service are possible.)\n"));
+ report(stdout, 0, _("RPA Failed open of /dev/urandom. This shouldn't\n"));
+ report(stdout, 0, _(" prevent you logging in, but means you\n"));
+ report(stdout, 0, _(" cannot be sure you are talking to the\n"));
+ report(stdout, 0, _(" service that you think you are (replay\n"));
+ report(stdout, 0, _(" attacks by a dishonest service are possible.)\n"));
}
for(i=0; i<len; i++)
@@ -725,12 +725,12 @@ int len;
if (outlevel >= O_DEBUG)
{
- progress(0, 0, _("User challenge:"));
+ report(stdout, 0, _("User challenge:"));
for (i=0; i<len; i++)
{
- progress_build("%02X ",buf[i]);
+ report_build(stdout, "%02X ",buf[i]);
if (((i % 16)==15) || (i==(len-1)))
- progress_complete(0, 0, "");
+ report_complete(stdout, 0, "");
}
}
}
@@ -883,12 +883,12 @@ unsigned char* out;
if (outlevel >= O_DEBUG)
{
- progress(0, 0, _("MD5 being applied to data block:\n"));
+ report(stdout, 0, _("MD5 being applied to data block:\n"));
for (i=0; i<len; i++)
{
- progress_build("%02X ",in[i]);
+ report_build(stdout, "%02X ",in[i]);
if (((i % 16)==15) || (i==(len-1)))
- progress_complete(0, 0, "");
+ report_complete(stdout, 0, "");
}
}
MD5Init( &md5context );
@@ -896,12 +896,12 @@ unsigned char* out;
MD5Final( out, &md5context );
if (outlevel >= O_DEBUG)
{
- progress(0, 0, _("MD5 result is: "));
+ report(stdout, 0, _("MD5 result is: "));
for (i=0; i<16; i++)
{
- progress_build("%02X ",out[i]);
+ report_build(stdout, "%02X ",out[i]);
}
- progress_complete(0, 0, "");
+ report_complete(stdout, 0, "");
}
}
#endif /* POP3_ENABLE && RPA_ENABLE */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 19:10:38 +0000