summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2019-09-16 16:55:49 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2019-09-20 13:18:18 +0200
commit84a86ce55f1e70cb32217d2c74242ff848db8cd7 (patch)
tree871d3b85a0dc70e7836154fde62cc48d1911b8bd
parent24bbceed9badb74dcbfbba51fa2a2df5bf90558d (diff)
downloadNetworkManager-84a86ce55f1e70cb32217d2c74242ff848db8cd7.tar.gz
libnm-core: support SAE when determining AP compatibility
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/172
-rw-r--r--libnm-core/nm-setting-wireless.c7
1 files changed, 6 insertions, 1 deletions
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