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

PASN: Remove wpa_sm dependency to add an entry to PMKSA cache

Browse source 
Store PMKSA cache entry in wpas_pasn and remove wpa_sm dependency to add
an entry to PMKSA cache. This is a step towards allowing the PASN
implementation to be used outside the context of wpa_supplicant.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Vinay Gannevaram 2022-09-18 23:27:13 +05:30 committed by Jouni Malinen
parent 5313e5a790
commit 90bb73c518
4 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/rsn_supp/wpa.c
View file

@ -5322,15 +5322,6 @@ void wpa_sm_set_dpp_z(struct wpa_sm *sm, const struct wpabuf *z)
#ifdef CONFIG_PASN #ifdef CONFIG_PASN
void wpa_pasn_pmksa_cache_add(struct wpa_sm *sm, const u8 *pmk, size_t pmk_len,
const u8 *pmkid, const u8 *bssid, int key_mgmt)
{
sm->cur_pmksa = pmksa_cache_add(sm->pmksa, pmk, pmk_len, pmkid, NULL, 0,
bssid, sm->own_addr, NULL,
key_mgmt, 0);
}
void wpa_pasn_sm_set_caps(struct wpa_sm *sm, unsigned int flags2) void wpa_pasn_sm_set_caps(struct wpa_sm *sm, unsigned int flags2)
{ {
if (flags2 & WPA_DRIVER_FLAGS2_SEC_LTF_STA) if (flags2 & WPA_DRIVER_FLAGS2_SEC_LTF_STA)
@ -5349,3 +5340,17 @@ void wpa_sm_pmksa_cache_reconfig(struct wpa_sm *sm)
if (sm) if (sm)
pmksa_cache_reconfig(sm->pmksa); pmksa_cache_reconfig(sm->pmksa);
} }
struct rsn_pmksa_cache * wpa_sm_get_pmksa_cache(struct wpa_sm *sm)
{
return sm ? sm->pmksa : NULL;
}
void wpa_sm_set_cur_pmksa(struct wpa_sm *sm,
struct rsn_pmksa_cache_entry *entry)
{
if (sm)
sm->cur_pmksa = entry;
}

6
src/rsn_supp/wpa.h
View file

@ -566,8 +566,10 @@ int owe_process_assoc_resp(struct wpa_sm *sm, const u8 *bssid,
void wpa_sm_set_reset_fils_completed(struct wpa_sm *sm, int set); void wpa_sm_set_reset_fils_completed(struct wpa_sm *sm, int set);
void wpa_sm_set_fils_cache_id(struct wpa_sm *sm, const u8 *fils_cache_id); void wpa_sm_set_fils_cache_id(struct wpa_sm *sm, const u8 *fils_cache_id);
void wpa_sm_set_dpp_z(struct wpa_sm *sm, const struct wpabuf *z); void wpa_sm_set_dpp_z(struct wpa_sm *sm, const struct wpabuf *z);
void wpa_pasn_pmksa_cache_add(struct wpa_sm *sm, const u8 *pmk, size_t pmk_len,
const u8 *pmkid, const u8 *bssid, int key_mgmt);
void wpa_pasn_sm_set_caps(struct wpa_sm *sm, unsigned int flags2); void wpa_pasn_sm_set_caps(struct wpa_sm *sm, unsigned int flags2);
struct rsn_pmksa_cache * wpa_sm_get_pmksa_cache(struct wpa_sm *sm);
void wpa_sm_set_cur_pmksa(struct wpa_sm *sm,
struct rsn_pmksa_cache_entry *entry);
#endif /* WPA_H */ #endif /* WPA_H */

22
wpa_supplicant/pasn_supplicant.c
View file

@ -847,9 +847,11 @@ static int wpas_pasn_wd_fils_rx(struct wpa_supplicant *wpa_s, struct wpabuf *wd)
wpa_printf(MSG_DEBUG, "PASN: FILS: ERP processing succeeded"); wpa_printf(MSG_DEBUG, "PASN: FILS: ERP processing succeeded");
wpa_pasn_pmksa_cache_add(wpa_s->wpa, pasn->pmk, pasn->pmksa_entry = pmksa_cache_add(pasn->pmksa, pasn->pmk,
pasn->pmk_len, pasn->fils.erp_pmkid, pasn->pmk_len, pasn->fils.erp_pmkid,
pasn->bssid, pasn->akmp); NULL, 0, pasn->bssid,
pasn->own_addr, NULL,
pasn->akmp, 0);
pasn->fils.completed = true; pasn->fils.completed = true;
return 0; return 0;
@ -1163,6 +1165,7 @@ static void wpa_pasn_reset(struct wpas_pasn *pasn)
os_memset(pasn->pmk_r1_name, 0, sizeof(pasn->pmk_r1_name)); os_memset(pasn->pmk_r1_name, 0, sizeof(pasn->pmk_r1_name));
#endif /* CONFIG_IEEE80211R */ #endif /* CONFIG_IEEE80211R */
pasn->status = WLAN_STATUS_UNSPECIFIED_FAILURE; pasn->status = WLAN_STATUS_UNSPECIFIED_FAILURE;
pasn->pmksa_entry = NULL;
} }
@ -1244,9 +1247,12 @@ static int wpas_pasn_set_pmk(struct wpa_supplicant *wpa_s,
pasn->pmk_len = PMK_LEN; pasn->pmk_len = PMK_LEN;
os_memcpy(pasn->pmk, pasn->sae.pmk, PMK_LEN); os_memcpy(pasn->pmk, pasn->sae.pmk, PMK_LEN);
wpa_pasn_pmksa_cache_add(wpa_s->wpa, pasn->pmk, pasn->pmksa_entry = pmksa_cache_add(pasn->pmksa, pasn->pmk,
pasn->pmk_len, pasn->sae.pmkid, pasn->pmk_len,
pasn->bssid, pasn->akmp); pasn->sae.pmkid,
NULL, 0, pasn->bssid,
pasn->own_addr, NULL,
pasn->akmp, 0);
return 0; return 0;
} }
#endif /* CONFIG_SAE */ #endif /* CONFIG_SAE */
@ -1499,6 +1505,8 @@ static void wpas_pasn_auth_start_cb(struct wpa_radio_work *work, int deinit)
rsnxe = wpa_bss_get_ie(bss, WLAN_EID_RSNX); rsnxe = wpa_bss_get_ie(bss, WLAN_EID_RSNX);
wpa_s->pasn.pmksa = wpa_sm_get_pmksa_cache(wpa_s->wpa);
ret = wpas_pasn_start(wpa_s, awork->own_addr, awork->bssid, awork->akmp, ret = wpas_pasn_start(wpa_s, awork->own_addr, awork->bssid, awork->akmp,
awork->cipher, awork->group, bss->freq, awork->cipher, awork->group, bss->freq,
rsne, *(rsne + 1) + 2, rsne, *(rsne + 1) + 2,
@ -1887,6 +1895,10 @@ int wpas_pasn_auth_rx(struct wpa_supplicant *wpa_s,
forced_memzero(&pasn->ptk, sizeof(pasn->ptk)); forced_memzero(&pasn->ptk, sizeof(pasn->ptk));
pasn->status = WLAN_STATUS_SUCCESS; pasn->status = WLAN_STATUS_SUCCESS;
if (pasn->pmksa_entry)
wpa_sm_set_cur_pmksa(wpa_s->wpa, pasn->pmksa_entry);
return 0; return 0;
fail: fail:
wpa_printf(MSG_DEBUG, "PASN: Failed RX processing - terminating"); wpa_printf(MSG_DEBUG, "PASN: Failed RX processing - terminating");

2
wpa_supplicant/wpa_supplicant_i.h
View file

@ -590,6 +590,8 @@ struct wpas_pasn {
size_t pmk_r1_len; size_t pmk_r1_len;
u8 pmk_r1_name[WPA_PMK_NAME_LEN]; u8 pmk_r1_name[WPA_PMK_NAME_LEN];
#endif /* CONFIG_IEEE80211R */ #endif /* CONFIG_IEEE80211R */
struct rsn_pmksa_cache *pmksa;
struct rsn_pmksa_cache_entry *pmksa_entry;
}; };
#endif /* CONFIG_PASN */ #endif /* CONFIG_PASN */