Move the "WPA: AP key_mgmt" debug print to be after final changes

Driver capabilities may end up masking out some WPA_KEY_MGMT_* bits, so
debug print the outcome only after having performed all these steps.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-03-13 20:01:53 +02:00 committed by Jouni Malinen
parent 1d9cff86bd
commit e861fa1f6b

View file

@ -1457,9 +1457,6 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
#endif /* CONFIG_NO_WPA */ #endif /* CONFIG_NO_WPA */
sel = ie.key_mgmt & ssid->key_mgmt; sel = ie.key_mgmt & ssid->key_mgmt;
wpa_dbg(wpa_s, MSG_DEBUG,
"WPA: AP key_mgmt 0x%x network profile key_mgmt 0x%x; available key_mgmt 0x%x",
ie.key_mgmt, ssid->key_mgmt, sel);
#ifdef CONFIG_SAE #ifdef CONFIG_SAE
if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_SAE)) if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_SAE))
sel &= ~(WPA_KEY_MGMT_SAE | WPA_KEY_MGMT_FT_SAE); sel &= ~(WPA_KEY_MGMT_SAE | WPA_KEY_MGMT_FT_SAE);
@ -1469,6 +1466,9 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
WPA_DRIVER_FLAGS_UPDATE_FT_IES))) WPA_DRIVER_FLAGS_UPDATE_FT_IES)))
sel &= ~WPA_KEY_MGMT_FT; sel &= ~WPA_KEY_MGMT_FT;
#endif /* CONFIG_IEEE80211R */ #endif /* CONFIG_IEEE80211R */
wpa_dbg(wpa_s, MSG_DEBUG,
"WPA: AP key_mgmt 0x%x network profile key_mgmt 0x%x; available key_mgmt 0x%x",
ie.key_mgmt, ssid->key_mgmt, sel);
if (0) { if (0) {
#ifdef CONFIG_IEEE80211R #ifdef CONFIG_IEEE80211R
#ifdef CONFIG_SHA384 #ifdef CONFIG_SHA384