aboutsummaryrefslogtreecommitdiffstats
path: root/src/wps
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2020-02-29 14:56:01 (GMT)
committerJouni Malinen <j@w1.fi>2020-02-29 14:56:44 (GMT)
commitbca44f4e4ed5a3c63cc5cebd9c85ffe4299f6db6 (patch)
treec551b3843b26daa6f2b9a91ce61455e99039fa27 /src/wps
parent886ee6775ff16d1aced46b4aeeb4684627c016d4 (diff)
downloadhostap-bca44f4e4ed5a3c63cc5cebd9c85ffe4299f6db6.zip
hostap-bca44f4e4ed5a3c63cc5cebd9c85ffe4299f6db6.tar.gz
hostap-bca44f4e4ed5a3c63cc5cebd9c85ffe4299f6db6.tar.bz2
WPS: Remove static-WEP-only workaround
WEP provisioning was removed from WPS v2, so this workaround functionality has not been applicable. Remove it completely. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'src/wps')
-rw-r--r--src/wps/wps.h5
-rw-r--r--src/wps/wps_registrar.c24
2 files changed, 0 insertions, 29 deletions
diff --git a/src/wps/wps.h b/src/wps/wps.h
index 3b56da7..93888b0 100644
--- a/src/wps/wps.h
+++ b/src/wps/wps.h
@@ -395,11 +395,6 @@ struct wps_registrar_config {
int disable_auto_conf;
/**
- * static_wep_only - Whether the BSS supports only static WEP
- */
- int static_wep_only;
-
- /**
* dualband - Whether this is a concurrent dualband AP
*/
int dualband;
diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index fb6c71d..d71a543 100644
--- a/src/wps/wps_registrar.c
+++ b/src/wps/wps_registrar.c
@@ -173,7 +173,6 @@ struct wps_registrar {
int sel_reg_union;
int sel_reg_dev_password_id_override;
int sel_reg_config_methods_override;
- int static_wep_only;
int dualband;
int force_per_enrollee_psk;
@@ -697,7 +696,6 @@ wps_registrar_init(struct wps_context *wps,
reg->disable_auto_conf = cfg->disable_auto_conf;
reg->sel_reg_dev_password_id_override = -1;
reg->sel_reg_config_methods_override = -1;
- reg->static_wep_only = cfg->static_wep_only;
reg->dualband = cfg->dualband;
reg->force_per_enrollee_psk = cfg->force_per_enrollee_psk;
@@ -1390,28 +1388,6 @@ static int wps_set_ie(struct wps_registrar *reg)
return -1;
}
- if (reg->static_wep_only) {
- /*
- * Windows XP and Vista clients can get confused about
- * EAP-Identity/Request when they probe the network with
- * EAPOL-Start. In such a case, they may assume the network is
- * using IEEE 802.1X and prompt user for a certificate while
- * the correct (non-WPS) behavior would be to ask for the
- * static WEP key. As a workaround, use Microsoft Provisioning
- * IE to advertise that legacy 802.1X is not supported.
- */
- const u8 ms_wps[7] = {
- WLAN_EID_VENDOR_SPECIFIC, 5,
- /* Microsoft Provisioning IE (00:50:f2:5) */
- 0x00, 0x50, 0xf2, 5,
- 0x00 /* no legacy 802.1X or MS WPS */
- };
- wpa_printf(MSG_DEBUG, "WPS: Add Microsoft Provisioning IE "
- "into Beacon/Probe Response frames");
- wpabuf_put_data(beacon, ms_wps, sizeof(ms_wps));
- wpabuf_put_data(probe, ms_wps, sizeof(ms_wps));
- }
-
return wps_cb_set_ie(reg, beacon, probe);
}