SAE-PK: Check psk param also to look for SAE-PK acceptable BSS

SAE-PK password can be set using psk parameter also in case of mixed
SAE+PSK networks, so look for acceptable SAE-PK BSS when SAE password
not set and psk parameter meets SAE-PK password criteria.

Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 0fcb1762e822f35c3cc526f6960e3fe5d33ace5a..f19165373bf797fddacf676ce14708c7012a3b6e 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1440,7 +1440,10 @@ skip_assoc_disallow:
 #ifdef CONFIG_SAE_PK
        if (ssid->sae_pk == SAE_PK_MODE_AUTOMATIC &&
            wpa_key_mgmt_sae(ssid->key_mgmt) &&
-           ssid->sae_password && sae_pk_valid_password(ssid->sae_password) &&
+           ((ssid->sae_password &&
+             sae_pk_valid_password(ssid->sae_password)) ||
+            (!ssid->sae_password && ssid->passphrase &&
+             sae_pk_valid_password(ssid->passphrase))) &&
            !(rsnxe_capa & BIT(WLAN_RSNX_CAPAB_SAE_PK)) &&
            sae_pk_acceptable_bss_with_pk(wpa_s, bss, ssid, match_ssid,
                                          match_ssid_len)) {