SAE: Reorder SAE and FT-SAE AKM selection to prefer the FT option

If a network profile has both SAE and FT-SAE enabled, SAE was previously
picked (and used incorrectly as explained in the previous commit). This
is not ideal since use of FT protocol can speed up roaming within in
mobility domain. Reorder this checks so that FT-SAE is preferred over
SAE if both are enabled.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index b15877eaa1c57f4cf20e9bd6099e7c052f2969e6..1ccf7010a428e51f831860e6c3885240ee1a5041 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1463,12 +1463,12 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
                wpa_dbg(wpa_s, MSG_DEBUG, "RSN: using KEY_MGMT DPP");
 #endif /* CONFIG_DPP */
 #ifdef CONFIG_SAE
-       } else if (sel & WPA_KEY_MGMT_SAE) {
-               wpa_s->key_mgmt = WPA_KEY_MGMT_SAE;
-               wpa_dbg(wpa_s, MSG_DEBUG, "RSN: using KEY_MGMT SAE");
        } else if (sel & WPA_KEY_MGMT_FT_SAE) {
                wpa_s->key_mgmt = WPA_KEY_MGMT_FT_SAE;
                wpa_dbg(wpa_s, MSG_DEBUG, "RSN: using KEY_MGMT FT/SAE");
+       } else if (sel & WPA_KEY_MGMT_SAE) {
+               wpa_s->key_mgmt = WPA_KEY_MGMT_SAE;
+               wpa_dbg(wpa_s, MSG_DEBUG, "RSN: using KEY_MGMT SAE");
 #endif /* CONFIG_SAE */
 #ifdef CONFIG_IEEE80211W
        } else if (sel & WPA_KEY_MGMT_IEEE8021X_SHA256) {