aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/wps_supplicant.c
diff options
context:
space:
mode:
authorAhmad Masri <qca_amasri@qca.qualcomm.com>2014-10-26 12:04:29 (GMT)
committerJouni Malinen <j@w1.fi>2014-10-27 15:15:09 (GMT)
commitd77419d2348a9a08485dc00a09aa42dad21d6580 (patch)
treeb91fd84d33badf9c86182f62f18fcadb81287b45 /wpa_supplicant/wps_supplicant.c
parent72a8e30b964d054ed54d2f8b092450f4b7418333 (diff)
downloadhostap-d77419d2348a9a08485dc00a09aa42dad21d6580.zip
hostap-d77419d2348a9a08485dc00a09aa42dad21d6580.tar.gz
hostap-d77419d2348a9a08485dc00a09aa42dad21d6580.tar.bz2
P2P: Support GCMP as part of 60 GHz support
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wpa_supplicant/wps_supplicant.c')
-rw-r--r--wpa_supplicant/wps_supplicant.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 40a5c69..40f235f 100644
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -286,7 +286,9 @@ static void wpas_wps_remove_dup_network(struct wpa_supplicant *wpa_s,
/* compare security parameters */
if (ssid->auth_alg != new_ssid->auth_alg ||
ssid->key_mgmt != new_ssid->key_mgmt ||
- ssid->group_cipher != new_ssid->group_cipher)
+ (ssid->group_cipher != new_ssid->group_cipher &&
+ !(ssid->group_cipher & new_ssid->group_cipher &
+ WPA_CIPHER_CCMP)))
continue;
/*
@@ -471,6 +473,11 @@ static int wpa_supplicant_wps_cred(void *ctx,
break;
case WPS_ENCR_AES:
ssid->pairwise_cipher = WPA_CIPHER_CCMP;
+ if (wpa_s->drv_capa_known &&
+ (wpa_s->drv_enc & WPA_DRIVER_CAPA_ENC_GCMP)) {
+ ssid->pairwise_cipher |= WPA_CIPHER_GCMP;
+ ssid->group_cipher |= WPA_CIPHER_GCMP;
+ }
break;
}