From: Paul Mackerras Date: Thu, 27 Nov 2003 21:25:25 +0000 (+0000) Subject: Remove references to the old CHAP code. X-Git-Tag: ppp-2.4.7~272 X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=7292aba5fee34d251b7caa488e02db1c48e75b2d Remove references to the old CHAP code. --- diff --git a/README.MSCHAP80 b/README.MSCHAP80 index 7c16f3e..3fcd566 100644 --- a/README.MSCHAP80 +++ b/README.MSCHAP80 @@ -192,77 +192,6 @@ from the other end. If you see pppd sending out LCP config requests without getting any reply, try putting something in your chat script to send the word CLIENT after the modem has connected. -If everything compiles cleanly, but fails at authentication time, then -it might be a case of the MD4 or DES code screwing up. The following -small program can be used to test the MS-CHAP code to see if it -produces a known response: - ------------------ -#include - -#include "pppd.h" -#include "chap.h" -#include "chap_ms.h" - -int main(argc, argv) - int argc; - char *argv[]; -{ - u_char challenge[8]; - int challengeInt[sizeof(challenge)]; - chap_state cstate; - int i; - - if (argc != 3) { - fprintf(stderr, "Usage: %s <16-hexchar challenge> \n", - argv[0]); exit(1); - } - - sscanf(argv[1], "%2x%2x%2x%2x%2x%2x%2x%2x", - challengeInt + 0, challengeInt + 1, challengeInt + 2, - challengeInt + 3, challengeInt + 4, challengeInt + 5, - challengeInt + 6, challengeInt + 7); - - for (i = 0; i < sizeof(challenge); i++) - challenge[i] = (u_char)challengeInt[i]; - - ChapMS(&cstate, challenge, argv[2], strlen(argv[2]), - (MS_ChapResponse *)&cstate.response); - printf("Response length is %d, response is:", cstate.resp_length); - - for (i = 0; i < cstate.resp_length; i++) { - if (i % 8 == 0) - putchar('\n'); - printf("%02X ", (unsigned int)cstate.response[i]); - } - - putchar('\n'); - - exit(0); -} -------------- - -This needs to link against chap_ms.o, md4.o, sha1.o and the DES library. -When you run it with the command line: - - $ testchap 00000000000000000000000000000000 hello - -it should output the following: - - Response length is 49, response is: - 00 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 00 - F4 D9 9D AF 82 64 DC 3C - 53 F9 BC 92 14 B5 5D 9E - 78 C4 21 48 9D B7 A8 B4 - 01 - -if not, then either the DES library is not working, the MD4 code isn't -working, or there are some problems with the port of the code in -chap_ms.c. - - STILL TO DO A site using only MS-CHAP to authenticate has no need to store cleartext diff --git a/README.cbcp b/README.cbcp index abf7047..f1e4ba1 100644 --- a/README.cbcp +++ b/README.cbcp @@ -22,12 +22,8 @@ The ietf task group has decided to recommend that the LCP sequence be extended to permit the callback operation. For this reason, these patches are not 'part' of pppd but are an adjunct to the code. -To enable CBCP support, all that is required is to change the -appropriate Makefile in the pppd subdirectory to add "-DCBCP_SUPPORT" -to the CFLAGS definition and add cbcp.o to the list of object files, -and then recompile pppd. The patch below does this for Makefile.bsd -and Makefile.linux. You can patch the Makefiles by running -patch -p1 < README.cbcp. +To enable CBCP support, all that is required is to uncomment the line +in Makefile.linux that sets CBCP=y and recompile pppd. I use such script to make a callback: @@ -53,42 +49,3 @@ SERVER NAME PASSWORD You have to use your real login name, remote server name and password. ---------------------------------cut here------------------------------- -diff -ur ppp-2.4.1.orig/pppd/Makefile.bsd ppp-2.4.1/pppd/Makefile.bsd ---- ppp-2.4.1.orig/pppd/Makefile.bsd Mon Apr 12 08:24:44 1999 -+++ ppp-2.4.1/pppd/Makefile.bsd Tue Nov 20 02:36:49 2001 -@@ -4,11 +4,11 @@ - # -D_BITYPES is for FreeBSD, which doesn't define anything to - # tell us that u_int32_t gets defined if is included. - # Remove for older *BSD systems for which this isn't true. --CFLAGS+= -g -I../include -DHAVE_PATHS_H -D_BITYPES -+CFLAGS+= -g -I../include -DHAVE_PATHS_H -D_BITYPES -DCBCP_SUPPORT - - PROG= pppd - SRCS= main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \ -- demand.c auth.c options.c utils.c sys-bsd.c -+ demand.c auth.c options.c utils.c sys-bsd.c cbcp.c - MAN= pppd.cat8 - MAN8= pppd.8 - BINMODE=4555 -diff -ur ppp-2.4.1.orig/pppd/Makefile.linux ppp-2.4.1/pppd/Makefile.linux ---- ppp-2.4.1.orig/pppd/Makefile.linux Wed May 23 05:39:50 2001 -+++ ppp-2.4.1/pppd/Makefile.linux Tue Nov 20 02:40:56 2001 -@@ -15,7 +15,7 @@ - MANPAGES = pppd.8 - PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o ccp.o \ - auth.o options.o demand.o utils.o sys-linux.o ipxcp.o multilink.o \ -- tdb.o tty.o -+ tdb.o tty.o cbcp.o - - all: pppd - -@@ -56,7 +56,7 @@ - - INCLUDE_DIRS= -I../include - --COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MULTILINK -DHAVE_MMAP -+COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MULTILINK -DHAVE_MMAP -DCBCP_SUPPORT - - CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) - diff --git a/pppd/Makefile.sol2 b/pppd/Makefile.sol2 index f15d947..25f5772 100644 --- a/pppd/Makefile.sol2 +++ b/pppd/Makefile.sol2 @@ -1,6 +1,6 @@ # # Makefile for pppd under Solaris 2. -# $Id: Makefile.sol2,v 1.23 2002/11/02 19:48:12 carlsonj Exp $ +# $Id: Makefile.sol2,v 1.24 2003/11/27 21:25:25 paulus Exp $ # include ../Makedefs.com @@ -8,8 +8,8 @@ include ../Makedefs.com CFLAGS = -I../include -DSVR4 -DSOL2 $(COPTS) LIBS = -lsocket -lnsl -OBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o eap.o md5.o tty.o \ - ccp.o ecp.o auth.o options.o demand.o utils.o sys-solaris.o +OBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap-new.o eap.o md5.o \ + tty.o ccp.o ecp.o auth.o options.o demand.o utils.o sys-solaris.o # # uncomment the following to enable plugins diff --git a/pppd/Makefile.sunos4 b/pppd/Makefile.sunos4 index 7bd5c3a..df6f647 100644 --- a/pppd/Makefile.sunos4 +++ b/pppd/Makefile.sunos4 @@ -1,6 +1,6 @@ # # Makefile for pppd under SunOS 4. -# $Id: Makefile.sunos4,v 1.13 2002/11/02 19:48:12 carlsonj Exp $ +# $Id: Makefile.sunos4,v 1.14 2003/11/27 21:25:25 paulus Exp $ # include ../sunos4/Makedefs @@ -12,7 +12,7 @@ CFLAGS = $(COPTS) -I../include -DSUNOS4 -DGIDSET_TYPE=int \ all: pppd -OBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o ccp.o ecp.o \ +OBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap-new.o md5.o ccp.o ecp.o \ auth.o options.o demand.o utils.o sys-sunos4.o tty.o eap.o pppd: $(OBJS)