jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

SAE-PK: Do not accept SAE-PK status code when no PK is configured

Browse source 
Make sae_status_success() more explicit by rejecting SAE-PK status code
when the AP is not configured with PK.

Fixes: 20ccf97b3d ("SAE-PK: AP functionality")
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-10-19 23:35:00 +03:00 committed by Jouni Malinen
parent 80662accb5
commit 183e72ae13
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ap/ieee802_11.c
View file

@ -1149,6 +1149,7 @@ static int sae_status_success(struct hostapd_data *hapd, u16 status_code)
{ {
int sae_pwe = hapd->conf->sae_pwe; int sae_pwe = hapd->conf->sae_pwe;
int id_in_use; int id_in_use;
bool sae_pk = false;
id_in_use = hostapd_sae_pw_id_in_use(hapd->conf); id_in_use = hostapd_sae_pw_id_in_use(hapd->conf);
if (id_in_use == 2 && sae_pwe != 3) if (id_in_use == 2 && sae_pwe != 3)
@ -1156,7 +1157,8 @@ static int sae_status_success(struct hostapd_data *hapd, u16 status_code)
else if (id_in_use == 1 && sae_pwe == 0) else if (id_in_use == 1 && sae_pwe == 0)
sae_pwe = 2; sae_pwe = 2;
#ifdef CONFIG_SAE_PK #ifdef CONFIG_SAE_PK
if (sae_pwe == 0 && hostapd_sae_pk_in_use(hapd->conf)) sae_pk = hostapd_sae_pk_in_use(hapd->conf);
if (sae_pwe == 0 && sae_pk)
sae_pwe = 2; sae_pwe = 2;
#endif /* CONFIG_SAE_PK */ #endif /* CONFIG_SAE_PK */
@ -1164,11 +1166,11 @@ static int sae_status_success(struct hostapd_data *hapd, u16 status_code)
status_code == WLAN_STATUS_SUCCESS) || status_code == WLAN_STATUS_SUCCESS) ||
(sae_pwe == 1 && (sae_pwe == 1 &&
(status_code == WLAN_STATUS_SAE_HASH_TO_ELEMENT || (status_code == WLAN_STATUS_SAE_HASH_TO_ELEMENT ||
status_code == WLAN_STATUS_SAE_PK)) || (sae_pk && status_code == WLAN_STATUS_SAE_PK))) ||
(sae_pwe == 2 && (sae_pwe == 2 &&
(status_code == WLAN_STATUS_SUCCESS || (status_code == WLAN_STATUS_SUCCESS ||
status_code == WLAN_STATUS_SAE_HASH_TO_ELEMENT || status_code == WLAN_STATUS_SAE_HASH_TO_ELEMENT ||
status_code == WLAN_STATUS_SAE_PK)); (sae_pk && status_code == WLAN_STATUS_SAE_PK)));
} }