@@ -3300,6 +3300,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
bss->ft_over_ds = atoi(pos);
} else if (os_strcmp(buf, "ft_psk_generate_local") == 0) {
bss->ft_psk_generate_local = atoi(pos);
+ } else if (os_strcmp(buf, "ft_rsnxe_used_only_with_rsnxe") == 0) {
+ bss->ft_rsnxe_used_only_with_rsnxe = atoi(pos);
#endif /* CONFIG_IEEE80211R_AP */
#ifndef CONFIG_NO_CTRL_IFACE
} else if (os_strcmp(buf, "ctrl_interface") == 0) {
@@ -2787,6 +2787,18 @@ own_ip_addr=127.0.0.1
# 1 = enabled
#ft_psk_generate_local=0
+# Do not set the RSNXE Used subfield in an FT Reassociation Response frame to a
+# STA that sent no RSNXE
+# By default (0), the AP sets RSNXE Used whenever it uses the RSNXE in other
+# frames (sae_pwe=1 or 2), also in a response without the RSNXE to a STA that
+# sent none. Some STAs reject such a response and repeat the FT
+# reassociation. This option is a workaround for those STAs. Enabling it
+# removes an indication that a STA could use to detect an RSNXE removed from
+# the Beacon frame.
+# 0 = disabled (default)
+# 1 = enabled
+#ft_rsnxe_used_only_with_rsnxe=0
+
##### IEEE 802.11bi related configuration #####################################
# IEEE Std 802.11bi introduces following Enhanced Privacy Protection (EPP)
@@ -422,6 +422,9 @@ struct hostapd_bss_config {
int pmk_r1_push;
int ft_over_ds;
int ft_psk_generate_local;
+ /* Interoperability workaround: do not set RSNXE Used in an FT
+ * Reassociation Response to a STA that sent no RSNXE */
+ bool ft_rsnxe_used_only_with_rsnxe;
int r1_max_key_lifetime;
char *rxkh_file;
#endif /* CONFIG_IEEE80211R_AP */
@@ -223,6 +223,7 @@ struct wpa_auth_config {
int pmk_r1_push;
int ft_over_ds;
int ft_psk_generate_local;
+ bool ft_rsnxe_used_only_with_rsnxe;
#endif /* CONFIG_IEEE80211R_AP */
int disable_gtk;
int ap_mlme;
@@ -2719,6 +2719,7 @@ u8 * wpa_sm_write_assoc_resp_ies(struct wpa_state_machine *sm, u8 *pos,
* no RSNXE, and a STA rejects the bit. */
rsnxe_used = (auth_alg == WLAN_AUTH_FT) &&
!conf->rsn_override_omit_rsnxe &&
+ !(conf->ft_rsnxe_used_only_with_rsnxe && omit_rsnxe) &&
(conf->sae_pwe == SAE_PWE_HASH_TO_ELEMENT ||
conf->sae_pwe == SAE_PWE_BOTH);
#ifdef CONFIG_TESTING_OPTIONS
@@ -192,6 +192,8 @@ static void hostapd_wpa_auth_conf(struct hostapd_iface *iface,
wconf->pmk_r1_push = conf->pmk_r1_push;
wconf->ft_over_ds = conf->ft_over_ds;
wconf->ft_psk_generate_local = conf->ft_psk_generate_local;
+ wconf->ft_rsnxe_used_only_with_rsnxe =
+ conf->ft_rsnxe_used_only_with_rsnxe;
#endif /* CONFIG_IEEE80211R_AP */
#ifdef CONFIG_HS20
wconf->disable_gtk = conf->disable_dgaf;