aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wang <matthewmwang@chromium.org>2019-08-08 20:02:12 (GMT)
committerJouni Malinen <j@w1.fi>2019-08-11 15:04:24 (GMT)
commitdd0153fced53b1dabe63278c746db9deb1a51512 (patch)
treefc02f8c59bd9d939023ee61c9b0af7a4f30c358c
parentba2d5f3642fd97661d90357f00577b77b1368eb7 (diff)
downloadhostap-dd0153fced53b1dabe63278c746db9deb1a51512.zip
hostap-dd0153fced53b1dabe63278c746db9deb1a51512.tar.gz
hostap-dd0153fced53b1dabe63278c746db9deb1a51512.tar.bz2
Check for LEAP before doing FT
According to https://www.cisco.com/c/en/us/td/docs/wireless/controller/technotes/80211r-ft/b-80211r-dg.html Cisco does not support EAP-LEAP with Fast Transition. Here, we check for LEAP before selecting FT 802.1X key management suite. Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
-rw-r--r--wpa_supplicant/wpa_supplicant.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 911d79d..21ef6fa 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1413,7 +1413,8 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
if (0) {
#ifdef CONFIG_IEEE80211R
#ifdef CONFIG_SHA384
- } else if (sel & WPA_KEY_MGMT_FT_IEEE8021X_SHA384) {
+ } else if ((sel & WPA_KEY_MGMT_FT_IEEE8021X_SHA384) &&
+ os_strcmp(wpa_supplicant_get_eap_mode(wpa_s), "LEAP") != 0) {
wpa_s->key_mgmt = WPA_KEY_MGMT_FT_IEEE8021X_SHA384;
wpa_dbg(wpa_s, MSG_DEBUG,
"WPA: using KEY_MGMT FT/802.1X-SHA384");
@@ -1456,7 +1457,8 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
wpa_dbg(wpa_s, MSG_DEBUG, "WPA: using KEY_MGMT FILS-SHA256");
#endif /* CONFIG_FILS */
#ifdef CONFIG_IEEE80211R
- } else if (sel & WPA_KEY_MGMT_FT_IEEE8021X) {
+ } else if ((sel & WPA_KEY_MGMT_FT_IEEE8021X) &&
+ os_strcmp(wpa_supplicant_get_eap_mode(wpa_s), "LEAP") != 0) {
wpa_s->key_mgmt = WPA_KEY_MGMT_FT_IEEE8021X;
wpa_dbg(wpa_s, MSG_DEBUG, "WPA: using KEY_MGMT FT/802.1X");
if (!ssid->ft_eap_pmksa_caching &&