diff options
| author | Michael Biebl <biebl@debian.org> | 2019-11-06 20:46:28 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-11-06 20:46:28 +0100 |
| commit | 515e1311d22086215e182f18a4529f24660ca4c3 (patch) | |
| tree | 5b1d21eeceaa57d233d46ddfeeca5e0c1fc8b8a3 /libnm-core/nm-utils.c | |
| parent | 790e3946f0274a272fdda4d8697ce31a757a48d2 (diff) | |
| parent | 9c642eac191ef0dce49855d8da0a9e9af18d5113 (diff) | |
Update upstream source from tag 'upstream/1.20.6'
Update to upstream version '1.20.6' with Debian dir 93035bdc0e2b22e7410d6c70c55a21648f836a2f
Diffstat (limited to 'libnm-core/nm-utils.c')
| -rw-r--r-- | libnm-core/nm-utils.c | 18 |
1 files changed, 18 insertions, 0 deletions
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; |