]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
WPS: Allow WPS to be enabled in CCMP-256 and GCMP-256 only cases
authorShiva Sankar Gajula <c_ssgaju@qti.qualcomm.com>
Fri, 1 Dec 2017 23:22:55 +0000 (01:22 +0200)
committerJouni Malinen <j@w1.fi>
Sat, 2 Dec 2017 10:00:44 +0000 (12:00 +0200)
Extend the check against WPA/TKIP only configuration by adding CCMP-256
and GCMP-256 to the list of allowed ciphers. This is needed to allow WPS
to be enabled in AP configurations where neither CCMP-128 nor GCMP-128
are enabled.

Signed-off-by: Shiva Sankar Gajula <sgajula@qti.qualcomm.com>
src/ap/ap_config.c

index 68658ae36b07e537325d29382199670500482f62..23e1bed5ed6d85dce1f7362a744679d718dc2cbe 100644 (file)
@@ -936,7 +936,9 @@ static int hostapd_config_check_bss(struct hostapd_bss_config *bss,
 
        if (full_config && bss->wps_state && bss->wpa &&
            (!(bss->wpa & 2) ||
-            !(bss->rsn_pairwise & (WPA_CIPHER_CCMP | WPA_CIPHER_GCMP)))) {
+            !(bss->rsn_pairwise & (WPA_CIPHER_CCMP | WPA_CIPHER_GCMP |
+                                   WPA_CIPHER_CCMP_256 |
+                                   WPA_CIPHER_GCMP_256)))) {
                wpa_printf(MSG_INFO, "WPS: WPA/TKIP configuration without "
                           "WPA2/CCMP/GCMP forced WPS to be disabled");
                bss->wps_state = 0;