fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-19 05:20:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: change auth-alg form "open" to NULL when authentication is wpa3

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/931
This commit is contained in:
xiangnian 2021-07-16 13:17:58 +08:00 • committed by Beniamino Galvani
parent 8887358383
commit 109d561bed
1 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/devices/wifi/nm-wifi-utils.c
View file

@ -825,21 +825,11 @@ nm_wifi_utils_complete_connection(GBytes * ap_ssid,
"open",
NULL);
} else if (nm_streq0(key_mgmt, "sae") || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE)) {
g_object_set(s_wsec,
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT,
"sae",
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG,
"open",
NULL);
g_object_set(s_wsec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "sae", NULL);
} else if (nm_streq0(key_mgmt, "owe")
|| NM_FLAGS_ANY(ap_rsn_flags,
NM_802_11_AP_SEC_KEY_MGMT_OWE | NM_802_11_AP_SEC_KEY_MGMT_OWE_TM)) {
g_object_set(s_wsec,
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT,
"owe",
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG,
"open",
NULL);
g_object_set(s_wsec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "owe", NULL);
} else if (ap_wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK
|| ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK) {
g_object_set(s_wsec,
@ -853,12 +843,7 @@ nm_wifi_utils_complete_connection(GBytes * ap_ssid,
*/
} else if (nm_streq0(key_mgmt, "wpa-eap-suite-b-192")
|| (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_EAP_SUITE_B_192)) {
g_object_set(s_wsec,
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT,
"wpa-eap-suite-b-192",
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG,
"open",
NULL);
g_object_set(s_wsec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-eap-suite-b-192", NULL);
} else {
g_set_error_literal(error,
NM_CONNECTION_ERROR,