abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-08-08 16:43:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Removed all stuff requiring encryption."

Browse Source 
This reverts commit c268c5e07c.

Conflicts:

	src/netif/ppp/auth.c
	src/netif/ppp/ppp.c
	src/netif/ppp/pppmy.c
	src/netif/ppp/pppmy.h
This commit is contained in:
Sylvain Rochet
2012-05-21 22:04:04 +02:00
parent 795d5807b5
commit b896203dcf
20 changed files with 4455 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,12 +106,17 @@
#include "pppd.h"
#include "fsm.h"
#include "lcp.h"
#include "ccp.h"
#include "ecp.h"
#include "ipcp.h"
#include "upap.h"
#include "chap-new.h"
#if EAP_SUPPORT
#include "eap.h"
#endif /* EAP_SUPPORT */
#if CBCP_SUPPORT
#include "cbcp.h"
#endif
#include "pathnames.h"
#include "session.h"
@@ -844,9 +849,48 @@ start_networks(unit)
{
int i;
struct protent *protp;
int ecp_required, mppe_required;
new_phase(PHASE_NETWORK);
#ifdef HAVE_MULTILINK
if (multilink) {
if (mp_join_bundle()) {
if (multilink_join_hook)
(*multilink_join_hook)();
if (updetach && !nodetach)
detach();
return;
}
}
#endif /* HAVE_MULTILINK */
#ifdef PPP_FILTER
if (!demand)
set_filters(&pass_filter, &active_filter);
#endif
/* Start CCP and ECP */
for (i = 0; (protp = protocols[i]) != NULL; ++i)
if ((protp->protocol == PPP_ECP || protp->protocol == PPP_CCP)
&& protp->enabled_flag && protp->open != NULL)
(*protp->open)(0);
/*
* Bring up other network protocols iff encryption is not required.
*/
ecp_required = ecp_gotoptions[unit].required;
mppe_required = ccp_gotoptions[unit].mppe;
if (!ecp_required && !mppe_required)
continue_networks(unit);
}
void
continue_networks(unit)
int unit;
{
int i;
struct protent *protp;
/*
* Start the "real" network protocols.
*/
@@ -1292,10 +1336,15 @@ auth_reset(unit)
ao->neg_eap = !ppp_settings.refuse_eap;
#endif /* EAP_SUPPORT */
if(!ppp_settings.refuse_chap) {
ao->chap_mdtype = MDTYPE_MD5;
ao->neg_chap = 1;
}
ao->chap_mdtype = MDTYPE_NONE;
if(!ppp_settings.refuse_chap)
ao->chap_mdtype |= MDTYPE_MD5;
if(!ppp_settings.refuse_mschap)
ao->chap_mdtype |= MDTYPE_MICROSOFT;
if(!ppp_settings.refuse_mschap_v2)
ao->chap_mdtype |= MDTYPE_MICROSOFT_V2;
ao->neg_chap = (ao->chap_mdtype != MDTYPE_NONE);
} else {
ao->neg_upap = 0;
@@ -1306,6 +1355,7 @@ auth_reset(unit)
ao->chap_mdtype = MDTYPE_NONE;
}
printf("neg_upap: %d\n", ao->neg_upap);
printf("neg_chap: %d\n", ao->neg_chap);
printf("neg_chap_md5: %d\n", !!(ao->chap_mdtype&MDTYPE_MD5) );