mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-02-22 12:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed pcb->chap_mdtype_all

Browse Source
This commit is contained in:
Sylvain Rochet 2012-06-19 23:14:31 +02:00
parent 7ecfe6304a
commit 26250f1953
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/netif/ppp/auth.c
View File

@ -1364,8 +1364,8 @@ auth_check_options()
#endif /* EAP_SUPPORT */ #endif /* EAP_SUPPORT */
) { ) {
#if CHAP_SUPPORT #if CHAP_SUPPORT
wo->neg_chap = pcb->chap_mdtype_all != MDTYPE_NONE; wo->neg_chap = CHAP_MDTYPE_SUPPORTED != MDTYPE_NONE;
wo->chap_mdtype = pcb->chap_mdtype_all; wo->chap_mdtype = CHAP_MDTYPE_SUPPORTED;
#endif /* CHAP_SUPPORT */ #endif /* CHAP_SUPPORT */
#if PAP_SUPPORT #if PAP_SUPPORT
wo->neg_upap = 1; wo->neg_upap = 1;

6
src/netif/ppp/chap-new.c
View File

@ -44,12 +44,8 @@
#include "chap-new.h" #include "chap-new.h"
#include "chap-md5.h" #include "chap-md5.h"
#if MSCHAP_SUPPORT #if MSCHAP_SUPPORT
#include "chap_ms.h" #include "chap_ms.h"
#define MDTYPE_ALL (MDTYPE_MICROSOFT_V2 | MDTYPE_MICROSOFT | MDTYPE_MD5)
#else
#define MDTYPE_ALL (MDTYPE_MD5)
#endif #endif
/* Hook for a plugin to validate CHAP challenge */ /* Hook for a plugin to validate CHAP challenge */
@ -128,8 +124,6 @@ static void chap_init(ppp_pcb *pcb) {
memset(&pcb->chap_server, 0, sizeof(chap_server_state)); memset(&pcb->chap_server, 0, sizeof(chap_server_state));
#endif /* PPP_SERVER */ #endif /* PPP_SERVER */
pcb->chap_mdtype_all = MDTYPE_ALL;
chap_md5_init(); chap_md5_init();
#if MSCHAP_SUPPORT #if MSCHAP_SUPPORT
chapms_init(); chapms_init();

2
src/netif/ppp/lcp.c
View File

@ -384,7 +384,7 @@ static void lcp_init(ppp_pcb *pcb) {
ao->neg_asyncmap = 1; ao->neg_asyncmap = 1;
#if CHAP_SUPPORT #if CHAP_SUPPORT
ao->neg_chap = 1; ao->neg_chap = 1;
ao->chap_mdtype = pcb->chap_mdtype_all; ao->chap_mdtype = CHAP_MDTYPE_SUPPORTED;
#endif /* CHAP_SUPPORT */ #endif /* CHAP_SUPPORT */
#if PAP_SUPPORT #if PAP_SUPPORT
ao->neg_upap = 1; ao->neg_upap = 1;

2
src/netif/ppp/ppp.h
View File

@ -324,8 +324,6 @@ struct ppp_pcb_s {
#endif /* PAP_SUPPORT */ #endif /* PAP_SUPPORT */
#if CHAP_SUPPORT #if CHAP_SUPPORT
/* FIXME: we can probably remove this entry */
int chap_mdtype_all; /* hashes supported by this instance of pppd */
chap_client_state chap_client; chap_client_state chap_client;
#if PPP_SERVER #if PPP_SERVER
chap_server_state chap_server; chap_server_state chap_server;

11
src/netif/ppp/ppp_impl.h
View File

@ -357,6 +357,17 @@ extern struct protent *protocols[];
#define PHASE_HOLDOFF 11 #define PHASE_HOLDOFF 11
#define PHASE_MASTER 12 #define PHASE_MASTER 12
/* Supported CHAP protocols */
#if CHAP_SUPPORT
#include "chap-new.h"
#if MSCHAP_SUPPORT
#define CHAP_MDTYPE_SUPPORTED (MDTYPE_MICROSOFT_V2 | MDTYPE_MICROSOFT | MDTYPE_MD5)
#else
#define CHAP_MDTYPE_SUPPORTED (MDTYPE_MD5)
#endif
#else
#define CHAP_MDTYPE_SUPPORTED (MDTYPE_NONE)
#endif
#if PPP_STATS_SUPPORT #if PPP_STATS_SUPPORT
/* /*