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

OKC with Suite B AKMPs in wpa_supplicant

Browse source 
To support Opportunistic Key Caching for Suite B key management, KCK
needs to be stored on PMKSA to derive the new PMKID correctly for the
new roaming AP.

Signed-off-by: Vinoth V <vinoth117@gmail.com>
This commit is contained in:
Vinoth V 2023-04-28 10:07:39 +05:30 • committed by Jouni Malinen
parent 2bd8887e9f
commit 0c9df339f5
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/rsn_supp/pmksa_cache.c
View file

@ -242,6 +242,9 @@ pmksa_cache_add(struct rsn_pmksa_cache *pmksa, const u8 *pmk, size_t pmk_len,
if (pmk_len > PMK_LEN_MAX) if (pmk_len > PMK_LEN_MAX)
return NULL; return NULL;
if (kck_len > WPA_KCK_MAX_LEN)
return NULL;
if (wpa_key_mgmt_suite_b(akmp) && !kck) if (wpa_key_mgmt_suite_b(akmp) && !kck)
return NULL; return NULL;
@ -250,6 +253,8 @@ pmksa_cache_add(struct rsn_pmksa_cache *pmksa, const u8 *pmk, size_t pmk_len,
return NULL; return NULL;
os_memcpy(entry->pmk, pmk, pmk_len); os_memcpy(entry->pmk, pmk, pmk_len);
entry->pmk_len = pmk_len; entry->pmk_len = pmk_len;
os_memcpy(entry->kck, kck, kck_len);
entry->kck_len = kck_len;
if (pmkid) if (pmkid)
os_memcpy(entry->pmkid, pmkid, PMKID_LEN); os_memcpy(entry->pmkid, pmkid, PMKID_LEN);
else if (akmp == WPA_KEY_MGMT_IEEE8021X_SUITE_B_192) else if (akmp == WPA_KEY_MGMT_IEEE8021X_SUITE_B_192)
@ -508,7 +513,7 @@ pmksa_cache_clone_entry(struct rsn_pmksa_cache *pmksa,
wpa_key_mgmt_fils(old_entry->akmp)) wpa_key_mgmt_fils(old_entry->akmp))
pmkid = old_entry->pmkid; pmkid = old_entry->pmkid;
new_entry = pmksa_cache_add(pmksa, old_entry->pmk, old_entry->pmk_len, new_entry = pmksa_cache_add(pmksa, old_entry->pmk, old_entry->pmk_len,
pmkid, NULL, 0, pmkid, old_entry->kck, old_entry->kck_len,
aa, pmksa->sm->own_addr, aa, pmksa->sm->own_addr,
old_entry->network_ctx, old_entry->akmp, old_entry->network_ctx, old_entry->akmp,
old_entry->fils_cache_id_set ? old_entry->fils_cache_id_set ?

2
src/rsn_supp/pmksa_cache.h
View file

@ -17,6 +17,8 @@ struct rsn_pmksa_cache_entry {
u8 pmkid[PMKID_LEN]; u8 pmkid[PMKID_LEN];
u8 pmk[PMK_LEN_MAX]; u8 pmk[PMK_LEN_MAX];
size_t pmk_len; size_t pmk_len;
u8 kck[WPA_KCK_MAX_LEN];
size_t kck_len;
os_time_t expiration; os_time_t expiration;
int akmp; /* WPA_KEY_MGMT_* */ int akmp; /* WPA_KEY_MGMT_* */
u8 aa[ETH_ALEN]; u8 aa[ETH_ALEN];