mirror of
https://github.com/vanhoefm/fragattacks.git
synced 2024-11-25 00:38:24 -05:00
HS 2.0: Do not indicate HS 2.0 status without WPA2-Enterprise
Hotspot 2.0 allows only WPA2-Enterprise to be used, so other types of networks must not be indicated as Hotspot 2.0 networks even if they (incorrectly) advertise HS 2.0 support. Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
parent
2b95f57ba5
commit
4ed34f5acd
@ -1124,7 +1124,9 @@ static int wpa_supplicant_ctrl_iface_status(struct wpa_supplicant *wpa_s,
|
|||||||
|
|
||||||
#ifdef CONFIG_HS20
|
#ifdef CONFIG_HS20
|
||||||
if (wpa_s->current_bss &&
|
if (wpa_s->current_bss &&
|
||||||
wpa_bss_get_vendor_ie(wpa_s->current_bss, HS20_IE_VENDOR_TYPE)) {
|
wpa_bss_get_vendor_ie(wpa_s->current_bss, HS20_IE_VENDOR_TYPE) &&
|
||||||
|
wpa_s->wpa_proto == WPA_PROTO_RSN &&
|
||||||
|
wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) {
|
||||||
ret = os_snprintf(pos, end - pos, "hs20=1\n");
|
ret = os_snprintf(pos, end - pos, "hs20=1\n");
|
||||||
if (ret < 0 || ret >= end - pos)
|
if (ret < 0 || ret >= end - pos)
|
||||||
return pos - buf;
|
return pos - buf;
|
||||||
@ -1623,7 +1625,7 @@ static int wpa_supplicant_ctrl_iface_scan_result(
|
|||||||
pos += ret;
|
pos += ret;
|
||||||
}
|
}
|
||||||
#ifdef CONFIG_HS20
|
#ifdef CONFIG_HS20
|
||||||
if (wpa_bss_get_vendor_ie(bss, HS20_IE_VENDOR_TYPE)) {
|
if (wpa_bss_get_vendor_ie(bss, HS20_IE_VENDOR_TYPE) && ie2) {
|
||||||
ret = os_snprintf(pos, end - pos, "[HS20]");
|
ret = os_snprintf(pos, end - pos, "[HS20]");
|
||||||
if (ret < 0 || ret >= end - pos)
|
if (ret < 0 || ret >= end - pos)
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user