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

EAP-PEAP peer: Support vendor EAP method in Phase 2

Browse source 
The implementation was previously hardcoded to allow only the Microsoft
SoH expanded EAP method in Phase 2 in addition to non-expanded EAP
methods. Extend that to allow any vendor EAP method with an expanded
header to be used.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-08-17 15:40:59 +03:00
parent f2ef4f2550
commit 887d8703bb
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/eap_peer/eap_peap.c
View file

@ -603,6 +603,8 @@ static int eap_peap_phase2_request(struct eap_sm *sm,
u8 *pos; u8 *pos;
struct eap_method_ret iret; struct eap_method_ret iret;
struct eap_peer_config *config = eap_get_config(sm); struct eap_peer_config *config = eap_get_config(sm);
int vendor;
enum eap_type method;
if (len <= sizeof(struct eap_hdr)) { if (len <= sizeof(struct eap_hdr)) {
wpa_printf(MSG_INFO, "EAP-PEAP: too short " wpa_printf(MSG_INFO, "EAP-PEAP: too short "
@ -666,13 +668,26 @@ static int eap_peap_phase2_request(struct eap_sm *sm,
#endif /* EAP_TNC */ #endif /* EAP_TNC */
/* fall through */ /* fall through */
default: default:
vendor = EAP_VENDOR_IETF;
method = *pos;
if (method == EAP_TYPE_EXPANDED) {
if (len < sizeof(struct eap_hdr) + 8) {
wpa_printf(MSG_INFO,
"EAP-PEAP: Too short Phase 2 request (expanded header) (len=%lu)",
(unsigned long) len);
return -1;
}
vendor = WPA_GET_BE24(pos + 1);
method = WPA_GET_BE32(pos + 4);
}
if (data->phase2_type.vendor == EAP_VENDOR_IETF && if (data->phase2_type.vendor == EAP_VENDOR_IETF &&
data->phase2_type.method == EAP_TYPE_NONE) { data->phase2_type.method == EAP_TYPE_NONE) {
size_t i; size_t i;
for (i = 0; i < data->num_phase2_types; i++) { for (i = 0; i < data->num_phase2_types; i++) {
if (data->phase2_types[i].vendor != if (data->phase2_types[i].vendor != vendor ||
EAP_VENDOR_IETF || data->phase2_types[i].method != method)
data->phase2_types[i].method != *pos)
continue; continue;
data->phase2_type.vendor = data->phase2_type.vendor =
@ -686,8 +701,9 @@ static int eap_peap_phase2_request(struct eap_sm *sm,
break; break;
} }
} }
if (*pos != data->phase2_type.method || if (vendor != data->phase2_type.vendor ||
*pos == EAP_TYPE_NONE) { method != data->phase2_type.method ||
(vendor == EAP_VENDOR_IETF && method == EAP_TYPE_NONE)) {
if (eap_peer_tls_phase2_nak(data->phase2_types, if (eap_peer_tls_phase2_nak(data->phase2_types,
data->num_phase2_types, data->num_phase2_types,
hdr, resp)) hdr, resp))