From 84a86ce55f1e70cb32217d2c74242ff848db8cd7 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 16 Sep 2019 16:55:49 +0200 Subject: [PATCH] libnm-core: support SAE when determining AP compatibility https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/172 --- libnm-core/nm-setting-wireless.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c index c69aa5f24c..f72e1677aa 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -205,7 +205,8 @@ nm_setting_wireless_ap_security_compatible (NMSettingWireless *s_wireless, /* WPA[2]-PSK and WPA[2] Enterprise */ if ( !strcmp (key_mgmt, "wpa-psk") - || !strcmp (key_mgmt, "wpa-eap")) { + || !strcmp (key_mgmt, "wpa-eap") + || !strcmp (key_mgmt, "sae")) { if (!strcmp (key_mgmt, "wpa-psk")) { if ( !(ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) @@ -215,6 +216,10 @@ nm_setting_wireless_ap_security_compatible (NMSettingWireless *s_wireless, if ( !(ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_802_1X) && !(ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) return FALSE; + } else if (!strcmp (key_mgmt, "sae")) { + if ( !(ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_SAE) + && !(ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_SAE)) + return FALSE; } // FIXME: should handle WPA and RSN separately here to ensure that