diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-10-07 11:18:33 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-10-07 11:18:33 +0200 |
| commit | 2db79403563179c1a29e6292172f5563acf13c70 (patch) | |
| tree | 7ffefc53c347326e24f28785241f1409a1ecbbf6 /libnm-core/nm-setting-wireless.c | |
| parent | 5b9d4e305df987ddad7f3d05afd709a70cddf7fd (diff) | |
| parent | 790e3946f0274a272fdda4d8697ce31a757a48d2 (diff) | |
Merge remote-tracking branch 'salsa/master'
Diffstat (limited to 'libnm-core/nm-setting-wireless.c')
| -rw-r--r-- | libnm-core/nm-setting-wireless.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c index cc04e1a0..f735bd47 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -227,7 +227,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) @@ -237,6 +238,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 |