summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxiangnian <xiangnian@uniontech.com>2021-07-16 13:17:58 +0800
committerBeniamino Galvani <bgalvani@redhat.com>2021-07-26 10:58:09 +0200
commit109d561bed8341b36111e527185513dafd856c0d (patch)
tree5ab92da3899c075733d8742259b9f7d67d0fc77d
parent888735838382cf45530914b34d383277ff4ddbe4 (diff)
downloadNetworkManager-109d561bed8341b36111e527185513dafd856c0d.tar.gz
wifi: change auth-alg form "open" to NULL when authentication is wpa3
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/931
-rw-r--r--src/core/devices/wifi/nm-wifi-utils.c21
1 files changed, 3 insertions, 18 deletions
diff --git a/src/core/devices/wifi/nm-wifi-utils.c b/src/core/devices/wifi/nm-wifi-utils.c
index 15ced990b7..409d9eb1f1 100644
--- a/src/core/devices/wifi/nm-wifi-utils.c
+++ b/src/core/devices/wifi/nm-wifi-utils.c
@@ -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,