jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Interworking: Default to EAP-MSCHAPv2 with EAP-PEAP

Browse source 
If the NAI Realm list indicates that EAP-PEAP is used, use EAP-MSCHAPv2
as the Phase 2 method by default if the NAI Realm list does not specify
the tunneled method.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-12-17 23:27:15 +02:00
parent f1b44874c2
commit 03c961e542
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
wpa_supplicant/interworking.c
View file

@ -516,9 +516,14 @@ static int nai_realm_cred_username(struct nai_realm_eap *eap)
return 0; return 0;
} }
if (eap->method == EAP_TYPE_PEAP && if (eap->method == EAP_TYPE_PEAP) {
eap_get_name(EAP_VENDOR_IETF, eap->inner_method) == NULL) if (eap->inner_method &&
return 0; eap_get_name(EAP_VENDOR_IETF, eap->inner_method) == NULL)
return 0;
if (!eap->inner_method &&
eap_get_name(EAP_VENDOR_IETF, EAP_TYPE_MSCHAPV2) == NULL)
return 0;
}
if (eap->method == EAP_TYPE_TTLS) { if (eap->method == EAP_TYPE_TTLS) {
if (eap->inner_method == 0 && eap->inner_non_eap == 0) if (eap->inner_method == 0 && eap->inner_non_eap == 0)
@ -1294,7 +1299,10 @@ int interworking_connect(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
break; break;
case EAP_TYPE_PEAP: case EAP_TYPE_PEAP:
os_snprintf(buf, sizeof(buf), "\"auth=%s\"", os_snprintf(buf, sizeof(buf), "\"auth=%s\"",
eap_get_name(EAP_VENDOR_IETF, eap->inner_method)); eap_get_name(EAP_VENDOR_IETF,
eap->inner_method ?
eap->inner_method :
EAP_TYPE_MSCHAPV2));
if (wpa_config_set(ssid, "phase2", buf, 0) < 0) if (wpa_config_set(ssid, "phase2", buf, 0) < 0)
goto fail; goto fail;
break; break;