Added binkp MD5 password crypt
This commit is contained in:
Michiel Broek
parent
42b0fd381b
commit
7021a07b4d
@ -7,6 +7,9 @@ $Id$
|
||||
|
||||
v0.37.4 10-May-2003
|
||||
|
||||
upgrade:
|
||||
Check setting of menu 1.14.15
|
||||
|
||||
general:
|
||||
Added check for inconv.h in configure script for UNIX98
|
||||
character set conversion.
|
||||
@ -22,11 +25,13 @@ v0.37.4 10-May-2003
|
||||
Guess what, these packets do still exist in Fidonet, it took
|
||||
5 years to find them! If you want to check, call 5:5/0
|
||||
Fixed compiler warning in network code.
|
||||
printable function now escapes all non-printable characters.
|
||||
|
||||
mbcico:
|
||||
The binkp transmitter does now escape the unsafe filename
|
||||
characters.
|
||||
The binkp receiver now does process escaped filenames.
|
||||
The binkp protocol now supports MD5 crypted passwords.
|
||||
|
||||
mbfido:
|
||||
Stone age packet support, see common.a.
|
||||
@ -43,6 +48,9 @@ v0.37.4 10-May-2003
|
||||
Increased internal message buffer size to 700 lines.
|
||||
Fullscreen editor code cleanup, debug messages removed.
|
||||
|
||||
mbsetup:
|
||||
In menu 1.14 added a switch to turn MD5 crypted passwords off.
|
||||
|
||||
unix:
|
||||
Fixed compiler warning.
|
||||
|
||||
|
||||
2
TODO
2
TODO
@ -98,8 +98,6 @@ mbfido:
|
||||
N: Add statistic mail messages.
|
||||
|
||||
mbcico:
|
||||
N: Implement MD5 crypt in binkp protocol driver.
|
||||
|
||||
N: Doesn't poll internet nodes with non-standard ports when the
|
||||
FQDN:port is in the override field.
|
||||
|
||||
|
||||
67
lib/clcomm.c
67
lib/clcomm.c
@ -456,43 +456,44 @@ unsigned long sequencer()
|
||||
|
||||
char *printable(char *s, int l)
|
||||
{
|
||||
int len;
|
||||
char *p;
|
||||
int len;
|
||||
char *p;
|
||||
|
||||
if (pbuff)
|
||||
free(pbuff);
|
||||
pbuff=NULL;
|
||||
if (pbuff)
|
||||
free(pbuff);
|
||||
pbuff=NULL;
|
||||
|
||||
if (s == NULL)
|
||||
return (char *)"(null)";
|
||||
if (s == NULL)
|
||||
return (char *)"(null)";
|
||||
|
||||
if (l > 0)
|
||||
len=l;
|
||||
else if (l == 0)
|
||||
len=strlen(s);
|
||||
else {
|
||||
len=strlen(s);
|
||||
if (len > -l)
|
||||
len=-l;
|
||||
}
|
||||
if (l > 0)
|
||||
len=l;
|
||||
else if (l == 0)
|
||||
len=strlen(s);
|
||||
else {
|
||||
len=strlen(s);
|
||||
if (len > -l)
|
||||
len=-l;
|
||||
}
|
||||
|
||||
pbuff=(char*)xmalloc(len*4+1);
|
||||
p=pbuff;
|
||||
while (len--) {
|
||||
if (*(unsigned char*)s >= ' ')
|
||||
*p++=*s;
|
||||
else switch (*s) {
|
||||
case '\\': *p++='\\'; *p++='\\'; break;
|
||||
case '\r': *p++='\\'; *p++='r'; break;
|
||||
case '\n': *p++='\\'; *p++='n'; break;
|
||||
case '\t': *p++='\\'; *p++='t'; break;
|
||||
case '\b': *p++='\\'; *p++='b'; break;
|
||||
default: sprintf(p,"\\%03o",*s); p+=4; break;
|
||||
}
|
||||
s++;
|
||||
}
|
||||
*p='\0';
|
||||
return pbuff;
|
||||
pbuff=(char*)xmalloc(len*4+1);
|
||||
p=pbuff;
|
||||
while (len--) {
|
||||
if (isprint(*(unsigned char*)s))
|
||||
*p++=*s;
|
||||
else
|
||||
switch (*s) {
|
||||
case '\\': *p++='\\'; *p++='\\'; break;
|
||||
case '\r': *p++='\\'; *p++='r'; break;
|
||||
case '\n': *p++='\\'; *p++='n'; break;
|
||||
case '\t': *p++='\\'; *p++='t'; break;
|
||||
case '\b': *p++='\\'; *p++='b'; break;
|
||||
default: sprintf(p,"\\%02x",*s); p+=3; break;
|
||||
}
|
||||
s++;
|
||||
}
|
||||
*p='\0';
|
||||
return pbuff;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -717,7 +717,7 @@ struct sysconfig {
|
||||
long dialdelay; /* Delay between calls */
|
||||
unsigned NoFreqs : 1; /* Don't allow requests */
|
||||
unsigned NoCall : 1; /* Don't call */
|
||||
unsigned xNoHold : 1;
|
||||
unsigned NoMD5 : 1; /* Don't do MD5 */
|
||||
unsigned xNoPUA : 1;
|
||||
unsigned NoEMSI : 1; /* Don't do EMSI */
|
||||
unsigned NoWazoo : 1; /* Don't do Yooho/2U2 */
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
include ../Makefile.global
|
||||
|
||||
SRCS = zmmisc.c zmrle.c zmrecv.c zmsend.c binkp.c \
|
||||
SRCS = zmmisc.c zmrle.c zmrecv.c zmsend.c binkp.c md5b.c \
|
||||
xmsend.c xmrecv.c m7recv.c m7send.c hydra.c \
|
||||
answer.c chat.c dial.c dietifna.c emsidat.c filelist.c \
|
||||
openfile.c openport.c opentcp.c rdoptions.c yoohoo.c \
|
||||
@ -13,7 +13,7 @@ SRCS = zmmisc.c zmrle.c zmrecv.c zmsend.c binkp.c \
|
||||
ttyio.c lutil.c scanout.c emsi.c ulock.c \
|
||||
callstat.c session.c call.c mbcico.c \
|
||||
outstat.c nlinfo.c mbout.c
|
||||
HDRS = zmodem.h binkp.h config.h statetbl.h \
|
||||
HDRS = zmodem.h binkp.h config.h statetbl.h md5b.h \
|
||||
xmsend.h xmrecv.h m7recv.h m7send.h hydra.h \
|
||||
answer.h chat.h dial.h dietifna.h emsidat.h filelist.h \
|
||||
openfile.h openport.h opentcp.h rdoptions.h yoohoo.h \
|
||||
@ -22,7 +22,7 @@ HDRS = zmodem.h binkp.h config.h statetbl.h \
|
||||
ttyio.h lutil.h scanout.h emsi.h ulock.h \
|
||||
callstat.h session.h call.h mbcico.h \
|
||||
outstat.h nlinfo.h
|
||||
MBCICO_OBJS = zmmisc.o zmrle.o zmrecv.o zmsend.o binkp.o \
|
||||
MBCICO_OBJS = zmmisc.o zmrle.o zmrecv.o zmsend.o binkp.o md5b.o \
|
||||
xmsend.o xmrecv.o m7recv.o m7send.o hydra.o \
|
||||
answer.o chat.o dial.o dietifna.o emsidat.o filelist.o \
|
||||
openfile.o openport.o opentcp.o rdoptions.o yoohoo.o \
|
||||
@ -91,7 +91,8 @@ zmmisc.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/co
|
||||
zmrle.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/clcomm.h ../lib/common.h ../lib/nodelist.h ttyio.h session.h zmodem.h
|
||||
zmrecv.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/clcomm.h ../lib/common.h ../lib/nodelist.h lutil.h ttyio.h session.h zmodem.h config.h emsi.h openfile.h filelist.h openport.h
|
||||
zmsend.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ../lib/nodelist.h ttyio.h session.h zmodem.h lutil.h emsi.h filelist.h
|
||||
binkp.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/nodelist.h ../lib/dbnode.h ../lib/clcomm.h ../lib/mberrors.h ttyio.h session.h statetbl.h config.h emsi.h openfile.h respfreq.h filelist.h opentcp.h rdoptions.h lutil.h binkp.h config.h
|
||||
binkp.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/nodelist.h ../lib/dbnode.h ../lib/clcomm.h ../lib/mberrors.h ttyio.h session.h statetbl.h config.h emsi.h openfile.h respfreq.h filelist.h opentcp.h rdoptions.h lutil.h binkp.h config.h md5b.h
|
||||
md5b.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/nodelist.h ../lib/clcomm.h lutil.h md5b.h
|
||||
xmsend.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/nodelist.h ../lib/clcomm.h session.h ttyio.h statetbl.h xmsend.h m7send.h filelist.h filetime.h
|
||||
xmrecv.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/nodelist.h ../lib/clcomm.h session.h ttyio.h statetbl.h config.h lutil.h openfile.h m7recv.h xmrecv.h filelist.h filetime.h
|
||||
m7recv.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h statetbl.h ttyio.h m7recv.h
|
||||
|
||||
112
mbcico/binkp.c
112
mbcico/binkp.c
@ -53,6 +53,7 @@
|
||||
#include "lutil.h"
|
||||
#include "binkp.h"
|
||||
#include "config.h"
|
||||
#include "md5b.h"
|
||||
|
||||
|
||||
/*
|
||||
@ -70,7 +71,7 @@ static char rbuf[2048];
|
||||
char *unix2binkp(char *);
|
||||
char *binkp2unix(char *);
|
||||
int binkp_expired(void);
|
||||
void b_banner(int);
|
||||
void b_banner(void);
|
||||
void b_nul(char *);
|
||||
void fill_binkp_list(binkp_list **, file_list *, off_t);
|
||||
void debug_binkp_list(binkp_list **);
|
||||
@ -87,7 +88,7 @@ static int binkp_batch(file_list *, int);
|
||||
extern char *ttystat[];
|
||||
extern int Loaded;
|
||||
extern pid_t mypid;
|
||||
|
||||
extern struct sockaddr_in peeraddr;
|
||||
|
||||
extern unsigned long sentbytes;
|
||||
extern unsigned long rcvdbytes;
|
||||
@ -110,8 +111,8 @@ static int CRCflag = FALSE;
|
||||
unsigned long nethold, mailhold;
|
||||
int transferred = FALSE;
|
||||
int batchnr = 0, crc_errors = 0;
|
||||
|
||||
|
||||
unsigned char *MD_challenge = NULL; /* Received CRAM challenge data */
|
||||
int ext_rand = 0;
|
||||
|
||||
int binkp(int role)
|
||||
{
|
||||
@ -398,7 +399,7 @@ int binkp_expired(void)
|
||||
|
||||
|
||||
|
||||
void b_banner(int originate)
|
||||
void b_banner(void)
|
||||
{
|
||||
time_t t;
|
||||
|
||||
@ -448,13 +449,24 @@ void b_nul(char *msg)
|
||||
MBflag = TRUE;
|
||||
if (strstr(msg, (char *)"ND") != NULL)
|
||||
NDflag = TRUE;
|
||||
if (strstr(msg, (char *)"CRYPT") != NULL)
|
||||
if (strstr(msg, (char *)"CRYPT") != NULL) {
|
||||
CRYPTflag = TRUE;
|
||||
if (strstr(msg, (char *)"CRAM-") != NULL)
|
||||
CRAMflag = TRUE;
|
||||
// Syslog('+', "Remote requests CRYPT mode");
|
||||
}
|
||||
if (strstr(msg, (char *)"CRAM-MD5-") != NULL) { /* No SHA-1 support */
|
||||
if (CFG.NoMD5) {
|
||||
Syslog('+', "Remote supports MD5, but it's turned off here");
|
||||
} else {
|
||||
CRAMflag = TRUE;
|
||||
Syslog('+', "Remote requests MD5 password");
|
||||
if (MD_challenge)
|
||||
free(MD_challenge);
|
||||
MD_challenge = MD_getChallenge(msg, NULL);
|
||||
}
|
||||
}
|
||||
if (strstr(msg, (char *)"CRC") != NULL) {
|
||||
CRCflag = TRUE;
|
||||
Syslog('b', "Switching to CRC32 mode");
|
||||
Syslog('+', "Switching to CRC32 mode");
|
||||
}
|
||||
} else
|
||||
Syslog('+', "M_NUL \"%s\"", msg);
|
||||
@ -493,8 +505,8 @@ SM_STATE(waitconn)
|
||||
Loaded = FALSE;
|
||||
Syslog('+', "Binkp: node %s", ascfnode(remote->addr, 0x1f));
|
||||
IsDoing("Connect binkp %s", ascfnode(remote->addr, 0xf));
|
||||
b_banner(TRUE);
|
||||
binkp_send_control(MM_NUL,"OPT MB CRC");
|
||||
b_banner();
|
||||
|
||||
/*
|
||||
* Build a list of aka's to send, the primary aka first.
|
||||
@ -521,17 +533,6 @@ SM_STATE(waitconn)
|
||||
binkp_send_control(MM_ADR, "%s", p);
|
||||
free(p);
|
||||
tidy_faddr(primary);
|
||||
SM_PROCEED(sendpass)
|
||||
|
||||
SM_STATE(sendpass)
|
||||
|
||||
if (strlen(nodes.Spasswd)) {
|
||||
SendPass = TRUE;
|
||||
binkp_send_control(MM_PWD, "%s", nodes.Spasswd);
|
||||
} else {
|
||||
binkp_send_control(MM_PWD, "-");
|
||||
}
|
||||
|
||||
SM_PROCEED(waitaddr)
|
||||
|
||||
SM_STATE(waitaddr)
|
||||
@ -595,7 +596,7 @@ SM_STATE(waitaddr)
|
||||
history.aka.point = remote->addr->point;
|
||||
sprintf(history.aka.domain, "%s", remote->addr->domain);
|
||||
|
||||
SM_PROCEED(authremote)
|
||||
SM_PROCEED(sendpass)
|
||||
|
||||
} else if (rbuf[0] == MM_BSY) {
|
||||
Syslog('!', "Binkp: remote is busy");
|
||||
@ -611,6 +612,30 @@ SM_STATE(waitaddr)
|
||||
}
|
||||
}
|
||||
|
||||
SM_STATE(sendpass)
|
||||
|
||||
if (MD_challenge && strlen(nodes.Spasswd) && CRAMflag) {
|
||||
Syslog('b', "MD_challenge is set, building digest");
|
||||
char *pw = xstrcpy(nodes.Spasswd);
|
||||
char *tp = MD_buildDigest(pw, MD_challenge);
|
||||
if (!tp) {
|
||||
Syslog('!', "Unable to build MD5 digest");
|
||||
SM_ERROR;
|
||||
}
|
||||
SendPass = TRUE;
|
||||
binkp_send_control(MM_PWD, "%s", tp);
|
||||
free(pw);
|
||||
} else {
|
||||
if (strlen(nodes.Spasswd)) {
|
||||
SendPass = TRUE;
|
||||
binkp_send_control(MM_PWD, "%s", nodes.Spasswd);
|
||||
} else {
|
||||
binkp_send_control(MM_PWD, "-");
|
||||
}
|
||||
}
|
||||
|
||||
SM_PROCEED(authremote)
|
||||
|
||||
SM_STATE(authremote)
|
||||
|
||||
rc = 0;
|
||||
@ -690,7 +715,19 @@ SM_START(waitconn)
|
||||
SM_STATE(waitconn)
|
||||
|
||||
Loaded = FALSE;
|
||||
b_banner(FALSE);
|
||||
|
||||
if (!CFG.NoMD5 && ((MD_challenge = MD_getChallenge(NULL, &peeraddr)) != NULL)) {
|
||||
/*
|
||||
* Answering site MUST send CRAM message as very first M_NUL
|
||||
*/
|
||||
char s[MD5_DIGEST_LEN*2+15]; /* max. length of opt string */
|
||||
strcpy(s, "OPT ");
|
||||
MD_toString(s+4, MD_challenge[0], MD_challenge+1);
|
||||
CRAMflag = TRUE;
|
||||
Syslog('b', "sending \"%s\"", s);
|
||||
binkp_send_control(MM_NUL, "%s", s);
|
||||
}
|
||||
b_banner();
|
||||
p = xstrcpy((char *)"");
|
||||
|
||||
for (i = 0; i < 40; i++)
|
||||
@ -822,7 +859,34 @@ SM_STATE(waitpwd)
|
||||
|
||||
SM_STATE(pwdack)
|
||||
|
||||
if ((strcmp(&rbuf[1], "-") == 0) && !Loaded) {
|
||||
if ((strncmp(&rbuf[1], "CRAM-", 5) == 0) && CRAMflag && Loaded) {
|
||||
char *sp, *pw;
|
||||
pw = xstrcpy(nodes.Spasswd);
|
||||
sp = MD_buildDigest(pw, MD_challenge);
|
||||
free(pw);
|
||||
if (sp != NULL) {
|
||||
if (strcmp(&rbuf[1], sp)) {
|
||||
Syslog('+', "Binkp: bad MD5 crypted password");
|
||||
binkp_send_control(MM_ERR, "*** Password error, check setup ***");
|
||||
free(sp);
|
||||
sp = NULL;
|
||||
SM_ERROR;
|
||||
} else {
|
||||
free(sp);
|
||||
sp = NULL;
|
||||
Syslog('+', "Binkp: MD5 password OK, protected session");
|
||||
if (inbound)
|
||||
free(inbound);
|
||||
inbound = xstrcpy(CFG.pinbound);
|
||||
binkp_send_control(MM_OK, "");
|
||||
SM_SUCCESS;
|
||||
}
|
||||
} else {
|
||||
Syslog('!', "Could not build MD5 digest");
|
||||
binkp_send_control(MM_ERR, "*** Internal error ***");
|
||||
SM_ERROR;
|
||||
}
|
||||
} else if ((strcmp(&rbuf[1], "-") == 0) && !Loaded) {
|
||||
Syslog('+', "Binkp: node not in setup, unprotected session");
|
||||
binkp_send_control(MM_OK, "");
|
||||
SM_SUCCESS;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* Purpose ...............: Fidonet mailer
|
||||
*
|
||||
*****************************************************************************
|
||||
* Copyright (C) 1997-2001
|
||||
* Copyright (C) 1997-2003
|
||||
*
|
||||
* Michiel Broek FIDO: 2:280/2802
|
||||
* Beekmansbos 10
|
||||
@ -92,4 +92,14 @@ int IsZMH()
|
||||
}
|
||||
|
||||
|
||||
unsigned long rnd (void)
|
||||
{
|
||||
static int i;
|
||||
|
||||
if (!i) {
|
||||
i = 1;
|
||||
srand (time (0));
|
||||
}
|
||||
return (time (0) + rand ()) & 0xFFFFFFFFul;
|
||||
}
|
||||
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
#ifndef LUTIL_H
|
||||
#define LUTIL_H
|
||||
|
||||
/* $id$ */
|
||||
|
||||
void setmyname(char *);
|
||||
char *date(long);
|
||||
int IsZMH(void);
|
||||
void setmyname(char *);
|
||||
char *date(long);
|
||||
int IsZMH(void);
|
||||
unsigned long rnd(void);
|
||||
|
||||
#endif
|
||||
|
||||
526
mbcico/md5b.c
Normal file
526
mbcico/md5b.c
Normal file
@ -0,0 +1,526 @@
|
||||
/*****************************************************************************
|
||||
*
|
||||
* $Id$
|
||||
* Purpose ...............: MD5 for binkp protocol driver
|
||||
*
|
||||
*****************************************************************************
|
||||
* Copyright (C) 1997-2003
|
||||
*
|
||||
* Michiel Broek FIDO: 2:280/2802
|
||||
* Beekmansbos 10
|
||||
* 1971 BV IJmuiden
|
||||
* the Netherlands
|
||||
*
|
||||
* This file is part of MBSE BBS.
|
||||
*
|
||||
* This BBS is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2, or (at your option) any
|
||||
* later version.
|
||||
*
|
||||
* MBSE BBS is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with MBSE BBS; see the file COPYING. If not, write to the Free
|
||||
* Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*****************************************************************************/
|
||||
|
||||
/*
|
||||
* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
|
||||
*/
|
||||
|
||||
/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
|
||||
rights reserved.
|
||||
|
||||
License to copy and use this software is granted provided that it
|
||||
is identified as the "RSA Data Security, Inc. MD5 Message-Digest
|
||||
Algorithm" in all material mentioning or referencing this software
|
||||
or this function.
|
||||
|
||||
License is also granted to make and use derivative works provided
|
||||
that such works are identified as "derived from the RSA Data
|
||||
Security, Inc. MD5 Message-Digest Algorithm" in all material
|
||||
mentioning or referencing the derived work.
|
||||
|
||||
RSA Data Security, Inc. makes no representations concerning either
|
||||
the merchantability of this software or the suitability of this
|
||||
software for any particular purpose. It is provided "as is"
|
||||
without express or implied warranty of any kind.
|
||||
|
||||
These notices must be retained in any copies of any part of this
|
||||
documentation and/or software.
|
||||
*/
|
||||
|
||||
#include "../config.h"
|
||||
#include "../lib/libs.h"
|
||||
#include "../lib/memwatch.h"
|
||||
#include "../lib/structs.h"
|
||||
#include "../lib/common.h"
|
||||
#include "../lib/nodelist.h"
|
||||
#include "../lib/clcomm.h"
|
||||
#include "lutil.h"
|
||||
#include "md5b.h"
|
||||
|
||||
extern int ext_rand;
|
||||
|
||||
/*
|
||||
* Constants for MD5Transform routine.
|
||||
*/
|
||||
|
||||
#define S11 7
|
||||
#define S12 12
|
||||
#define S13 17
|
||||
#define S14 22
|
||||
#define S21 5
|
||||
#define S22 9
|
||||
#define S23 14
|
||||
#define S24 20
|
||||
#define S31 4
|
||||
#define S32 11
|
||||
#define S33 16
|
||||
#define S34 23
|
||||
#define S41 6
|
||||
#define S42 10
|
||||
#define S43 15
|
||||
#define S44 21
|
||||
|
||||
static void MD5Transform(UINT4 [4], unsigned char [64]);
|
||||
static void Encode(unsigned char *, UINT4 *, unsigned int);
|
||||
static void Decode(UINT4 *, unsigned char *, unsigned int);
|
||||
static void MD5_memcpy(POINTER, POINTER, unsigned int);
|
||||
static void MD5_memset(POINTER, int, unsigned int);
|
||||
|
||||
static unsigned char PADDING[64] = {
|
||||
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
||||
};
|
||||
|
||||
/* F, G, H and I are basic MD5 functions.
|
||||
*/
|
||||
#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
|
||||
#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
|
||||
#define H(x, y, z) ((x) ^ (y) ^ (z))
|
||||
#define I(x, y, z) ((y) ^ ((x) | (~z)))
|
||||
|
||||
/* ROTATE_LEFT rotates x left n bits.
|
||||
*/
|
||||
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
|
||||
|
||||
/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
|
||||
Rotation is separate from addition to prevent recomputation.
|
||||
*/
|
||||
#define FF(a, b, c, d, x, s, ac) { (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
|
||||
#define GG(a, b, c, d, x, s, ac) { (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
|
||||
#define HH(a, b, c, d, x, s, ac) { (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
|
||||
#define II(a, b, c, d, x, s, ac) { (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
|
||||
|
||||
/* MD5 initialization. Begins an MD5 operation, writing a new context.
|
||||
*/
|
||||
static void MD5Init(MD5_CTX *context)
|
||||
{
|
||||
context->count[0] = context->count[1] = 0;
|
||||
/* Load magic initialization constants.
|
||||
*/
|
||||
context->state[0] = 0x67452301;
|
||||
context->state[1] = 0xefcdab89;
|
||||
context->state[2] = 0x98badcfe;
|
||||
context->state[3] = 0x10325476;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* MD5 block update operation. Continues an MD5 message-digest
|
||||
* operation, processing another message block, and updating the
|
||||
* context.
|
||||
*/
|
||||
static void MD5Update(MD5_CTX *context, unsigned char *input, unsigned int inputLen)
|
||||
{
|
||||
unsigned int i, mdindex, partLen;
|
||||
|
||||
/* Compute number of bytes mod 64 */
|
||||
mdindex = (unsigned int)((context->count[0] >> 3) & 0x3F);
|
||||
|
||||
/* Update number of bits */
|
||||
if ((context->count[0] += ((UINT4)inputLen << 3)) < ((UINT4)inputLen << 3))
|
||||
context->count[1]++;
|
||||
context->count[1] += ((UINT4)inputLen >> 29);
|
||||
|
||||
partLen = 64 - mdindex;
|
||||
|
||||
/* Transform as many times as possible. */
|
||||
if (inputLen >= partLen) {
|
||||
MD5_memcpy ((POINTER)&context->buffer[mdindex], (POINTER)input, partLen);
|
||||
MD5Transform (context->state, context->buffer);
|
||||
|
||||
for (i = partLen; i + 63 < inputLen; i += 64)
|
||||
MD5Transform (context->state, &input[i]);
|
||||
|
||||
mdindex = 0;
|
||||
} else
|
||||
i = 0;
|
||||
|
||||
/* Buffer remaining input */
|
||||
MD5_memcpy ((POINTER)&context->buffer[mdindex], (POINTER)&input[i], inputLen-i);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* MD5 finalization. Ends an MD5 message-digest operation, writing the
|
||||
* the message digest and zeroizing the context.
|
||||
*/
|
||||
static void MD5Final(unsigned char digest[16], MD5_CTX *context)
|
||||
{
|
||||
unsigned char bits[8];
|
||||
unsigned int mdindex, padLen;
|
||||
|
||||
/* Save number of bits */
|
||||
Encode (bits, context->count, 8);
|
||||
|
||||
/* Pad out to 56 mod 64. */
|
||||
mdindex = (unsigned int)((context->count[0] >> 3) & 0x3f);
|
||||
padLen = (mdindex < 56) ? (56 - mdindex) : (120 - mdindex);
|
||||
MD5Update (context, PADDING, padLen);
|
||||
|
||||
/* Append length (before padding) */
|
||||
MD5Update (context, bits, 8);
|
||||
|
||||
/* Store state in digest */
|
||||
Encode (digest, context->state, 16);
|
||||
|
||||
/* Zeroize sensitive information. */
|
||||
MD5_memset ((POINTER)context, 0, sizeof (*context));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* MD5 basic transformation. Transforms state based on block.
|
||||
*/
|
||||
static void MD5Transform (UINT4 state[4], unsigned char block[64])
|
||||
{
|
||||
UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
|
||||
|
||||
Decode (x, block, 64);
|
||||
|
||||
/* Round 1 */
|
||||
FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
|
||||
FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
|
||||
FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
|
||||
FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
|
||||
FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
|
||||
FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
|
||||
FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
|
||||
FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
|
||||
FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
|
||||
FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
|
||||
FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
|
||||
FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
|
||||
FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
|
||||
FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
|
||||
FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
|
||||
FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
|
||||
|
||||
/* Round 2 */
|
||||
GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
|
||||
GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
|
||||
GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
|
||||
GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
|
||||
GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
|
||||
GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */
|
||||
GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
|
||||
GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
|
||||
GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
|
||||
GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
|
||||
GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
|
||||
GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
|
||||
GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
|
||||
GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
|
||||
GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
|
||||
GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
|
||||
|
||||
/* Round 3 */
|
||||
HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
|
||||
HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
|
||||
HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
|
||||
HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
|
||||
HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
|
||||
HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
|
||||
HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
|
||||
HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
|
||||
HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
|
||||
HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
|
||||
HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
|
||||
HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */
|
||||
HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
|
||||
HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
|
||||
HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
|
||||
HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
|
||||
|
||||
/* Round 4 */
|
||||
II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
|
||||
II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
|
||||
II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
|
||||
II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
|
||||
II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
|
||||
II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
|
||||
II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
|
||||
II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
|
||||
II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
|
||||
II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
|
||||
II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
|
||||
II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
|
||||
II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
|
||||
II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
|
||||
II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
|
||||
II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
|
||||
|
||||
state[0] += a;
|
||||
state[1] += b;
|
||||
state[2] += c;
|
||||
state[3] += d;
|
||||
|
||||
/* Zeroize sensitive information. */
|
||||
MD5_memset ((POINTER)x, 0, sizeof (x));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Encodes input (UINT4) into output (unsigned char). Assumes len is
|
||||
* a multiple of 4.
|
||||
*/
|
||||
static void Encode (unsigned char *output, UINT4 *input, unsigned int len)
|
||||
{
|
||||
unsigned int i, j;
|
||||
|
||||
for (i = 0, j = 0; j < len; i++, j += 4) {
|
||||
output[j] = (unsigned char)(input[i] & 0xff);
|
||||
output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
|
||||
output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
|
||||
output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Decodes input (unsigned char) into output (UINT4). Assumes len is
|
||||
* a multiple of 4.
|
||||
*/
|
||||
static void Decode (UINT4 *output, unsigned char *input, unsigned int len)
|
||||
{
|
||||
unsigned int i, j;
|
||||
|
||||
for (i = 0, j = 0; j < len; i++, j += 4)
|
||||
output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) | (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Note: Replace "for loop" with standard memcpy if possible.
|
||||
*/
|
||||
static void MD5_memcpy (POINTER output, POINTER input, unsigned int len)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
output[i] = input[i];
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Note: Replace "for loop" with standard memset if possible.
|
||||
*/
|
||||
static void MD5_memset (POINTER output, int value, unsigned int len)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
((char *)output)[i] = (char)value;
|
||||
}
|
||||
|
||||
|
||||
/* ---------------------------------------------------------- */
|
||||
|
||||
|
||||
static void hmac_md5(unsigned char *text, int text_len, unsigned char *key, int key_len, MDcaddr_t digest)
|
||||
{
|
||||
MD5_CTX context;
|
||||
unsigned char k_ipad[65]; /* inner padding - key XORd with ipad */
|
||||
unsigned char k_opad[65]; /* outer padding - key XORd with opad */
|
||||
unsigned char tk[16];
|
||||
int i;
|
||||
|
||||
/* if key is longer than 64 bytes reset it to key=MD5(key) */
|
||||
if (key_len > 64) {
|
||||
|
||||
MD5_CTX tctx;
|
||||
|
||||
MD5Init(&tctx);
|
||||
MD5Update(&tctx, key, key_len);
|
||||
MD5Final(tk, &tctx);
|
||||
|
||||
key = tk;
|
||||
key_len = 16;
|
||||
}
|
||||
|
||||
/*
|
||||
* the HMAC_MD5 transform looks like:
|
||||
*
|
||||
* MD5(K XOR opad, MD5(K XOR ipad, text))
|
||||
*
|
||||
* where K is an n byte key
|
||||
* ipad is the byte 0x36 repeated 64 times
|
||||
* opad is the byte 0x5c repeated 64 times
|
||||
* and text is the data being protected
|
||||
*/
|
||||
|
||||
/* start out by storing key in pads */
|
||||
memset((char *) k_ipad, 0, sizeof k_ipad);
|
||||
memset((char *) k_opad, 0, sizeof k_opad);
|
||||
memmove( k_ipad, key, key_len);
|
||||
memmove( k_opad, key, key_len);
|
||||
|
||||
/* XOR key with ipad and opad values */
|
||||
for (i = 0; i < 64; i++) {
|
||||
k_ipad[i] ^= 0x36;
|
||||
k_opad[i] ^= 0x5c;
|
||||
}
|
||||
|
||||
/*
|
||||
* perform inner MD5
|
||||
*/
|
||||
MD5Init(&context); /* init context for 1st pass */
|
||||
MD5Update(&context, k_ipad, 64); /* start with inner pad */
|
||||
MD5Update(&context, text, text_len); /* then text of datagram */
|
||||
MD5Final(digest, &context); /* finish up 1st pass */
|
||||
|
||||
/*
|
||||
* perform outer MD5
|
||||
*/
|
||||
MD5Init(&context); /* init context for 2nd pass */
|
||||
MD5Update(&context, k_opad, 64); /* start with outer pad */
|
||||
MD5Update(&context, digest, 16); /* then results of 1st hash */
|
||||
MD5Final(digest, &context); /* finish up 2nd pass */
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------------- */
|
||||
|
||||
static void getrand(unsigned char *res, int len, struct sockaddr_in *peer_name)
|
||||
{
|
||||
MDcaddr_t digest;
|
||||
struct {
|
||||
time_t tm;
|
||||
unsigned short pid;
|
||||
unsigned short rand;
|
||||
int ext_rand;
|
||||
} rd;
|
||||
|
||||
time(&rd.tm);
|
||||
rd.pid = (int)getpid();
|
||||
rd.rand = rand();
|
||||
rd.ext_rand = ext_rand;
|
||||
hmac_md5((void *)&rd, sizeof(rd), (void *)peer_name, sizeof(struct sockaddr_in), digest);
|
||||
if ((peer_name) /* && (peer_name[0]) */)
|
||||
hmac_md5((void *)peer_name, sizeof(struct sockaddr_in), digest, sizeof(digest), digest);
|
||||
memcpy(res, digest, len);
|
||||
}
|
||||
|
||||
|
||||
|
||||
unsigned char *MD_getChallenge(char *str, struct sockaddr_in *crnd)
|
||||
{
|
||||
unsigned char *res = NULL;
|
||||
int i;
|
||||
|
||||
if (!str) {
|
||||
res = (unsigned char*)xmalloc(MD_CHALLENGE_LEN+1);
|
||||
res[0] = MD_CHALLENGE_LEN;
|
||||
for (i = 1; i < (MD_CHALLENGE_LEN + 1); i += MD5_DIGEST_LEN) {
|
||||
int k = MD5_DIGEST_LEN;
|
||||
if (k >= i + MD_CHALLENGE_LEN)
|
||||
k = MD_CHALLENGE_LEN + 1 - i;
|
||||
getrand(res+i, k, crnd);
|
||||
}
|
||||
} else {
|
||||
char *sp;
|
||||
if ((sp = strstr(str, "CRAM")) == NULL)
|
||||
return NULL;
|
||||
if ((sp = strstr(sp, "MD5")) == NULL)
|
||||
return NULL;
|
||||
while (sp[0])
|
||||
if (*sp++ == '-')
|
||||
break;
|
||||
if (!sp[0])
|
||||
return NULL;
|
||||
for (i = 0; isxdigit((int)sp[i]); i++)
|
||||
if (i >= 128)
|
||||
break;
|
||||
i /= 2;
|
||||
res = (unsigned char*)xmalloc(i+1);
|
||||
res[0] = (char)i;
|
||||
for (i = 0; isxdigit((int)sp[i]) && (i < 128); i++) {
|
||||
unsigned char c=tolower(sp[i]);
|
||||
if (c > '9')
|
||||
c -= 'a'-10;
|
||||
else
|
||||
c -= '0';
|
||||
if (!(i % 2))
|
||||
res[i / 2 + 1] = c << 4;
|
||||
else
|
||||
res[i / 2 + 1] |= c;
|
||||
}
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void MD_toString(char *rs, int len, unsigned char *digest)
|
||||
{
|
||||
int i,j;
|
||||
if (!rs)
|
||||
return;
|
||||
strcpy(rs, "CRAM-MD5-");
|
||||
for (i = 0, j = 9; i < len; i++) {
|
||||
unsigned char c = (digest[i] >> 4);
|
||||
if (c > 9)
|
||||
c += 'a'-10;
|
||||
else
|
||||
c += '0';
|
||||
rs[j++] = c;
|
||||
c = (digest[i] & 0xF);
|
||||
if (c > 9)
|
||||
c += 'a'-10;
|
||||
else
|
||||
c += '0';
|
||||
rs[j++] = c;
|
||||
}
|
||||
rs[j] = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
char *MD_buildDigest(char *pw, unsigned char *challenge)
|
||||
{
|
||||
char *rs = NULL;
|
||||
MDcaddr_t digest;
|
||||
|
||||
if ((!pw) || (!challenge))
|
||||
return rs;
|
||||
|
||||
hmac_md5(challenge+1, challenge[0], pw, strlen(pw), digest);
|
||||
rs = (char *)xmalloc(MD5_DIGEST_LEN * 2 + 10);
|
||||
MD_toString(rs, MD5_DIGEST_LEN, digest);
|
||||
return rs;
|
||||
}
|
||||
|
||||
65
mbcico/md5b.h
Normal file
65
mbcico/md5b.h
Normal file
@ -0,0 +1,65 @@
|
||||
#ifndef MD5B_H
|
||||
#define MD5B_H
|
||||
|
||||
/* $Id$ */
|
||||
|
||||
/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
|
||||
rights reserved.
|
||||
|
||||
License to copy and use this software is granted provided that it
|
||||
is identified as the "RSA Data Security, Inc. MD5 Message-Digest
|
||||
Algorithm" in all material mentioning or referencing this software
|
||||
or this function.
|
||||
|
||||
License is also granted to make and use derivative works provided
|
||||
that such works are identified as "derived from the RSA Data
|
||||
Security, Inc. MD5 Message-Digest Algorithm" in all material
|
||||
mentioning or referencing the derived work.
|
||||
|
||||
RSA Data Security, Inc. makes no representations concerning either
|
||||
the merchantability of this software or the suitability of this
|
||||
software for any particular purpose. It is provided "as is"
|
||||
without express or implied warranty of any kind.
|
||||
|
||||
These notices must be retained in any copies of any part of this
|
||||
documentation and/or software.
|
||||
*/
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
/* GLOBAL.H - RSAREF types and constants
|
||||
*/
|
||||
|
||||
/* RFC 1321 MD5 Message-Digest Algorithm April 1992 */
|
||||
|
||||
|
||||
/* POINTER defines a generic pointer type */
|
||||
typedef unsigned char *POINTER;
|
||||
|
||||
/* UINT2 defines a two byte word */
|
||||
typedef unsigned short int UINT2;
|
||||
/* UINT4 defines a four byte word */
|
||||
typedef unsigned long int UINT4;
|
||||
|
||||
/* end of GLOBAL.H ---------------------------------------------------------- */
|
||||
|
||||
/* MD5 context. */
|
||||
typedef struct {
|
||||
UINT4 state[4]; /* state (ABCD) */
|
||||
UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */
|
||||
unsigned char buffer[64]; /* input buffer */
|
||||
} MD5_CTX;
|
||||
|
||||
#define MD5_DIGEST_LEN 16
|
||||
|
||||
/* MD5 digest */
|
||||
typedef unsigned char MDcaddr_t[MD5_DIGEST_LEN];
|
||||
|
||||
#define MD_CHALLENGE_LEN 16
|
||||
|
||||
|
||||
unsigned char *MD_getChallenge(char *, struct sockaddr_in *);
|
||||
char *MD_buildDigest(char *, unsigned char *);
|
||||
void MD_toString(char *, int, unsigned char *);
|
||||
|
||||
|
||||
#endif
|
||||
@ -63,6 +63,7 @@ int rx_define_type(void);
|
||||
static int type;
|
||||
static char *data=NULL;
|
||||
|
||||
struct sockaddr_in peeraddr;
|
||||
|
||||
|
||||
char *typestr(int);
|
||||
@ -83,7 +84,6 @@ int session(faddr *a, node *nl, int role, int tp, char *dt)
|
||||
{
|
||||
int rc = MBERR_OK;
|
||||
fa_list *tmpl;
|
||||
struct sockaddr_in peeraddr;
|
||||
int addrlen = sizeof(struct sockaddr_in);
|
||||
|
||||
session_flags = 0;
|
||||
|
||||
@ -1222,16 +1222,17 @@ void s_mailer(void)
|
||||
mvprintw(16, 2, "10. No EMSI session");
|
||||
mvprintw(17, 2, "11. No Yooho/2U2");
|
||||
|
||||
mvprintw(15,31, "12. No Zmodem");
|
||||
mvprintw(16,31, "13. No Zedzap");
|
||||
mvprintw(17,31, "14. No Hydra");
|
||||
mvprintw(14,31, "12. No Zmodem");
|
||||
mvprintw(15,31, "13. No Zedzap");
|
||||
mvprintw(16,31, "14. No Hydra");
|
||||
mvprintw(17,31, "15. No MD5");
|
||||
|
||||
mvprintw(12,59, "18. Phonetrans 1-10");
|
||||
mvprintw(13,59, "19. Phonetrans 11-20");
|
||||
mvprintw(14,59, "20. Phonetrans 21-30");
|
||||
mvprintw(15,59, "21. Phonetrans 31-40");
|
||||
mvprintw(16,59, "22. Max. files");
|
||||
mvprintw(17,59, "23. Max. MB.");
|
||||
mvprintw(12,59, "16. Phonetrans 1-10");
|
||||
mvprintw(13,59, "17. Phonetrans 11-20");
|
||||
mvprintw(14,59, "18. Phonetrans 21-30");
|
||||
mvprintw(15,59, "19. Phonetrans 31-40");
|
||||
mvprintw(16,59, "20. Max. files");
|
||||
mvprintw(17,59, "21. Max. MB.");
|
||||
}
|
||||
|
||||
|
||||
@ -1286,14 +1287,15 @@ void e_mailer(void)
|
||||
show_bool(16,23, CFG.NoEMSI);
|
||||
show_bool(17,23, CFG.NoWazoo);
|
||||
|
||||
show_bool(15,52, CFG.NoZmodem);
|
||||
show_bool(16,52, CFG.NoZedzap);
|
||||
show_bool(17,52, CFG.NoHydra);
|
||||
show_bool(14,52, CFG.NoZmodem);
|
||||
show_bool(15,52, CFG.NoZedzap);
|
||||
show_bool(16,52, CFG.NoHydra);
|
||||
show_bool(17,52, CFG.NoMD5);
|
||||
|
||||
show_int( 16,75, CFG.Req_Files);
|
||||
show_int( 17,75, CFG.Req_MBytes);
|
||||
|
||||
switch(select_menu(23)) {
|
||||
switch(select_menu(21)) {
|
||||
case 0: return;
|
||||
case 1: E_LOGL(CFG.cico_loglevel, "1.14.1", s_mailer)
|
||||
case 2: E_STR( 8,23,20,CFG.Phone, "The mailer default ^phone number^ for this system")
|
||||
@ -1307,20 +1309,21 @@ void e_mailer(void)
|
||||
case 10:E_BOOL(16,23, CFG.NoEMSI, "If set then ^EMSI handshake^ is diabled")
|
||||
case 11:E_BOOL(17,23, CFG.NoWazoo, "If set then ^YooHoo/2U2^ (FTSC-0006) is disabled")
|
||||
|
||||
case 12:E_BOOL(15,52, CFG.NoZmodem, "If set then the ^Zmodem^ protocol is disabled")
|
||||
case 13:E_BOOL(16,52, CFG.NoZedzap, "If set then the ^Zedzap^ protocol is disabled")
|
||||
case 14:E_BOOL(17,52, CFG.NoHydra, "If set then the ^Hydra^ protocol is disabled")
|
||||
case 12:E_BOOL(14,52, CFG.NoZmodem, "If set then the ^Zmodem^ protocol is disabled")
|
||||
case 13:E_BOOL(15,52, CFG.NoZedzap, "If set then the ^Zedzap^ protocol is disabled")
|
||||
case 14:E_BOOL(16,52, CFG.NoHydra, "If set then the ^Hydra^ protocol is disabled")
|
||||
case 15:E_BOOL(17,52, CFG.NoMD5, "If set then no ^MD5 crypted^ passwords are used with binkp sessions")
|
||||
|
||||
case 18:e_trans(0);
|
||||
case 16:e_trans(0);
|
||||
break;
|
||||
case 19:e_trans(10);
|
||||
case 17:e_trans(10);
|
||||
break;
|
||||
case 20:e_trans(20);
|
||||
case 18:e_trans(20);
|
||||
break;
|
||||
case 21:e_trans(30);
|
||||
case 19:e_trans(30);
|
||||
break;
|
||||
case 22:E_INT(16,75, CFG.Req_Files, "Maximum ^files^ to request, 0 is unlimited")
|
||||
case 23:E_INT(17,75, CFG.Req_MBytes, "Maximum ^MBytes^ to request, 0 is unlimited")
|
||||
case 20:E_INT(16,75, CFG.Req_Files, "Maximum ^files^ to request, 0 is unlimited")
|
||||
case 21:E_INT(17,75, CFG.Req_MBytes, "Maximum ^MBytes^ to request, 0 is unlimited")
|
||||
}
|
||||
};
|
||||
}
|
||||
@ -1921,6 +1924,7 @@ int global_doc(FILE *fp, FILE *toc, int page)
|
||||
fprintf(fp, " No Zmodem %s\n", getboolean(CFG.NoZmodem));
|
||||
fprintf(fp, " No Zedzap %s\n", getboolean(CFG.NoZedzap));
|
||||
fprintf(fp, " No Hydra %s\n", getboolean(CFG.NoHydra));
|
||||
fprintf(fp, " No MD5 passwords %s\n", getboolean(CFG.NoMD5));
|
||||
fprintf(fp, " Max request files %d\n", CFG.Req_Files);
|
||||
fprintf(fp, " Max request MBytes %d\n", CFG.Req_MBytes);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user