aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/ap.c
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2014-03-25 15:40:50 (GMT)
committerJouni Malinen <j@w1.fi>2014-03-25 16:33:21 (GMT)
commitc201f93a9eb7e9a9781879d9ecddbc48f9ea80e6 (patch)
tree1c74a5724085a83fc38b2fd63d7ff853c8305b83 /wpa_supplicant/ap.c
parent91364b7f10c0c91fc44dc050eb09b2fb859481b4 (diff)
downloadhostap-c201f93a9eb7e9a9781879d9ecddbc48f9ea80e6.zip
hostap-c201f93a9eb7e9a9781879d9ecddbc48f9ea80e6.tar.gz
hostap-c201f93a9eb7e9a9781879d9ecddbc48f9ea80e6.tar.bz2
WPS: Enable WSC 2.0 support unconditionally
There is not much point in building devices with WPS 1.0 only supported nowadays. As such, there is not sufficient justification for maintaining extra complexity for the CONFIG_WPS2 build option either. Remove this by enabling WSC 2.0 support unconditionally. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wpa_supplicant/ap.c')
-rw-r--r--wpa_supplicant/ap.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index 12cb4b6..e7d59de 100644
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -311,12 +311,10 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s,
if (bss->ssid.security_policy != SECURITY_WPA_PSK &&
bss->ssid.security_policy != SECURITY_PLAINTEXT)
goto no_wps;
-#ifdef CONFIG_WPS2
if (bss->ssid.security_policy == SECURITY_WPA_PSK &&
(!(bss->rsn_pairwise & WPA_CIPHER_CCMP) || !(bss->wpa & 2)))
goto no_wps; /* WPS2 does not allow WPA/TKIP-only
* configuration */
-#endif /* CONFIG_WPS2 */
bss->eap_server = 1;
if (!ssid->ignore_broadcast_ssid)