diff options
| author | Michael Biebl <biebl@debian.org> | 2019-09-30 13:50:14 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-09-30 13:50:14 +0200 |
| commit | 0bef21b7d9274778958532e84565e8b76f1204ee (patch) | |
| tree | 9b6f312103439539009916cbd7352d32853cc553 /libnm-core | |
| parent | 857b32ce16c33d2fb191da77e9a3f3b542714d74 (diff) | |
| parent | d0425f68f7ee83a1dc5a6ad3688627c1b472a58b (diff) | |
Update upstream source from tag 'upstream/1.20.4'
Update to upstream version '1.20.4' with Debian dir a7248e22a7605bec597b9752dfceb6985ad68a67
Diffstat (limited to 'libnm-core')
| -rw-r--r-- | libnm-core/nm-setting-wired.c | 2 | ||||
| -rw-r--r-- | libnm-core/nm-setting-wireless.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index 71add938..450ad1de 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -790,7 +790,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } if (priv->s390_subchannels) { - int len = g_strv_length (priv->s390_subchannels); + guint len = g_strv_length (priv->s390_subchannels); if (len != 2 && len != 3) { g_set_error_literal (error, 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 |