diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-08-21 14:39:11 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-09-13 12:31:27 +0200 |
| commit | 9255dd0879983abae59b105bded869f3bf30d97a (patch) | |
| tree | 24cc5e095ee6e9f8992a3c90b956d39c15ee3186 /src/wireless-security | |
| parent | 3d7fd849f212f5f2c80a4a6941b343c1dd066625 (diff) | |
| download | network-manager-applet-9255dd0879983abae59b105bded869f3bf30d97a.tar.gz | |
wifi: support ad-hoc WPA2 connections
Now that NM supports ad-hoc WPA2 connections, enable them in the applet.
https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/58
Diffstat (limited to 'src/wireless-security')
| -rw-r--r-- | src/wireless-security/ws-wpa-psk.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/wireless-security/ws-wpa-psk.c b/src/wireless-security/ws-wpa-psk.c index a7531041..eba22a79 100644 --- a/src/wireless-security/ws-wpa-psk.c +++ b/src/wireless-security/ws-wpa-psk.c @@ -131,14 +131,10 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection) wireless_security_clear_ciphers (connection); if (is_adhoc) { /* Ad-Hoc settings as specified by the supplicant */ - g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-none", NULL); - nm_setting_wireless_security_add_proto (s_wireless_sec, "wpa"); - nm_setting_wireless_security_add_pairwise (s_wireless_sec, "none"); - - /* Ad-hoc can only have _one_ group cipher... default to TKIP to be more - * compatible for now. Maybe we'll support selecting CCMP later. - */ - nm_setting_wireless_security_add_group (s_wireless_sec, "tkip"); + g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-psk", NULL); + nm_setting_wireless_security_add_proto (s_wireless_sec, "rsn"); + nm_setting_wireless_security_add_pairwise (s_wireless_sec, "ccmp"); + nm_setting_wireless_security_add_group (s_wireless_sec, "ccmp"); } else { g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-psk", NULL); @@ -178,7 +174,7 @@ ws_wpa_psk_new (NMConnection *connection, gboolean secrets_only) if (!parent) return NULL; - parent->adhoc_compatible = FALSE; + parent->adhoc_compatible = TRUE; sec = (WirelessSecurityWPAPSK *) parent; sec->editing_connection = secrets_only ? FALSE : TRUE; sec->password_flags_name = NM_SETTING_WIRELESS_SECURITY_PSK; |