diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2022-05-30 11:36:39 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2022-06-15 12:00:44 +0200 |
| commit | 78f8bf35083cab99ab40df808184f64cd0d67431 (patch) | |
| tree | b03f149406334292dd1e88d9b0478c4f2ce5f641 | |
| parent | 98556a6347e6effe90c15770a3775d9799cad2d1 (diff) | |
| download | network-manager-applet-78f8bf35083cab99ab40df808184f64cd0d67431.tar.gz | |
wifi: change description for wpa-psk to include also WPA3
Since NM 1.32, key-mgmt=wpa-psk also enables WPA3 transition
mode. Update the description in the applet and editor to reflect that
change.
For WPA Enterprise, WPA3 is basically the same as WPA2 but with PMF
required. Then we have a stronger WPA3 Enterprise mode enabled with
key-mgmt=wpa-eap-suite-b-192. Don't change "WPA/WPA2 Enterprise" to
mention "WPA3" as that could be confused with the stronger mode
(currently not supported by the editor and applet).
While at it, change descriptions to use "/" instead of "&" as I find
it more clear.
https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/116
| -rw-r--r-- | src/applet-dialogs.c | 2 | ||||
| -rw-r--r-- | src/connection-editor/page-wifi-security.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c index b89d592b..880bfea5 100644 --- a/src/applet-dialogs.c +++ b/src/applet-dialogs.c @@ -225,7 +225,7 @@ create_info_label_security (NMConnection *connection) else if (!strcmp (key_mgmt, "wpa-none")) label = g_strdup (_("WPA/WPA2")); else if (!strcmp (key_mgmt, "wpa-psk")) - label = g_strdup (_("WPA/WPA2")); + label = g_strdup (_("WPA/WPA2/WPA3")); else if (!strcmp (key_mgmt, "sae")) label = g_strdup (_("WPA3")); else diff --git a/src/connection-editor/page-wifi-security.c b/src/connection-editor/page-wifi-security.c index ae0e1cd0..ee1ee1e8 100644 --- a/src/connection-editor/page-wifi-security.c +++ b/src/connection-editor/page-wifi-security.c @@ -407,7 +407,7 @@ finish_setup (CEPageWifiSecurity *self, gpointer user_data) g_return_if_fail (ws_wpa_psk); add_security_item (self, NMA_WS (ws_wpa_psk), sec_model, - &iter, _("WPA & WPA2 Personal"), TRUE, TRUE); + &iter, _("WPA/WPA2/WPA3 Personal"), TRUE, TRUE); if ((active < 0) && ((default_type == NMU_SEC_WPA_PSK) || (default_type == NMU_SEC_WPA2_PSK))) active = item; item++; @@ -420,7 +420,7 @@ finish_setup (CEPageWifiSecurity *self, gpointer user_data) g_return_if_fail (ws_wpa_eap); add_security_item (self, NMA_WS (ws_wpa_eap), sec_model, - &iter, _("WPA & WPA2 Enterprise"), FALSE, FALSE); + &iter, _("WPA/WPA2 Enterprise"), FALSE, FALSE); if ((active < 0) && ((default_type == NMU_SEC_WPA_ENTERPRISE) || (default_type == NMU_SEC_WPA2_ENTERPRISE))) active = item; item++; |