diff options
| author | Lior David <qca_liord@qca.qualcomm.com> | 2016-03-23 18:44:10 +0200 |
|---|---|---|
| committer | Hamad Kadmany <hkadmany@codeaurora.org> | 2016-04-15 01:50:08 +0300 |
| commit | 38c85e122a529f722a1cf2d9456516b0627d4d11 (patch) | |
| tree | ea3bfab80f440581c4c6abf7ab6721b369833f4c | |
| parent | 710691ec007483d462a3323ed76a0ebaa03564aa (diff) | |
| download | android_external_wpa_supplicant_8-38c85e122a529f722a1cf2d9456516b0627d4d11.tar.gz android_external_wpa_supplicant_8-38c85e122a529f722a1cf2d9456516b0627d4d11.tar.bz2 android_external_wpa_supplicant_8-38c85e122a529f722a1cf2d9456516b0627d4d11.zip | |
P2P: Fix persistent group for 60 GHz networks
Fix two problems with storage of 60 GHz P2P persistent groups:
1. pbss flag was not stored in the network block.
2. When recreating the persistent group from storage,
in addition to the missing pbss flag, the pairwise_cipher and
group_cipher were initialized to CCMP which does not work
in 60 GHz since the default in 60 GHz should be GCMP.
Change-Id: If9494af406790e11176514d65eeb9933b5ca4e72
Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
Git-commit: f347429cf160140b74a1b2f1af0e506bd52c91ba
Git-repo: git://w1.fi/srv/git/hostap.git
CRs-Fixed: 985990
| -rw-r--r-- | wpa_supplicant/p2p_supplicant.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 5dfd3fc3..3f5d7fe8 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -1083,7 +1083,8 @@ static int wpas_p2p_store_persistent_group(struct wpa_supplicant *wpa_s, s->auth_alg = WPA_AUTH_ALG_OPEN; s->key_mgmt = WPA_KEY_MGMT_PSK; s->proto = WPA_PROTO_RSN; - s->pairwise_cipher = WPA_CIPHER_CCMP; + s->pbss = ssid->pbss; + s->pairwise_cipher = ssid->pbss ? WPA_CIPHER_GCMP : WPA_CIPHER_CCMP; s->export_keys = 1; if (ssid->passphrase) { os_free(s->passphrase); @@ -5728,8 +5729,10 @@ static int wpas_start_p2p_client(struct wpa_supplicant *wpa_s, wpa_config_set_network_defaults(ssid); ssid->temporary = 1; ssid->proto = WPA_PROTO_RSN; - ssid->pairwise_cipher = WPA_CIPHER_CCMP; - ssid->group_cipher = WPA_CIPHER_CCMP; + ssid->pbss = params->pbss; + ssid->pairwise_cipher = params->pbss ? WPA_CIPHER_GCMP : + WPA_CIPHER_CCMP; + ssid->group_cipher = params->pbss ? WPA_CIPHER_GCMP : WPA_CIPHER_CCMP; ssid->key_mgmt = WPA_KEY_MGMT_PSK; ssid->ssid = os_malloc(params->ssid_len); if (ssid->ssid == NULL) { |