From 9c642eac191ef0dce49855d8da0a9e9af18d5113 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 6 Nov 2019 20:45:33 +0100 Subject: New upstream version 1.20.6 --- libnm-core/nm-utils.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'libnm-core/nm-utils.c') diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index c16c9004..29b62e2f 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -1121,6 +1121,7 @@ nm_utils_ap_mode_security_valid (NMUtilsSecurityType type, case NMU_SEC_STATIC_WEP: case NMU_SEC_WPA_PSK: case NMU_SEC_WPA2_PSK: + case NMU_SEC_SAE: return TRUE; default: break; @@ -1294,6 +1295,23 @@ nm_utils_security_valid (NMUtilsSecurityType type, return FALSE; } break; + case NMU_SEC_SAE: + if (adhoc) + return FALSE; + if (!(wifi_caps & NM_WIFI_DEVICE_CAP_RSN)) + return FALSE; + if (have_ap) { + if (ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_SAE) { + if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_TKIP) + && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)) + return TRUE; + if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_CCMP) + && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP)) + return TRUE; + } + return FALSE; + } + break; default: good = FALSE; break; -- cgit 1.3.0-6-gf8a5