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

AP: Use MLD address for SAE commit derivation

Browse source 
MLO associations use the MLD address instead of the MAC address in SAE
derivation.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
This commit is contained in:
Andrei Otcheretianski 2023-05-22 22:34:07 +03:00 • committed by Jouni Malinen
parent 8b49853f49
commit 90d819c242
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ap/ieee802_11.c
View file

@ -604,12 +604,18 @@ static struct wpabuf * auth_build_sae_commit(struct hostapd_data *hapd,
int use_pt = 0; int use_pt = 0;
struct sae_pt *pt = NULL; struct sae_pt *pt = NULL;
const struct sae_pk *pk = NULL; const struct sae_pk *pk = NULL;
const u8 *own_addr = hapd->own_addr;
#ifdef CONFIG_IEEE80211BE
if (hapd->conf->mld_ap && sta->mld_info.mld_sta)
own_addr = hapd->mld_addr;
#endif /* CONFIG_IEEE80211BE */
if (sta->sae->tmp) { if (sta->sae->tmp) {
rx_id = sta->sae->tmp->pw_id; rx_id = sta->sae->tmp->pw_id;
use_pt = sta->sae->h2e; use_pt = sta->sae->h2e;
#ifdef CONFIG_SAE_PK #ifdef CONFIG_SAE_PK
os_memcpy(sta->sae->tmp->own_addr, hapd->own_addr, ETH_ALEN); os_memcpy(sta->sae->tmp->own_addr, own_addr, ETH_ALEN);
os_memcpy(sta->sae->tmp->peer_addr, sta->addr, ETH_ALEN); os_memcpy(sta->sae->tmp->peer_addr, sta->addr, ETH_ALEN);
#endif /* CONFIG_SAE_PK */ #endif /* CONFIG_SAE_PK */
} }
@ -629,12 +635,12 @@ static struct wpabuf * auth_build_sae_commit(struct hostapd_data *hapd,
} }
if (update && use_pt && if (update && use_pt &&
sae_prepare_commit_pt(sta->sae, pt, hapd->own_addr, sta->addr, sae_prepare_commit_pt(sta->sae, pt, own_addr, sta->addr,
NULL, pk) < 0) NULL, pk) < 0)
return NULL; return NULL;
if (update && !use_pt && if (update && !use_pt &&
sae_prepare_commit(hapd->own_addr, sta->addr, sae_prepare_commit(own_addr, sta->addr,
(u8 *) password, os_strlen(password), (u8 *) password, os_strlen(password),
sta->sae) < 0) { sta->sae) < 0) {
wpa_printf(MSG_DEBUG, "SAE: Could not pick PWE"); wpa_printf(MSG_DEBUG, "SAE: Could not pick PWE");