SAE: Enable H2E for 6 GHz BSS

Even if the use of H2E isn't strictly mandatory when using SAE on 6 GHz,
WPA3-Personal pushes it on 6 GHz, so enable H2E automatically when
connecting to a BSS on the 6 GHz band if it was not enabled in the
configuration.

Signed-off-by: Jimmy Chen <jimmycmchen@google.com>

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index a09c4e120253f98a045ee35b90d2ea3af1f83d62..a28e90e9e90306c2ffa0761c60373160d0625313 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1914,6 +1914,11 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
             wpa_key_mgmt_sae_ext_key(wpa_s->key_mgmt)) &&
            sae_pwe != 3)
                sae_pwe = 1;
+       if (bss && is_6ghz_freq(bss->freq) && sae_pwe == 0) {
+               wpa_dbg(wpa_s, MSG_DEBUG,
+                       "RSN: Enable SAE hash-to-element mode for 6 GHz BSS");
+               sae_pwe = 2;
+       }
        wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_SAE_PWE, sae_pwe);
 #ifdef CONFIG_SAE_PK
        wpa_sm_set_param(wpa_s->wpa, WPA_PARAM_SAE_PK,