aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShiva Sankar Gajula <c_ssgaju@qti.qualcomm.com>2017-12-01 23:22:55 (GMT)
committerJouni Malinen <j@w1.fi>2017-12-02 10:00:44 (GMT)
commita2660890a5ed7a3053d0ed5976df7879ab2509da (patch)
treeaf6c8aa1c879c4c53d5838a401fd50ff1a3d15e3
parent41dafe0c0a8ccd204300210813ebd3a286022a8b (diff)
downloadhostap-a2660890a5ed7a3053d0ed5976df7879ab2509da.zip
hostap-a2660890a5ed7a3053d0ed5976df7879ab2509da.tar.gz
hostap-a2660890a5ed7a3053d0ed5976df7879ab2509da.tar.bz2
WPS: Allow WPS to be enabled in CCMP-256 and GCMP-256 only cases
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>
-rw-r--r--src/ap/ap_config.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
index 68658ae..23e1bed 100644
--- a/src/ap/ap_config.c
+++ b/src/ap/ap_config.c
@@ -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;