diff options
| author | David F. Skoll <dfs@roaringpenguin.com> | 2002-05-21 17:26:49 +0000 |
|---|---|---|
| committer | David F. Skoll <dfs@roaringpenguin.com> | 2002-05-21 17:26:49 +0000 |
| commit | 7bb8beb860037a6c18dd0b64b8d542a20aa2c8c0 (patch) | |
| tree | 512ab75219f976399a9ce2d9288f22a935cb9968 /include | |
| parent | 85fb3a1ac84c4bc9bf1b66d00ab0a09def5c38db (diff) | |
| download | ppp-7bb8beb860037a6c18dd0b64b8d542a20aa2c8c0.tar.gz | |
ECP patches from Frank Cusack:
- If encryption is required, don't bring up IP/IPv6/IPX until the
encryption negotiation has completed.
- Shut down LCP if the peer sends an LCP ConfRej instead of CCP ConfRej
to our MPPE offer. This fixes a bug where the server could not enforce
use of encryption in some cases.
- Don't send the M=<message> part of an MS-CHAPv2 success packet to peers
that don't know how to deal with it. This allows pre-win2k systems to
authenticate.
- Don't shut down lcp if MPPE was present in peer's CCP offer along with
other options. This allows pre-win2k systems to do MPPE (they offer
Stac LZS with MPPE).
- Add the beginnings of ecp.c.
- Other minor changes.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ppp_defs.h | 6 | ||||
| -rw-r--r-- | include/net/ppp_defs.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h index e390c56..489f84a 100644 --- a/include/linux/ppp_defs.h +++ b/include/linux/ppp_defs.h @@ -1,4 +1,4 @@ -/* $Id: ppp_defs.h,v 1.9 2000/03/27 06:03:36 paulus Exp $ */ +/* $Id: ppp_defs.h,v 1.10 2002/05/21 17:26:48 dfs Exp $ */ /* * ppp_defs.h - PPP definitions. @@ -28,7 +28,7 @@ */ /* - * ==FILEVERSION 20000114== + * ==FILEVERSION 20020521== * * NOTE TO MAINTAINERS: * If you modify this file at all, please set the above date. @@ -80,6 +80,8 @@ #define PPP_IPV6CP 0x8057 /* IPv6 Control Protocol */ #define PPP_CCPFRAG 0x80fb /* CCP at link level (below MP bundle) */ #define PPP_CCP 0x80fd /* Compression Control Protocol */ +#define PPP_ECPFRAG 0x8055 /* ECP at link level (below MP bundle) */ +#define PPP_ECP 0x8053 /* Encryption Control Protocol */ #define PPP_LCP 0xc021 /* Link Control Protocol */ #define PPP_PAP 0xc023 /* Password Authentication Protocol */ #define PPP_LQR 0xc025 /* Link Quality Report protocol */ diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h index 4152b06..bda882e 100644 --- a/include/net/ppp_defs.h +++ b/include/net/ppp_defs.h @@ -1,4 +1,4 @@ -/* $Id: ppp_defs.h,v 1.14 1999/08/13 01:55:40 paulus Exp $ */ +/* $Id: ppp_defs.h,v 1.15 2002/05/21 17:26:48 dfs Exp $ */ /* * ppp_defs.h - PPP definitions. @@ -79,6 +79,7 @@ #define PPP_IPXCP 0x802b /* IPX Control Protocol */ #define PPP_IPV6CP 0x8057 /* IPv6 Control Protocol */ #define PPP_CCP 0x80fd /* Compression Control Protocol */ +#define PPP_ECP 0x8053 /* Encryption Control Protocol */ #define PPP_LCP 0xc021 /* Link Control Protocol */ #define PPP_PAP 0xc023 /* Password Authentication Protocol */ #define PPP_LQR 0xc025 /* Link Quality Report protocol */ |