aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/mesh_rsn.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2016-06-18 11:17:34 (GMT)
committerJouni Malinen <j@w1.fi>2016-06-18 12:53:22 (GMT)
commita59c5e9235f1f5c9b786fde80b0355e1ef74a61a (patch)
treefaf84ae9f030dfe84d5c8454543ccbd9919c150c /wpa_supplicant/mesh_rsn.c
parent18aca1a07dfae1ea5c7661166dfba6e6dd0111aa (diff)
downloadhostap-a59c5e9235f1f5c9b786fde80b0355e1ef74a61a.zip
hostap-a59c5e9235f1f5c9b786fde80b0355e1ef74a61a.tar.gz
hostap-a59c5e9235f1f5c9b786fde80b0355e1ef74a61a.tar.bz2
mesh: Fix AEK derivation to use AKM suite selector
mesh_rsn_derive_aek() 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 AEK 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/mesh_rsn.c')
-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 4dadc40..57e5b15 100644
--- a/wpa_supplicant/mesh_rsn.c
+++ b/wpa_supplicant/mesh_rsn.c
@@ -366,8 +366,8 @@ mesh_rsn_derive_aek(struct mesh_rsn *rsn, struct sta_info *sta)
u8 *addr1 = peer, *addr2 = myaddr;
u8 context[AES_BLOCK_SIZE];
- /* SAE */
- RSN_SELECTOR_PUT(context, wpa_cipher_to_suite(0, WPA_CIPHER_GCMP));
+ /* Selected AKM Suite: SAE */
+ RSN_SELECTOR_PUT(context, RSN_AUTH_KEY_MGMT_SAE);
if (os_memcmp(myaddr, peer, ETH_ALEN) < 0) {
addr1 = myaddr;