DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

FT: Extend the wpa_pmk_r1_to_ptk() function to also derive KDK

Browse source 
Extend the wpa_pmk_r1_to_ptk() to also derive Key Derivation
Key (KDK), which can later be used for secure LTF measurements.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
This commit is contained in:
Ilan Peer 2020-12-16 13:00:18 +02:00 • committed by Jouni Malinen
parent 46c232eb76
commit 6e834db74e
7 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/rsn_supp/wpa_ft.c
View file

@ -58,7 +58,8 @@ int wpa_derive_ptk_ft(struct wpa_sm *sm, const unsigned char *src_addr,
return -1;
return wpa_pmk_r1_to_ptk(sm->pmk_r1, sm->pmk_r1_len, sm->snonce, anonce,
sm->own_addr, sm->bssid, sm->pmk_r1_name, ptk,
ptk_name, sm->key_mgmt, sm->pairwise_cipher);
ptk_name, sm->key_mgmt, sm->pairwise_cipher,
sm->kdk ? WPA_KDK_MAX_LEN : 0);
}
@ -649,7 +650,8 @@ int wpa_ft_process_response(struct wpa_sm *sm, const u8 *ies, size_t ies_len,
if (wpa_pmk_r1_to_ptk(sm->pmk_r1, sm->pmk_r1_len, sm->snonce,
anonce, sm->own_addr, bssid,
sm->pmk_r1_name, &sm->ptk, ptk_name, sm->key_mgmt,
sm->pairwise_cipher) < 0)
sm->pairwise_cipher,
sm->kdk ? WPA_KDK_MAX_LEN : 0) < 0)
return -1;
if (wpa_key_mgmt_fils(sm->key_mgmt)) {