As defined in Draft P802.11az_D3.0, section 12.12.3.2. Signed-off-by: Ilan Peer <ilan.peer@xxxxxxxxx> --- src/ap/ieee802_11.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c index 2c3832960d..c378a1c95b 100644 --- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c @@ -2887,6 +2887,7 @@ static int handle_auth_pasn_resp(struct hostapd_data *hapd, u8 *data_buf = NULL; size_t rsn_ie_len, frame_len, data_len; int ret; + const u8 *pmkid = NULL; wpa_printf(MSG_DEBUG, "PASN: Building frame 2: status=%u", status); @@ -2900,7 +2901,22 @@ static int handle_auth_pasn_resp(struct hostapd_data *hapd, if (status != WLAN_STATUS_SUCCESS) goto done; - if (wpa_pasn_add_rsne(buf, pmksa ? pmksa->pmkid : NULL, + if (pmksa) { + pmkid = pmksa->pmkid; +#ifdef CONFIG_SAE_AP + } else if (sta->pasn->akmp == WPA_KEY_MGMT_SAE) { + wpa_printf(MSG_DEBUG, "PASN: use SAE PMKID"); + pmkid = sta->pasn->sae.pmkid; +#endif /* CONFIG_SAE_AP */ +#ifdef CONFIG_FILS + } else if (sta->pasn->akmp == WPA_KEY_MGMT_FILS_SHA256 || + sta->pasn->akmp == WPA_KEY_MGMT_FILS_SHA384) { + wpa_printf(MSG_DEBUG, "PASN: use FILS ERP PMKID"); + pmkid = sta->pasn->fils.erp_pmkid; +#endif /* CONFIG_FILS */ + } + + if (wpa_pasn_add_rsne(buf, pmkid, sta->pasn->akmp, sta->pasn->cipher) < 0) goto fail; -- 2.17.1 _______________________________________________ Hostap mailing list Hostap@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/hostap