jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mesh: Fix MTK derivation to use AKM suite selector

Browse source 
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>
This commit is contained in:
Jouni Malinen 2016-06-18 14:21:48 +03:00
parent f5ba6923d0
commit 0f76d8249c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wpa_supplicant/mesh_rsn.c
View file

@ -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); os_memcpy(ptr + lid_len, &max_lid, lid_len);
ptr += 2 * lid_len; ptr += 2 * lid_len;
/* SAE */ /* Selected AKM Suite: SAE */
RSN_SELECTOR_PUT(ptr, wpa_cipher_to_suite(0, WPA_CIPHER_GCMP)); RSN_SELECTOR_PUT(ptr, RSN_AUTH_KEY_MGMT_SAE);
ptr += 4; ptr += 4;
if (os_memcmp(myaddr, peer, ETH_ALEN) < 0) { if (os_memcmp(myaddr, peer, ETH_ALEN) < 0) {