aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2016-06-18 11:21:48 (GMT)
committerJouni Malinen <j@w1.fi>2016-06-18 12:53:26 (GMT)
commit0f76d8249c17da6b5166091697496aac9ef8ef85 (patch)
tree4b95ac32dda370d2088221c01af9585a374859cd /wpa_supplicant
parentf5ba6923d05e394e434883f90522fd76d7ea9b63 (diff)
downloadhostap-0f76d8249c17da6b5166091697496aac9ef8ef85.zip
hostap-0f76d8249c17da6b5166091697496aac9ef8ef85.tar.gz
hostap-0f76d8249c17da6b5166091697496aac9ef8ef85.tar.bz2
mesh: Fix MTK derivation to use AKM suite selector
mesh_rsn_derive_mtk() was hardcoded to use GCMP (even though CCMP was hardcoded elsewhere) cipher suite selector instead of the selected AKM suite selector. This resulted in incorrect MTK getting derived. Fix this by used the SAE AKM suite selector in the input to the KDF. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/mesh_rsn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/wpa_supplicant/mesh_rsn.c b/wpa_supplicant/mesh_rsn.c
index c82c539..047fa02 100644
--- a/wpa_supplicant/mesh_rsn.c
+++ b/wpa_supplicant/mesh_rsn.c
@@ -425,8 +425,8 @@ int mesh_rsn_derive_mtk(struct wpa_supplicant *wpa_s, struct sta_info *sta)
os_memcpy(ptr + lid_len, &max_lid, lid_len);
ptr += 2 * lid_len;
- /* SAE */
- RSN_SELECTOR_PUT(ptr, wpa_cipher_to_suite(0, WPA_CIPHER_GCMP));
+ /* Selected AKM Suite: SAE */
+ RSN_SELECTOR_PUT(ptr, RSN_AUTH_KEY_MGMT_SAE);
ptr += 4;
if (os_memcmp(myaddr, peer, ETH_ALEN) < 0) {