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

SAE: Use H2E unconditionally with the new AKM suites

Browse source 
The new SAE AKM suites are defined to use H2E, so ignore the sae_pwe
value when these AKM suites are used similarly to the way H2E gets
enabled when SAE Password Identifiers are used.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2022-07-24 22:20:58 +03:00 committed by Jouni Malinen
parent f8eed2e8b8
commit e81ec0962d
6 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/ap/ap_config.c
View file

@ -480,6 +480,7 @@ int hostapd_setup_sae_pt(struct hostapd_bss_config *conf)
struct sae_password_entry *pw; struct sae_password_entry *pw;
if ((conf->sae_pwe == 0 && !hostapd_sae_pw_id_in_use(conf) && if ((conf->sae_pwe == 0 && !hostapd_sae_pw_id_in_use(conf) &&
!wpa_key_mgmt_sae_ext_key(conf->wpa_key_mgmt) &&
!hostapd_sae_pk_in_use(conf)) || !hostapd_sae_pk_in_use(conf)) ||
conf->sae_pwe == 3 || conf->sae_pwe == 3 ||
!wpa_key_mgmt_sae(conf->wpa_key_mgmt)) !wpa_key_mgmt_sae(conf->wpa_key_mgmt))

4
src/ap/ieee802_11.c
View file

@ -1234,6 +1234,10 @@ static int sae_status_success(struct hostapd_data *hapd, u16 status_code)
if (sae_pwe == 0 && sae_pk) if (sae_pwe == 0 && sae_pk)
sae_pwe = 2; sae_pwe = 2;
#endif /* CONFIG_SAE_PK */ #endif /* CONFIG_SAE_PK */
if (sae_pwe == 0 &&
(hapd->conf->wpa_key_mgmt &
(WPA_KEY_MGMT_SAE_EXT_KEY | WPA_KEY_MGMT_FT_SAE_EXT_KEY)))
sae_pwe = 2;
return ((sae_pwe == 0 || sae_pwe == 3) && return ((sae_pwe == 0 || sae_pwe == 3) &&
status_code == WLAN_STATUS_SUCCESS) || status_code == WLAN_STATUS_SUCCESS) ||

3
src/ap/ieee802_11_shared.c
View file

@ -1064,7 +1064,8 @@ u8 * hostapd_eid_rsnxe(struct hostapd_data *hapd, u8 *eid, size_t len)
if (wpa_key_mgmt_sae(hapd->conf->wpa_key_mgmt) && if (wpa_key_mgmt_sae(hapd->conf->wpa_key_mgmt) &&
(hapd->conf->sae_pwe == 1 || hapd->conf->sae_pwe == 2 || (hapd->conf->sae_pwe == 1 || hapd->conf->sae_pwe == 2 ||
hostapd_sae_pw_id_in_use(hapd->conf) || sae_pk) && hostapd_sae_pw_id_in_use(hapd->conf) || sae_pk ||
wpa_key_mgmt_sae_ext_key(hapd->conf->wpa_key_mgmt)) &&
hapd->conf->sae_pwe != 3) { hapd->conf->sae_pwe != 3) {
capab |= BIT(WLAN_RSNX_CAPAB_SAE_H2E); capab |= BIT(WLAN_RSNX_CAPAB_SAE_H2E);
#ifdef CONFIG_SAE_PK #ifdef CONFIG_SAE_PK

3
src/ap/wpa_auth_ie.c
View file

@ -405,7 +405,8 @@ int wpa_write_rsnxe(struct wpa_auth_config *conf, u8 *buf, size_t len)
size_t flen; size_t flen;
if (wpa_key_mgmt_sae(conf->wpa_key_mgmt) && if (wpa_key_mgmt_sae(conf->wpa_key_mgmt) &&
(conf->sae_pwe == 1 || conf->sae_pwe == 2 || conf->sae_pk)) { (conf->sae_pwe == 1 || conf->sae_pwe == 2 || conf->sae_pk ||
wpa_key_mgmt_sae_ext_key(conf->wpa_key_mgmt))) {
capab |= BIT(WLAN_RSNX_CAPAB_SAE_H2E); capab |= BIT(WLAN_RSNX_CAPAB_SAE_H2E);
#ifdef CONFIG_SAE_PK #ifdef CONFIG_SAE_PK
if (conf->sae_pk) if (conf->sae_pk)

6
wpa_supplicant/sme.c
View file

@ -154,6 +154,9 @@ static struct wpabuf * sme_auth_build_sae_commit(struct wpa_supplicant *wpa_s,
if (ssid->sae_password_id && wpa_s->conf->sae_pwe != 3) if (ssid->sae_password_id && wpa_s->conf->sae_pwe != 3)
use_pt = 1; use_pt = 1;
if (wpa_key_mgmt_sae_ext_key(wpa_s->key_mgmt) &&
wpa_s->conf->sae_pwe != 3)
use_pt = 1;
#ifdef CONFIG_SAE_PK #ifdef CONFIG_SAE_PK
if ((rsnxe_capa & BIT(WLAN_RSNX_CAPAB_SAE_PK)) && if ((rsnxe_capa & BIT(WLAN_RSNX_CAPAB_SAE_PK)) &&
ssid->sae_pk != SAE_PK_MODE_DISABLED && ssid->sae_pk != SAE_PK_MODE_DISABLED &&
@ -175,7 +178,8 @@ static struct wpabuf * sme_auth_build_sae_commit(struct wpa_supplicant *wpa_s,
if (use_pt || wpa_s->conf->sae_pwe == 1 || wpa_s->conf->sae_pwe == 2) { if (use_pt || wpa_s->conf->sae_pwe == 1 || wpa_s->conf->sae_pwe == 2) {
use_pt = !!(rsnxe_capa & BIT(WLAN_RSNX_CAPAB_SAE_H2E)); use_pt = !!(rsnxe_capa & BIT(WLAN_RSNX_CAPAB_SAE_H2E));
if ((wpa_s->conf->sae_pwe == 1 || ssid->sae_password_id) && if ((wpa_s->conf->sae_pwe == 1 || ssid->sae_password_id ||
wpa_key_mgmt_sae_ext_key(wpa_s->key_mgmt)) &&
wpa_s->conf->sae_pwe != 3 && wpa_s->conf->sae_pwe != 3 &&
!use_pt) { !use_pt) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,

5
wpa_supplicant/wpa_supplicant.c
View file

@ -1687,7 +1687,9 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_OCV, ssid->ocv); wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_OCV, ssid->ocv);
#endif /* CONFIG_OCV */ #endif /* CONFIG_OCV */
sae_pwe = wpa_s->conf->sae_pwe; sae_pwe = wpa_s->conf->sae_pwe;
if (ssid->sae_password_id && sae_pwe != 3) if ((ssid->sae_password_id ||
wpa_key_mgmt_sae_ext_key(wpa_s->key_mgmt)) &&
sae_pwe != 3)
sae_pwe = 1; sae_pwe = 1;
wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_SAE_PWE, sae_pwe); wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_SAE_PWE, sae_pwe);
#ifdef CONFIG_SAE_PK #ifdef CONFIG_SAE_PK
@ -2159,6 +2161,7 @@ static void wpa_s_setup_sae_pt(struct wpa_config *conf, struct wpa_ssid *ssid)
if (!password || if (!password ||
(conf->sae_pwe == 0 && !ssid->sae_password_id && (conf->sae_pwe == 0 && !ssid->sae_password_id &&
!wpa_key_mgmt_sae_ext_key(ssid->key_mgmt) &
!sae_pk_valid_password(password)) || !sae_pk_valid_password(password)) ||
conf->sae_pwe == 3) { conf->sae_pwe == 3) {
/* PT derivation not needed */ /* PT derivation not needed */