[PATCH v2 1/3] FT: Do not set RSNXE Used when the RSNXE is omitted

[Koral Ilgun]

From: Koral Ilgun <koral.ilgun at adtran.com>

The RSNXE Used subfield of the FTE MIC Control field indicates that the
AP uses the RSNXE in other frames, and wpa_supplicant checks it against
the RSNXE of the Beacon and Probe Response frames. With
rsn_override_omit_rsnxe=1, the AP omits the RSNXE from those frames, but
still set RSNXE Used in the FT Reassociation Response whenever sae_pwe
is 1 or 2. wpa_supplicant then rejected the response with "FT: FTE
indicated that AP uses RSNXE, but RSNXE was not included in
Beacon/Probe Response frames", so FT failed for every STA.

Do not set RSNXE Used when rsn_override_omit_rsnxe is enabled.

Fixes: 8b2ddfdbb688 ("RSNO: Allow RSNXE to be omitted")
Signed-off-by: Koral Ilgun <koral.ilgun at adtran.com>
---
 src/ap/wpa_auth_ft.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c
index e12f2ad8e..3dcfefe83 100644
--- a/src/ap/wpa_auth_ft.c
+++ b/src/ap/wpa_auth_ft.c
@@ -2714,7 +2714,11 @@ u8 * wpa_sm_write_assoc_resp_ies(struct wpa_state_machine *sm, u8 *pos,
 		anonce = NULL;
 		snonce = NULL;
 	}
+	/* RSNXE Used indicates that the AP uses the RSNXE in other frames. With
+	 * rsn_override_omit_rsnxe, the Beacon and Probe Response frames carry
+	 * no RSNXE, and a STA rejects the bit. */
 	rsnxe_used = (auth_alg == WLAN_AUTH_FT) &&
+		!conf->rsn_override_omit_rsnxe &&
 		(conf->sae_pwe == SAE_PWE_HASH_TO_ELEMENT ||
 		 conf->sae_pwe == SAE_PWE_BOTH);
 #ifdef CONFIG_TESTING_OPTIONS

base-commit: 61b0dbe6934632202ac1f5a4e5e01e0816cc8595
-- 
2.43.0