about summary refs log tree commit diff
path: root/clients
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2019-03-12 15:16:42 +0100
committerSebastien Bacher <seb128@ubuntu.com>2019-03-12 15:16:42 +0100
commitcc4ab276f923ded9f415c1c2bf192994367ab0bb (patch)
treeac3a7775665992b27d07eb44186d38ff961a8cd7 /clients
parentbb1cf58350bb34463e9ffc5f96ac4f9b6bf46d28 (diff)
parentdd428301eb6f02542015121d7b08d9997f137e50 (diff)
Update upstream source from tag 'upstream/1.15.91'
Update to upstream version '1.15.91'
with Debian dir 74de38245314cab529c6c94cd9d0b874ce0c2994
Diffstat (limited to 'clients')
-rw-r--r--clients/cli/agent.c8
-rw-r--r--clients/cli/common.c54
-rw-r--r--clients/cli/common.h4
-rw-r--r--clients/cli/connections.c56
-rw-r--r--clients/cli/devices.c64
-rw-r--r--clients/cli/general.c3
-rw-r--r--clients/cli/nmcli.c17
-rw-r--r--clients/cli/nmcli.h4
-rw-r--r--clients/cli/polkit-agent.c1
-rw-r--r--clients/cli/utils.c34
-rw-r--r--clients/common/meson.build2
-rw-r--r--clients/common/nm-client-utils.c1
-rw-r--r--clients/common/nm-client-utils.h7
-rw-r--r--clients/common/nm-meta-setting-desc.c544
-rw-r--r--clients/common/nm-meta-setting-desc.h3
-rw-r--r--clients/common/nm-polkit-listener.c1
-rw-r--r--clients/common/nm-secret-agent-simple.c937
-rw-r--r--clients/common/nm-secret-agent-simple.h42
-rw-r--r--clients/common/nm-vpn-helpers.c569
-rw-r--r--clients/common/nm-vpn-helpers.h3
-rw-r--r--clients/common/settings-docs.h15
-rw-r--r--clients/common/settings-docs.h.in15
-rw-r--r--clients/common/tests/test-general.c96
-rw-r--r--clients/common/tests/wg-test0.conf18
-rw-r--r--clients/common/tests/wg-test1.conf3
-rw-r--r--clients/common/tests/wg-test2.conf8
-rw-r--r--clients/common/tests/wg-test3.conf3
-rw-r--r--clients/tests/test-client.check-on-disk/test_001.expected284
-rw-r--r--clients/tests/test-client.check-on-disk/test_002.expected136
-rw-r--r--clients/tests/test-client.check-on-disk/test_003.expected922
-rw-r--r--clients/tests/test-client.check-on-disk/test_004.expected3700
-rwxr-xr-xclients/tests/test-client.py16
-rw-r--r--clients/tui/newt/nmt-newt-button-box.c3
-rw-r--r--clients/tui/newt/nmt-newt-container.c3
-rw-r--r--clients/tui/newt/nmt-newt-entry-numeric.c4
-rw-r--r--clients/tui/newt/nmt-newt-entry.c2
-rw-r--r--clients/tui/newt/nmt-newt-form.c1
-rw-r--r--clients/tui/newt/nmt-newt-grid.c2
-rw-r--r--clients/tui/newt/nmt-newt-label.c3
-rw-r--r--clients/tui/newt/nmt-newt-section.c3
-rw-r--r--clients/tui/newt/nmt-newt-stack.c2
-rw-r--r--clients/tui/newt/nmt-newt-textbox.c3
-rw-r--r--clients/tui/newt/nmt-newt-utils.c1
-rw-r--r--clients/tui/nm-editor-bindings.c5
-rw-r--r--clients/tui/nmt-address-list.c4
-rw-r--r--clients/tui/nmt-device-entry.c4
-rw-r--r--clients/tui/nmt-editor-grid.c2
-rw-r--r--clients/tui/nmt-mac-entry.c2
-rw-r--r--clients/tui/nmt-utils.c2
-rw-r--r--clients/tui/nmt-widget-list.c4
-rw-r--r--clients/tui/nmtui-connect.c8
-rw-r--r--clients/tui/nmtui.c4
52 files changed, 4322 insertions, 3310 deletions
diff --git a/clients/cli/agent.c b/clients/cli/agent.c
index 05cc5dca..6c116153 100644
--- a/clients/cli/agent.c
+++ b/clients/cli/agent.c
@@ -25,7 +25,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 
@@ -105,7 +104,10 @@ get_secrets_from_user (const NmcConfig *nmc_config,
 			rl_startup_hook = set_deftext;
 			pre_input_deftext = g_strdup (secret->value);
 		}
-		pwd = nmc_readline (nmc_config, "%s (%s): ", secret->pretty_name, secret->entry_id);
+		if (secret->no_prompt_entry_id)
+			pwd = nmc_readline (nmc_config, "%s: ", secret->pretty_name);
+		else
+			pwd = nmc_readline (nmc_config, "%s (%s): ", secret->pretty_name, secret->entry_id);
 
 		/* No password provided, cancel the secrets. */
 		if (!pwd)
@@ -149,7 +151,7 @@ do_agent_secret (NmCli *nmc, int argc, char **argv)
 		/* We keep running */
 		nmc->should_wait++;
 
-		nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (nmc->secret_agent), NULL);
+		nm_secret_agent_simple_enable (nmc->secret_agent, NULL);
 		g_signal_connect (nmc->secret_agent,
 		                  NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS,
 		                  G_CALLBACK (secrets_requested),
diff --git a/clients/cli/common.c b/clients/cli/common.c
index 85b5005e..3c1c315d 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -25,7 +25,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <sys/ioctl.h>
 #include <readline/readline.h>
 #include <readline/history.h>
@@ -686,6 +685,8 @@ get_secrets_from_user (const NmcConfig *nmc_config,
 			pwd = g_strdup (pwd);
 		} else {
 			if (ask) {
+				gboolean echo_on;
+
 				if (secret->value) {
 					if (!g_strcmp0 (secret->vpn_type, NM_DBUS_INTERFACE ".openconnect")) {
 						/* Do not present and ask user for openconnect secrets, we already have them */
@@ -698,11 +699,16 @@ get_secrets_from_user (const NmcConfig *nmc_config,
 				}
 				if (msg)
 					g_print ("%s\n", msg);
-				pwd = nmc_readline_echo (nmc_config,
-				                         secret->is_secret
-				                         ? nmc_config->show_secrets
-				                         : TRUE,
-				                         "%s (%s): ", secret->pretty_name, secret->entry_id);
+
+				echo_on = secret->is_secret
+				          ? nmc_config->show_secrets
+				          : TRUE;
+
+				if (secret->no_prompt_entry_id)
+					pwd = nmc_readline_echo (nmc_config, echo_on, "%s: ", secret->pretty_name);
+				else
+					pwd = nmc_readline_echo (nmc_config, echo_on, "%s (%s): ", secret->pretty_name, secret->entry_id);
+
 				if (!pwd)
 					pwd = g_strdup ("");
 			} else {
@@ -778,7 +784,7 @@ nmc_secrets_requested (NMSecretAgentSimple *agent,
 		/* Unregister our secret agent on failure, so that another agent
 		 * may be tried */
 		if (nmc->secret_agent) {
-			nm_secret_agent_old_unregister (nmc->secret_agent, NULL, NULL);
+			nm_secret_agent_old_unregister (NM_SECRET_AGENT_OLD (nmc->secret_agent), NULL, NULL);
 			g_clear_object (&nmc->secret_agent);
 		}
 	}
@@ -1343,23 +1349,39 @@ nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char
 /**
  * nmc_complete_strings:
  * @prefix: a string to match
- * @...: a %NULL-terminated list of candidate strings
+ * @nargs: the number of elements in @args. Or -1 if @args is a NULL terminated
+ *   strv array.
+ * @args: the argument list. If @nargs is not -1, then some elements may
+ *   be %NULL to indicate to silently skip the values.
  *
  * Prints all the matching candidates for completion. Useful when there's
  * no better way to suggest completion other than a hardcoded string list.
  */
 void
-nmc_complete_strings (const char *prefix, ...)
+nmc_complete_strv (const char *prefix, gssize nargs, const char *const*args)
 {
-	va_list args;
-	const char *candidate;
+	gsize i, n;
+
+	if (prefix && !prefix[0])
+		prefix = NULL;
 
-	va_start (args, prefix);
-	while ((candidate = va_arg (args, const char *))) {
-		if (!*prefix || matches (prefix, candidate))
-			g_print ("%s\n", candidate);
+	if (nargs < 0) {
+		nm_assert (nargs == -1);
+		n = NM_PTRARRAY_LEN (args);
+	} else
+		n = (gsize) nargs;
+
+	for (i = 0; i < n; i++) {
+		const char *candidate = args[i];
+
+		if (!candidate)
+			continue;
+		if (   prefix
+		    && !matches (prefix, candidate))
+			continue;
+
+		g_print ("%s\n", candidate);
 	}
-	va_end (args);
 }
 
 /**
diff --git a/clients/cli/common.h b/clients/cli/common.h
index 71734acc..688f2819 100644
--- a/clients/cli/common.h
+++ b/clients/cli/common.h
@@ -88,7 +88,9 @@ typedef struct {
 
 void nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char **argv);
 
-void nmc_complete_strings (const char *prefix, ...) G_GNUC_NULL_TERMINATED;
+void nmc_complete_strv (const char *prefix, gssize nargs, const char *const*args);
+
+#define nmc_complete_strings(prefix, ...) nmc_complete_strv ((prefix), NM_NARG (__VA_ARGS__), (const char *const[]) { __VA_ARGS__ })
 
 void nmc_complete_bool (const char *prefix);
 
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 446424ba..6db44f87 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -22,10 +22,8 @@
 #include "connections.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
 #include <signal.h>
 #include <netinet/ether.h>
 #include <readline/readline.h>
@@ -796,6 +794,7 @@ const NmcMetaGenericInfo *const metagen_con_active_vpn[_NMC_GENERIC_INFO_TYPE_CO
                                          NM_SETTING_IP4_CONFIG_SETTING_NAME","\
                                          NM_SETTING_IP6_CONFIG_SETTING_NAME","\
                                          NM_SETTING_SERIAL_SETTING_NAME","\
+                                         NM_SETTING_WIFI_P2P_SETTING_NAME","\
                                          NM_SETTING_PPP_SETTING_NAME","\
                                          NM_SETTING_PPPOE_SETTING_NAME","\
                                          NM_SETTING_ADSL_SETTING_NAME","\
@@ -823,6 +822,7 @@ const NmcMetaGenericInfo *const metagen_con_active_vpn[_NMC_GENERIC_INFO_TYPE_CO
                                          NM_SETTING_VXLAN_SETTING_NAME"," \
                                          NM_SETTING_WPAN_SETTING_NAME","\
                                          NM_SETTING_6LOWPAN_SETTING_NAME","\
+                                         NM_SETTING_WIREGUARD_SETTING_NAME","\
                                          NM_SETTING_PROXY_SETTING_NAME"," \
                                          NM_SETTING_TC_CONFIG_SETTING_NAME"," \
                                          NM_SETTING_SRIOV_SETTING_NAME"," \
@@ -2473,7 +2473,7 @@ check_activated (ActivateConnectionInfo *info)
 		if (nmc->secret_agent) {
 			NMRemoteConnection *connection = nm_active_connection_get_connection (info->active);
 
-			nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (nmc->secret_agent),
+			nm_secret_agent_simple_enable (nmc->secret_agent,
 			                               nm_connection_get_path (NM_CONNECTION (connection)));
 		}
 		break;
@@ -2775,7 +2775,6 @@ nmc_activate_connection (NmCli *nmc,
 		g_hash_table_destroy (nmc->pwds_hash);
 	nmc->pwds_hash = pwds_hash;
 
-	/* Create secret agent */
 	nmc->secret_agent = nm_secret_agent_simple_new ("nmcli-connect");
 	if (nmc->secret_agent) {
 		g_signal_connect (nmc->secret_agent,
@@ -3306,7 +3305,7 @@ get_valid_properties_string (const NMMetaSettingValidPartItem *const*array,
 	str = g_string_sized_new (1024);
 
 	for (i = 0; i < 2; i++, iter = array_slv) {
-		for(; !full_match && iter && *iter; iter++) {
+		for (; !full_match && iter && *iter; iter++) {
 			const NMMetaSettingInfoEditor *setting_info = (*iter)->setting_info;
 
 			if (   !(g_str_has_prefix (setting_info->general->setting_name, prefix))
@@ -6727,7 +6726,7 @@ progress_activation_editor_cb (gpointer user_data)
 		NMRemoteConnection *connection;
 
 		connection = nm_active_connection_get_connection (ac);
-		nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (info->nmc->secret_agent),
+		nm_secret_agent_simple_enable (info->nmc->secret_agent,
 		                               nm_object_get_path (NM_OBJECT (connection)));
 	}
 
@@ -8889,8 +8888,11 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 	}
 
 	while (argc > 0) {
-		if (argc == 1 && nmc->complete)
-			nmc_complete_strings (*argv, "type", "file", NULL);
+		if (argc == 1 && nmc->complete) {
+			nmc_complete_strings (*argv,
+			                      type ? NULL : "type",
+			                      filename ? NULL : "file");
+		}
 
 		if (strcmp (*argv, "type") == 0) {
 			argc--;
@@ -8900,8 +8902,13 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 				NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
 			}
 
-			if (argc == 1 && nmc->complete)
-				complete_option ((const NMMetaAbstractInfo *) nm_meta_property_info_vpn_service_type, *argv, NULL);
+			if (   argc == 1
+			    && nmc->complete) {
+				nmc_complete_strings (*argv, "wireguard");
+				complete_option ((const NMMetaAbstractInfo *) nm_meta_property_info_vpn_service_type,
+				                 *argv,
+				                 NULL);
+			}
 
 			if (!type)
 				type = *argv;
@@ -8941,21 +8948,26 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 		NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
 	}
 
-	service_type = nm_vpn_plugin_info_list_find_service_type (nm_vpn_get_plugin_infos (), type);
-	if (!service_type) {
-		g_string_printf (nmc->return_text, _("Error: failed to find VPN plugin for %s."), type);
-		NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN);
-	}
+	if (nm_streq (type, "wireguard"))
+		connection = nm_vpn_wireguard_import (filename, &error);
+	else {
+		service_type = nm_vpn_plugin_info_list_find_service_type (nm_vpn_get_plugin_infos (), type);
+		if (!service_type) {
+			g_string_printf (nmc->return_text, _("Error: failed to find VPN plugin for %s."), type);
+			NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN);
+		}
 
-	/* Import VPN configuration */
-	plugin = nm_vpn_get_editor_plugin (service_type, &error);
-	if (!plugin) {
-		g_string_printf (nmc->return_text, _("Error: failed to load VPN plugin: %s."),
-		                 error->message);
-		NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN);
+		/* Import VPN configuration */
+		plugin = nm_vpn_get_editor_plugin (service_type, &error);
+		if (!plugin) {
+			g_string_printf (nmc->return_text, _("Error: failed to load VPN plugin: %s."),
+			                 error->message);
+			NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN);
+		}
+
+		connection = nm_vpn_editor_plugin_import (plugin, filename, &error);
 	}
 
-	connection = nm_vpn_editor_plugin_import (plugin, filename, &error);
 	if (!connection) {
 		g_string_printf (nmc->return_text, _("Error: failed to import '%s': %s."),
 		                 filename, error->message);
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 44573fb6..04a8c988 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -22,9 +22,7 @@
 #include "devices.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <readline/readline.h>
 
 #include "nm-secret-agent-simple.h"
@@ -44,43 +42,39 @@
 static char *
 ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags)
 {
-	char *flags_str[16]; /* Enough space for flags and terminating NULL */
-	char *ret_str;
+	char *flags_str[13];
 	int i = 0;
 
 	if (flags & NM_802_11_AP_SEC_PAIR_WEP40)
-		flags_str[i++] = g_strdup ("pair_wpe40");
+		flags_str[i++] = "pair_wpe40";
 	if (flags & NM_802_11_AP_SEC_PAIR_WEP104)
-		flags_str[i++] = g_strdup ("pair_wpe104");
+		flags_str[i++] = "pair_wpe104";
 	if (flags & NM_802_11_AP_SEC_PAIR_TKIP)
-		flags_str[i++] = g_strdup ("pair_tkip");
+		flags_str[i++] = "pair_tkip";
 	if (flags & NM_802_11_AP_SEC_PAIR_CCMP)
-		flags_str[i++] = g_strdup ("pair_ccmp");
+		flags_str[i++] = "pair_ccmp";
 	if (flags & NM_802_11_AP_SEC_GROUP_WEP40)
-		flags_str[i++] = g_strdup ("group_wpe40");
+		flags_str[i++] = "group_wpe40";
 	if (flags & NM_802_11_AP_SEC_GROUP_WEP104)
-		flags_str[i++] = g_strdup ("group_wpe104");
+		flags_str[i++] = "group_wpe104";
 	if (flags & NM_802_11_AP_SEC_GROUP_TKIP)
-		flags_str[i++] = g_strdup ("group_tkip");
+		flags_str[i++] = "group_tkip";
 	if (flags & NM_802_11_AP_SEC_GROUP_CCMP)
-		flags_str[i++] = g_strdup ("group_ccmp");
+		flags_str[i++] = "group_ccmp";
 	if (flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
-		flags_str[i++] = g_strdup ("psk");
+		flags_str[i++] = "psk";
 	if (flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
-		flags_str[i++] = g_strdup ("802.1X");
+		flags_str[i++] = "802.1X";
+	if (flags & NM_802_11_AP_SEC_KEY_MGMT_SAE)
+		flags_str[i++] = "sae";
+	/* Make sure you grow flags_str when adding items here. */
 
 	if (i == 0)
-		flags_str[i++] = g_strdup (_("(none)"));
+		flags_str[i++] = _("(none)");
 
 	flags_str[i] = NULL;
 
-	ret_str = g_strjoinv (" ", flags_str);
-
-	i = 0;
-	while (flags_str[i])
-		g_free (flags_str[i++]);
-
-	return ret_str;
+	return g_strjoinv (" ", flags_str);
 }
 
 static NMMetaColor
@@ -1164,21 +1158,21 @@ fill_output_access_point (gpointer data, gpointer user_data)
 	if (   (flags & NM_802_11_AP_FLAGS_PRIVACY)
 	    && (wpa_flags == NM_802_11_AP_SEC_NONE)
 	    && (rsn_flags == NM_802_11_AP_SEC_NONE)) {
-		g_string_append (security_str, _("WEP"));
-		g_string_append_c (security_str, ' ');
+		g_string_append (security_str, "WEP ");
 	}
 	if (wpa_flags != NM_802_11_AP_SEC_NONE) {
-		g_string_append (security_str, _("WPA1"));
-		g_string_append_c (security_str, ' ');
+		g_string_append (security_str, "WPA1 ");
+	}
+	if (   (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
+	    || (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) {
+		g_string_append (security_str, "WPA2 ");
 	}
-	if (rsn_flags != NM_802_11_AP_SEC_NONE) {
-		g_string_append (security_str, _("WPA2"));
-		g_string_append_c (security_str, ' ');
+	if (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) {
+		g_string_append (security_str, "WPA3 ");
 	}
 	if (   (wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
 	    || (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) {
-		g_string_append   (security_str, _("802.1X"));
-		g_string_append_c (security_str, ' ');
+		g_string_append   (security_str, "802.1X ");
 	}
 
 	if (security_str->len > 0)
@@ -1961,7 +1955,7 @@ connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data)
 			if (nmc->secret_agent) {
 				NMRemoteConnection *connection = nm_active_connection_get_connection (active);
 
-				nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (nmc->secret_agent),
+				nm_secret_agent_simple_enable (nmc->secret_agent,
 				                               nm_connection_get_path (NM_CONNECTION (connection)));
 			}
 
@@ -3468,7 +3462,8 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 					/* WEP */
 					con_password = nm_setting_wireless_security_get_wep_key (s_wsec, 0);
 				} else if (   (ap_wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
-				           || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)) {
+				           || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
+				           || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE)) {
 					/* WPA PSK */
 					con_password = nm_setting_wireless_security_get_psk (s_wsec);
 				}
@@ -3498,7 +3493,8 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 				              wep_passphrase ? NM_WEP_KEY_TYPE_PASSPHRASE: NM_WEP_KEY_TYPE_KEY,
 				              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)) {
+			           || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
+			           || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE)) {
 				/* WPA PSK */
 				g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_PSK, password, NULL);
 			}
diff --git a/clients/cli/general.c b/clients/cli/general.c
index d9128c76..2c22bdc9 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -21,7 +21,6 @@
 
 #include "general.h"
 
-#include <string.h>
 #include <stdlib.h>
 
 #include "nm-common-macros.h"
@@ -125,6 +124,8 @@ permission_to_string (NMClientPermission perm)
 		return NM_AUTH_PERMISSION_ENABLE_DISABLE_STATISTICS;
 	case NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK:
 		return NM_AUTH_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK;
+	case NM_CLIENT_PERMISSION_WIFI_SCAN:
+		return NM_AUTH_PERMISSION_WIFI_SCAN;
 	default:
 		return _("unknown");
 	}
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index 7e8477cc..d7bc2a46 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -24,7 +24,6 @@
 #include "nmcli.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <termios.h>
@@ -256,7 +255,7 @@ usage (void)
 	              "  -p, --pretty                             pretty output\n"
 	              "  -s, --show-secrets                       allow displaying passwords\n"
 	              "  -t, --terse                              terse output\n"
-	              "  -v, --version                            how program version\n"
+	              "  -v, --version                            show program version\n"
 	              "  -w, --wait <seconds>                     set timeout waiting for finishing operations\n"
 	              "\n"
 	              "OBJECT\n"
@@ -504,7 +503,7 @@ resolve_color_alias (const char *color)
 	static const struct {
 		const char *name;
 		const char *alias;
-	} const aliases[] = {
+	} aliases[] = {
 		{ "reset",        "0" },
 		{ "bold",         "1" },
 		{ "white",        "1;37" },
@@ -1013,15 +1012,15 @@ nmc_cleanup (NmCli *nmc)
 
 	g_clear_object (&nmc->client);
 
-	g_string_free (nmc->return_text, TRUE);
+	if (nmc->return_text)
+		g_string_free (g_steal_pointer (&nmc->return_text), TRUE);
 
 	if (nmc->secret_agent) {
-		/* Destroy secret agent if we have one. */
-		nm_secret_agent_old_unregister (nmc->secret_agent, NULL, NULL);
-		g_object_unref (nmc->secret_agent);
+		nm_secret_agent_old_unregister (NM_SECRET_AGENT_OLD (nmc->secret_agent), NULL, NULL);
+		g_clear_object (&nmc->secret_agent);
 	}
-	if (nmc->pwds_hash)
-		g_hash_table_destroy (nmc->pwds_hash);
+
+	nm_clear_pointer (&nmc->pwds_hash, g_hash_table_destroy);
 
 	nm_clear_g_free (&nmc->required_fields);
 
diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h
index 0ccf1653..cd50333a 100644
--- a/clients/cli/nmcli.h
+++ b/clients/cli/nmcli.h
@@ -20,7 +20,7 @@
 #ifndef NMC_NMCLI_H
 #define NMC_NMCLI_H
 
-#include "nm-secret-agent-old.h"
+#include "nm-secret-agent-simple.h"
 #include "nm-meta-setting-desc.h"
 
 struct _NMPolkitListener;
@@ -129,7 +129,7 @@ typedef struct _NmCli {
 
 	int timeout;                                      /* Operation timeout */
 
-	NMSecretAgentOld *secret_agent;                   /* Secret agent */
+	NMSecretAgentSimple *secret_agent;                /* Secret agent */
 	GHashTable *pwds_hash;                            /* Hash table with passwords in passwd-file */
 	struct _NMPolkitListener *pk_listener;            /* polkit agent listener */
 
diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c
index b895599b..accb567f 100644
--- a/clients/cli/polkit-agent.c
+++ b/clients/cli/polkit-agent.c
@@ -22,7 +22,6 @@
 #include "polkit-agent.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index 1b940467..0e74ba88 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -23,9 +23,7 @@
 #include "utils.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -1428,19 +1426,20 @@ pager_fallback (void)
 {
 	char buf[64];
 	int rb;
+	int errsv;
 
 	do {
 		rb = read (STDIN_FILENO, buf, sizeof (buf));
 		if (rb == -1) {
-			if (errno == EINTR) {
+			errsv = errno;
+			if (errsv == EINTR)
 				continue;
-			} else {
-				g_printerr (_("Error reading nmcli output: %s\n"), strerror (errno));
-				_exit(EXIT_FAILURE);
-			}
+			g_printerr (_("Error reading nmcli output: %s\n"), nm_strerror_native (errsv));
+			_exit(EXIT_FAILURE);
 		}
 		if (write (STDOUT_FILENO, buf, rb) == -1) {
-			g_printerr (_("Error writing nmcli output: %s\n"), strerror (errno));
+			errsv = errno;
+			g_printerr (_("Error writing nmcli output: %s\n"), nm_strerror_native (errsv));
 			_exit(EXIT_FAILURE);
 		}
 	} while (rb > 0);
@@ -1455,6 +1454,7 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config)
 	pid_t pager_pid;
 	pid_t parent_pid;
 	int fd[2];
+	int errsv;
 
 	if (   nmc_config->in_editor
 	    || nmc_config->print_output == NMC_PRINT_TERSE
@@ -1464,7 +1464,8 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config)
 		return 0;
 
 	if (pipe (fd) == -1) {
-		g_printerr (_("Failed to create pager pipe: %s\n"), strerror (errno));
+		errsv = errno;
+		g_printerr (_("Failed to create pager pipe: %s\n"), nm_strerror_native (errsv));
 		return 0;
 	}
 
@@ -1472,7 +1473,8 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config)
 
 	pager_pid = fork ();
 	if (pager_pid == -1) {
-		g_printerr (_("Failed to fork pager: %s\n"), strerror (errno));
+		errsv = errno;
+		g_printerr (_("Failed to fork pager: %s\n"), nm_strerror_native (errsv));
 		nm_close (fd[0]);
 		nm_close (fd[1]);
 		return 0;
@@ -1517,10 +1519,14 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config)
 	}
 
 	/* Return in the parent */
-	if (dup2 (fd[1], STDOUT_FILENO) < 0)
-		g_printerr (_("Failed to duplicate pager pipe: %s\n"), strerror (errno));
-	if (dup2 (fd[1], STDERR_FILENO) < 0)
-		g_printerr (_("Failed to duplicate pager pipe: %s\n"), strerror (errno));
+	if (dup2 (fd[1], STDOUT_FILENO) < 0) {
+		errsv = errno;
+		g_printerr (_("Failed to duplicate pager pipe: %s\n"), nm_strerror_native (errsv));
+	}
+	if (dup2 (fd[1], STDERR_FILENO) < 0) {
+		errsv = errno;
+		g_printerr (_("Failed to duplicate pager pipe: %s\n"), nm_strerror_native (errsv));
+	}
 
 	nm_close (fd[0]);
 	nm_close (fd[1]);
diff --git a/clients/common/meson.build b/clients/common/meson.build
index af54cec0..b4b6bcac 100644
--- a/clients/common/meson.build
+++ b/clients/common/meson.build
@@ -13,7 +13,7 @@ cflags = clients_cflags + [
 
 libnmc_base = static_library(
   'nmc-base',
-  sources: shared_files_clients_common + files(
+  sources: files(
     'nm-client-utils.c',
     'nm-secret-agent-simple.c',
     'nm-vpn-helpers.c',
diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c
index 8ba2453e..1241131a 100644
--- a/clients/common/nm-client-utils.c
+++ b/clients/common/nm-client-utils.c
@@ -352,6 +352,7 @@ NM_UTILS_LOOKUP_STR_DEFINE (nmc_device_reason_to_string, NMDeviceStateReason,
 	NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE,           N_("A duplicate IP address was detected")),
 	NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED,          N_("The selected IP method is not supported")),
 	NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SRIOV_CONFIGURATION_FAILED,     N_("Failed to configure SR-IOV parameters")),
+	NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_PEER_NOT_FOUND,                 N_("The Wi-Fi P2P peer could not be found")),
 )
 
 NM_UTILS_LOOKUP_STR_DEFINE (nm_active_connection_state_reason_to_string, NMActiveConnectionStateReason,
diff --git a/clients/common/nm-client-utils.h b/clients/common/nm-client-utils.h
index 9d818873..a5bc05fa 100644
--- a/clients/common/nm-client-utils.h
+++ b/clients/common/nm-client-utils.h
@@ -24,6 +24,13 @@
 #include "nm-active-connection.h"
 #include "nm-device.h"
 
+
+#define nm_auto_unref_ip_address nm_auto (_nm_ip_address_unref)
+NM_AUTO_DEFINE_FCN0 (NMIPAddress *, _nm_ip_address_unref, nm_ip_address_unref)
+
+#define nm_auto_unref_wgpeer nm_auto (_nm_auto_unref_wgpeer)
+NM_AUTO_DEFINE_FCN0 (NMWireGuardPeer *, _nm_auto_unref_wgpeer, nm_wireguard_peer_unref)
+
 const NMObject **nmc_objects_sort_by_path (const NMObject *const*objs, gssize len);
 
 const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error);
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 4befce25..6e35228a 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -117,7 +117,6 @@ _parse_ip_route (int family,
 {
 	const int MAX_PREFIX = (family == AF_INET) ? 32 : 128;
 	const char *next_hop = NULL;
-	const char *canon_dest;
 	int prefix;
 	NMIPRoute *route = NULL;
 	GError *local = NULL;
@@ -229,18 +228,6 @@ _parse_ip_route (int family,
 		return NULL;
 	}
 
-	/* We don't accept default routes as NetworkManager handles it
-	 * itself. But we have to check this after @route has normalized the
-	 * dest string.
-	 */
-	canon_dest = nm_ip_route_get_dest (route);
-	if (!strcmp (canon_dest, "0.0.0.0") || !strcmp (canon_dest, "::")) {
-		g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT,
-		                     _("default route cannot be added (NetworkManager handles it by itself)"));
-		g_clear_pointer (&route, nm_ip_route_unref);
-		return NULL;
-	}
-
 	if (attrs) {
 		GHashTableIter iter;
 		char *name;
@@ -1526,18 +1513,16 @@ bytes_to_string (GBytes *bytes)
 {
 	const guint8 *data;
 	gsize len;
-	GString *cert = NULL;
-	int i;
 
 	if (!bytes)
 		return NULL;
-	data = g_bytes_get_data (bytes, &len);
-
-	cert = g_string_new (NULL);
-	for (i = 0; i < len; i++)
-		g_string_append_printf (cert, "%02X", data[i]);
 
-	return g_string_free (cert, FALSE);
+	data = g_bytes_get_data (bytes, &len);
+	return nm_utils_bin2hexstr_full (data,
+	                                 len,
+	                                 '\0',
+	                                 TRUE,
+	                                 NULL);
 }
 
 static char *
@@ -1956,25 +1941,36 @@ nmc_util_is_domain (const char *domain)
 }
 
 static gboolean
-nmc_property_set_bytes (NMSetting *setting, const char *prop, const char *value, GError **error)
+_set_fcn_gobject_bytes (ARGS_SET_FCN)
 {
-	gs_free char *val_strip = NULL;
+	gs_free char *val_strip_free = NULL;
 	gs_free const char **strv = NULL;
+	const char *val_strip;
 	const char **iter;
 	gs_unref_bytes GBytes *bytes = NULL;
 	GByteArray *array;
 
 	nm_assert (!error || !*error);
 
-	val_strip = g_strstrip (g_strdup (value));
+	val_strip = nm_strstrip_avoid_copy (value, &val_strip_free);
 
 	/* First try hex string in the format of AAbbCCDd */
 	bytes = nm_utils_hexstr2bin (val_strip);
 	if (bytes)
 		goto done;
 
+	if (   !property_info->property_typ_data
+	    || !property_info->property_typ_data->subtype.gobject_bytes.legacy_format) {
+		if (value && value[0]) {
+			g_set_error_literal (error, 1, 0, _("not a valid hex-string"));
+			return FALSE;
+		}
+		/* accept the empty word to reset the property to %NULL. */
+		goto done;
+	}
+
 	/* Otherwise, consider the following format: AA b 0xCc D */
-	strv = nm_utils_strsplit_set (val_strip, " \t", FALSE);
+	strv = nm_utils_strsplit_set (value, " \t", FALSE);
 	array = g_byte_array_sized_new (NM_PTRARRAY_LEN (strv));
 	for (iter = strv; iter && *iter; iter++) {
 		int v;
@@ -1992,7 +1988,7 @@ nmc_property_set_bytes (NMSetting *setting, const char *prop, const char *value,
 	bytes = g_byte_array_free_to_bytes (array);
 
 done:
-	g_object_set (setting, prop, bytes, NULL);
+	g_object_set (setting, property_info->property_name, bytes, NULL);
 	return TRUE;
 }
 
@@ -2109,14 +2105,16 @@ _get_fcn_802_1x_phase2_client_cert (ARGS_GET_FCN)
 }
 
 static gconstpointer
-_get_fcn_802_1x_password_raw (ARGS_GET_FCN)
+_get_fcn_gobject_bytes (ARGS_GET_FCN)
 {
-	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
+	gs_unref_bytes GBytes *bytes = NULL;
 	char *str;
 
 	RETURN_UNSUPPORTED_GET_TYPE ();
 
-	str = bytes_to_string (nm_setting_802_1x_get_password_raw (s_8021X));
+	g_object_get (setting, property_info->property_name, &bytes, NULL);
+
+	str = bytes_to_string (bytes);
 	NM_SET_OUT (out_is_default, !str || !str[0]);
 	RETURN_STR_TO_FREE (str);
 }
@@ -2191,7 +2189,7 @@ _get_fcn_802_1x_phase2_private_key (ARGS_GET_FCN)
 		strv = nm_utils_strsplit_set (value, " \t,", FALSE); \
 		if (strv) { \
 			for (i = 0; strv[i]; i++) \
-				set_func (NM_SETTING_802_1X (setting), strv[i++]); \
+				set_func (NM_SETTING_802_1X (setting), strv[i]); \
 		} \
 		return TRUE; \
 	}
@@ -2334,12 +2332,6 @@ DEFINE_SETTER_PRIV_KEY (_set_fcn_802_1x_phase2_private_key,
                         nm_setting_802_1x_get_phase2_private_key_password,
                         nm_setting_802_1x_set_phase2_private_key)
 
-static gboolean
-_set_fcn_802_1x_password_raw (ARGS_SET_FCN)
-{
-	return nmc_property_set_bytes (setting, property_info->property_name, value, error);
-}
-
 static gconstpointer
 _get_fcn_bond_options (ARGS_GET_FCN)
 {
@@ -4848,16 +4840,6 @@ _gobject_enum_pre_set_notify_fcn_wireless_security_wep_key_type (const NMMetaPro
 	}
 }
 
-static const char *
-_validate_fcn_wireless_security_psk (const char *value, char **out_to_free, GError **error)
-{
-	if (!nm_utils_wpa_psk_valid (value)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid PSK"), value);
-		return NULL;
-	}
-	return value;
-}
-
 /*****************************************************************************/
 
 static gconstpointer
@@ -5072,6 +5054,11 @@ static const NMMetaPropertyType _pt_gobject_mtu = {
 	.set_fcn =                      _set_fcn_gobject_mtu,
 };
 
+static const NMMetaPropertyType _pt_gobject_bytes = {
+	.get_fcn =                     _get_fcn_gobject_bytes,
+	.set_fcn =                     _set_fcn_gobject_bytes,
+};
+
 static const NMMetaPropertyType _pt_gobject_mac = {
 	.get_fcn =                      _get_fcn_gobject,
 	.set_fcn =                      _set_fcn_gobject_mac,
@@ -5122,8 +5109,8 @@ static const NMMetaPropertyType _pt_ethtool = {
 #define PROPERTY_INFO_WITH_DESC(name, ...) \
 	PROPERTY_INFO (name, DESCRIBE_DOC_##name, ##__VA_ARGS__)
 
-#define ENUM_VALUE_INFOS(...)  (((const NMUtilsEnumValueInfo []) { __VA_ARGS__, { 0 } }))
-#define INT_VALUE_INFOS(...)  (((const NMMetaUtilsIntValueInfo []) { __VA_ARGS__, { 0 } }))
+#define ENUM_VALUE_INFOS(...)  (((const NMUtilsEnumValueInfo    []) { __VA_ARGS__ { .nick = NULL, }, }))
+#define INT_VALUE_INFOS(...)   (((const NMMetaUtilsIntValueInfo []) { __VA_ARGS__ { .nick = NULL, }, }))
 
 #define GET_FCN_WITH_DEFAULT(type, func) \
 	/* macro that returns @func as const (gboolean(*)(NMSetting*)) type, but checks
@@ -5165,12 +5152,25 @@ static const NMMetaPropertyType _pt_ethtool = {
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
 			.value_infos =              INT_VALUE_INFOS ( \
 				{ \
-					.value = -1, \
+					.value.i64 = -1, \
 					.nick = "unset", \
-				} \
+				}, \
 			), \
 		),
 
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_6LOWPAN
+static const NMMetaPropertyInfo *const property_infos_6LOWPAN[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_6LOWPAN_PARENT,
+		.is_cli_option =                TRUE,
+		.property_alias =               "dev",
+		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+		.prompt =                       N_("IEEE 802.15.4 (WPAN) parent device or connection UUID"),
+		.property_type =                &_pt_gobject_string,
+	),
+	NULL
+};
+
+#undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_802_1X
 static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_EAP,
@@ -5354,9 +5354,9 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 		       "(with optional 0x/0X prefix, and optional leading 0).\n\n"
 		       "Examples: ab0455a6ea3a74C2\n"
 		       "          ab 4 55 0xa6 ea 3a 74 C2\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_802_1x_password_raw,
-			.set_fcn =                  _set_fcn_802_1x_password_raw,
+		.property_type =                 &_pt_gobject_bytes,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_bytes,
+			.legacy_format =            TRUE,
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS,
@@ -5679,13 +5679,13 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
 			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = -1,
+					.value.i64 = -1,
 					.nick = "default",
 				},
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "forever",
-				}
+				},
 			),
 		),
 	),
@@ -5789,7 +5789,7 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 					{
 						.value = NM_SETTING_CONNECTION_LLDP_ENABLE_RX,
 						.nick = "enable",
-					}
+					},
 				),
 			),
 			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
@@ -6172,15 +6172,15 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTE_TABLE, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTE_TABLE,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos = INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "unspec",
 				},
 				{
-					.value = 254,
+					.value.i64 = 254,
 					.nick = "main",
-				}
+				},
 			),
 		),
 	),
@@ -6196,15 +6196,15 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "default",
 				},
 				{
-					.value = G_MAXINT32,
+					.value.i64 = G_MAXINT32,
 					.nick = "infinity",
-				}
+				},
 			),
 		),
 	),
@@ -6228,13 +6228,13 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
 			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = -1,
+					.value.i64 = -1,
 					.nick = "default",
 				},
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "off",
-				}
+				},
 			),
 		),
 	),
@@ -6335,15 +6335,15 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTE_TABLE, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTE_TABLE,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "unspec",
 				},
 				{
-					.value = 254,
+					.value.i64 = 254,
 					.nick = "main",
-				}
+				},
 			),
 		),
 	),
@@ -6370,7 +6370,7 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
 				{
 					.value = NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR,
 					.nick = "enabled, prefer temporary IP",
-				}
+				},
 			),
 		),
 	),
@@ -6620,41 +6620,6 @@ static const NMMetaPropertyInfo *const property_infos_OLPC_MESH[] = {
 };
 
 #undef  _CURRENT_NM_META_SETTING_TYPE
-#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PPPOE
-static const NMMetaPropertyInfo *const property_infos_PPPOE[] = {
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PARENT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "parent",
-		.prompt =                       N_("PPPoE parent device"),
-		.property_type =                &_pt_gobject_string,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_SERVICE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "service",
-		.prompt =                       N_("Service [none]"),
-		.property_type =                &_pt_gobject_string,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_USERNAME,
-		.is_cli_option =                TRUE,
-		.property_alias =               "username",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("PPPoE username"),
-		.property_type =                &_pt_gobject_string,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD,
-		.is_cli_option =                TRUE,
-		.property_alias =               "password",
-		.prompt =                       N_("Password [none]"),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
-	),
-	NULL
-};
-
-#undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_OVS_BRIDGE
 static const NMMetaPropertyInfo *const property_infos_OVS_BRIDGE[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_BRIDGE_FAIL_MODE,
@@ -6793,6 +6758,41 @@ static const NMMetaPropertyInfo *const property_infos_PPP[] = {
 };
 
 #undef  _CURRENT_NM_META_SETTING_TYPE
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PPPOE
+static const NMMetaPropertyInfo *const property_infos_PPPOE[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PARENT,
+		.is_cli_option =                TRUE,
+		.property_alias =               "parent",
+		.prompt =                       N_("PPPoE parent device"),
+		.property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_SERVICE,
+		.is_cli_option =                TRUE,
+		.property_alias =               "service",
+		.prompt =                       N_("Service [none]"),
+		.property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_USERNAME,
+		.is_cli_option =                TRUE,
+		.property_alias =               "username",
+		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+		.prompt =                       N_("PPPoE username"),
+		.property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD,
+		.is_cli_option =                TRUE,
+		.property_alias =               "password",
+		.prompt =                       N_("Password [none]"),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD_FLAGS,
+		.property_type =                &_pt_gobject_secret_flags,
+	),
+	NULL
+};
+
+#undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PROXY
 static const NMMetaPropertyInfo *const property_infos_PROXY[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PROXY_METHOD,
@@ -6834,6 +6834,78 @@ static const NMMetaPropertyInfo *const property_infos_PROXY[] = {
 };
 
 #undef  _CURRENT_NM_META_SETTING_TYPE
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SERIAL
+static const NMMetaPropertyInfo *const property_infos_SERIAL[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BAUD,
+		.property_type =                &_pt_gobject_int,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BITS,
+		.property_type =                &_pt_gobject_int,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_PARITY,
+		.property_type =                &_pt_gobject_enum,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+				.value_infos =          ENUM_VALUE_INFOS (
+					{
+						.value = NM_SETTING_SERIAL_PARITY_EVEN,
+						.nick = "E",
+					},
+					{
+						.value = NM_SETTING_SERIAL_PARITY_EVEN,
+						.nick = "e",
+					},
+					{
+						.value = NM_SETTING_SERIAL_PARITY_ODD,
+						.nick = "O",
+					},
+					{
+						.value = NM_SETTING_SERIAL_PARITY_ODD,
+						.nick = "o",
+					},
+					{
+						.value = NM_SETTING_SERIAL_PARITY_NONE,
+						.nick = "N",
+					},
+					{
+						.value = NM_SETTING_SERIAL_PARITY_NONE,
+						.nick = "n",
+					},
+				),
+			),
+			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
+			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
+		),
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_STOPBITS,
+		.property_type =                &_pt_gobject_int,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_SEND_DELAY,
+		.property_type =                &_pt_gobject_int,
+	),
+	NULL
+};
+
+#undef  _CURRENT_NM_META_SETTING_TYPE
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SRIOV
+static const NMMetaPropertyInfo *const property_infos_SRIOV[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_TOTAL_VFS,
+		.property_type =                &_pt_gobject_int,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_VFS,
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_sriov_vfs,
+			.set_fcn =                  _set_fcn_sriov_vfs,
+			.remove_fcn =               _remove_fcn_sriov_vfs,
+		),
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_AUTOPROBE_DRIVERS,
+		.property_type =                &_pt_gobject_enum,
+	),
+	NULL
+};
+
+#undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_TC_CONFIG
 static const NMMetaPropertyInfo *const property_infos_TC_CONFIG[] = {
 	PROPERTY_INFO (NM_SETTING_TC_CONFIG_QDISCS, DESCRIBE_DOC_NM_SETTING_TC_CONFIG_QDISCS,
@@ -6869,44 +6941,44 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_NOTIFY_PEERS_COUNT,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "disabled",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_MCAST_REJOIN_COUNT,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "disabled",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
@@ -6945,11 +7017,11 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT,
+					.value.i64 = NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
@@ -6962,22 +7034,22 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_SYS_PRIO,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT,
+					.value.i64 = NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_MIN_PORTS,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
@@ -7018,22 +7090,22 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_QUEUE_ID,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT,
+					.value.i64 = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_PRIO,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
@@ -7043,22 +7115,22 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_LACP_PRIO,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT,
+					.value.i64 = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_LACP_KEY,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
@@ -7074,78 +7146,6 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 };
 
 #undef  _CURRENT_NM_META_SETTING_TYPE
-#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SERIAL
-static const NMMetaPropertyInfo *const property_infos_SERIAL[] = {
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BAUD,
-		.property_type =                &_pt_gobject_int,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BITS,
-		.property_type =                &_pt_gobject_int,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_PARITY,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.value_infos =          ENUM_VALUE_INFOS (
-					{
-						.value = NM_SETTING_SERIAL_PARITY_EVEN,
-						.nick = "E",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_EVEN,
-						.nick = "e",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_ODD,
-						.nick = "O",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_ODD,
-						.nick = "o",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_NONE,
-						.nick = "N",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_NONE,
-						.nick = "n",
-					}
-				),
-			),
-			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
-			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
-		),
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_STOPBITS,
-		.property_type =                &_pt_gobject_int,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_SEND_DELAY,
-		.property_type =                &_pt_gobject_int,
-	),
-	NULL
-};
-
-#undef  _CURRENT_NM_META_SETTING_TYPE
-#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SRIOV
-static const NMMetaPropertyInfo *const property_infos_SRIOV[] = {
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_TOTAL_VFS,
-		.property_type =                &_pt_gobject_int,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_VFS,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_sriov_vfs,
-			.set_fcn =                  _set_fcn_sriov_vfs,
-			.remove_fcn =               _remove_fcn_sriov_vfs,
-		),
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_AUTOPROBE_DRIVERS,
-		.property_type =                &_pt_gobject_enum,
-	),
-	NULL
-};
-
-#undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_TUN
 static const NMMetaPropertyInfo *const property_infos_TUN[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TUN_MODE,
@@ -7365,6 +7365,30 @@ static const NMMetaPropertyInfo *const property_infos_VXLAN[] = {
 };
 
 #undef  _CURRENT_NM_META_SETTING_TYPE
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIFI_P2P
+static const NMMetaPropertyInfo *const property_infos_WIFI_P2P[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIFI_P2P_PEER,
+		.is_cli_option =                TRUE,
+		.property_alias =               "peer",
+		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+		.prompt =                       N_("Peer"),
+		.property_type =                &_pt_gobject_mac,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIFI_P2P_WPS_METHOD,
+		.property_type =                &_pt_gobject_enum,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+				.get_gtype =            nm_setting_wireless_security_wps_method_get_type,
+			),
+		),
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIFI_P2P_WFD_IES,
+		.property_type =                &_pt_gobject_bytes,
+	),
+	NULL
+};
+
+#undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIMAX
 static const NMMetaPropertyInfo *const property_infos_WIMAX[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIMAX_MAC_ADDRESS,
@@ -7480,7 +7504,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRED[] = {
 					{
 						.value = NM_SETTING_WIRED_WAKE_ON_LAN_NONE,
 						.nick = "disabled",
-					}
+					},
 				),
 			),
 			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
@@ -7494,6 +7518,34 @@ static const NMMetaPropertyInfo *const property_infos_WIRED[] = {
 };
 
 #undef  _CURRENT_NM_META_SETTING_TYPE
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIREGUARD
+static const NMMetaPropertyInfo *const property_infos_WIREGUARD[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_PRIVATE_KEY,
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS,
+		.property_type =                &_pt_gobject_secret_flags,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_LISTEN_PORT,
+		.property_type =                &_pt_gobject_int,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_FWMARK,
+		.property_type =                &_pt_gobject_int,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
+			.base =                     16,
+		),
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_PEER_ROUTES,
+		.property_type =                &_pt_gobject_bool,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_MTU,
+		.property_type =                &_pt_gobject_mtu,
+	),
+	NULL
+};
+
+#undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIRELESS
 static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SSID,
@@ -7609,7 +7661,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = {
 					{
 						.value = NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE,
 						.nick = "disabled",
-					}
+					},
 				),
 			),
 		),
@@ -7623,7 +7675,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("none", "ieee8021x", "wpa-none", "wpa-psk", "wpa-eap"),
+			.values_static =            NM_MAKE_STRV ("none", "ieee8021x", "wpa-none", "wpa-psk", "wpa-eap", "sae"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX,
@@ -7723,9 +7775,6 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PSK,
 		.is_secret =                    TRUE,
 		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_string,
-			.validate_fcn =             _validate_fcn_wireless_security_psk,
-		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS,
 		.property_type =                &_pt_gobject_secret_flags,
@@ -7774,12 +7823,12 @@ static const NMMetaPropertyInfo *const property_infos_WPAN[] = {
 		.prompt =                       N_("Short address (<0x0000-0xffff>)"),
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
-			.base =			16,
-			.value_infos =          INT_VALUE_INFOS (
+			.base =                     16,
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = G_MAXUINT16,
+					.value.i64 = G_MAXUINT16,
 					.nick = "unset",
-				}
+				},
 			),
 		),
 	),
@@ -7790,12 +7839,12 @@ static const NMMetaPropertyInfo *const property_infos_WPAN[] = {
 		.prompt =                       N_("PAN Identifier (<0x0000-0xffff>)"),
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
-			.base =			16,
-			.value_infos =          INT_VALUE_INFOS (
+			.base =                     16,
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = G_MAXUINT16,
+					.value.i64 = G_MAXUINT16,
 					.nick = "unset",
-				}
+				},
 			),
 		),
 	),
@@ -7805,11 +7854,11 @@ static const NMMetaPropertyInfo *const property_infos_WPAN[] = {
 		.prompt =                       N_("Page (<default|0-31>)"),
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = NM_SETTING_WPAN_PAGE_DEFAULT,
+					.value.i64 = NM_SETTING_WPAN_PAGE_DEFAULT,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
@@ -7819,30 +7868,17 @@ static const NMMetaPropertyInfo *const property_infos_WPAN[] = {
 		.prompt =                       N_("Channel (<default|0-26>)"),
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = NM_SETTING_WPAN_CHANNEL_DEFAULT,
+					.value.i64 = NM_SETTING_WPAN_CHANNEL_DEFAULT,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
 	NULL
 };
 
-#undef  _CURRENT_NM_META_SETTING_TYPE
-#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_6LOWPAN
-static const NMMetaPropertyInfo *const property_infos_6LOWPAN[] = {
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_6LOWPAN_PARENT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "dev",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("IEEE 802.15.4 (WPAN) parent device or connection UUID"),
-		.property_type =                &_pt_gobject_string,
-	),
-	NULL
-};
-
 /*****************************************************************************/
 
 static void
@@ -7964,6 +8000,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
 
 /*****************************************************************************/
 
+#define SETTING_PRETTY_NAME_6LOWPAN             N_("6LOWPAN settings")
 #define SETTING_PRETTY_NAME_802_1X              N_("802-1x settings")
 #define SETTING_PRETTY_NAME_ADSL                N_("ADSL connection")
 #define SETTING_PRETTY_NAME_BLUETOOTH           N_("bluetooth connection")
@@ -8002,12 +8039,13 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
 #define SETTING_PRETTY_NAME_VLAN                N_("VLAN connection")
 #define SETTING_PRETTY_NAME_VPN                 N_("VPN connection")
 #define SETTING_PRETTY_NAME_VXLAN               N_("VXLAN connection")
+#define SETTING_PRETTY_NAME_WIFI_P2P            N_("Wi-Fi P2P connection")
 #define SETTING_PRETTY_NAME_WIMAX               N_("WiMAX connection")
 #define SETTING_PRETTY_NAME_WIRED               N_("Wired Ethernet")
+#define SETTING_PRETTY_NAME_WIREGUARD           N_("WireGuard VPN settings")
 #define SETTING_PRETTY_NAME_WIRELESS            N_("Wi-Fi connection")
 #define SETTING_PRETTY_NAME_WIRELESS_SECURITY   N_("Wi-Fi security settings")
 #define SETTING_PRETTY_NAME_WPAN                N_("WPAN settings")
-#define SETTING_PRETTY_NAME_6LOWPAN             N_("6LOWPAN settings")
 
 #define NM_META_SETTING_VALID_PARTS(...) \
 	((const NMMetaSettingValidPartItem *const[]) { __VA_ARGS__  NULL })
@@ -8245,6 +8283,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
 			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
 		),
 	),
+	SETTING_INFO (WIFI_P2P,
+		.valid_parts = NM_META_SETTING_VALID_PARTS (
+			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+			NM_META_SETTING_VALID_PART_ITEM (WIFI_P2P,              TRUE),
+		),
+	),
 	SETTING_INFO (WIMAX,
 		.valid_parts = NM_META_SETTING_VALID_PARTS (
 			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
@@ -8262,6 +8306,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
 			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
 		),
 	),
+	SETTING_INFO (WIREGUARD,
+		.valid_parts = NM_META_SETTING_VALID_PARTS (
+			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+			NM_META_SETTING_VALID_PART_ITEM (WIREGUARD,             TRUE),
+		),
+	),
 	SETTING_INFO (WIRELESS,
 		.alias =                            "wifi",
 		.valid_parts = NM_META_SETTING_VALID_PARTS (
diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
index 7129870a..e3f9d230 100644
--- a/clients/common/nm-meta-setting-desc.h
+++ b/clients/common/nm-meta-setting-desc.h
@@ -269,6 +269,9 @@ struct _NMMetaPropertyTypData {
 			const char *(*validate_fcn) (const char *value, char **out_to_free, GError **error);
 		} gobject_string;
 		struct {
+			bool legacy_format:1;
+		} gobject_bytes;
+		struct {
 			guint32 (*get_fcn) (NMSetting *setting);
 		} mtu;
 		struct {
diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
index dccf1d38..7367459d 100644
--- a/clients/common/nm-polkit-listener.c
+++ b/clients/common/nm-polkit-listener.c
@@ -35,7 +35,6 @@
 
 #include "nm-polkit-listener.h"
 
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index 9fcf4200..cd3ce2ee 100644
--- a/clients/common/nm-secret-agent-simple.c
+++ b/clients/common/nm-secret-agent-simple.c
@@ -31,124 +31,98 @@
 
 #include "nm-default.h"
 
+#include "nm-secret-agent-simple.h"
+
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixinputstream.h>
-#include <string.h>
 
 #include "nm-vpn-service-plugin.h"
-
 #include "nm-vpn-helpers.h"
-#include "nm-secret-agent-simple.h"
-
-G_DEFINE_TYPE (NMSecretAgentSimple, nm_secret_agent_simple, NM_TYPE_SECRET_AGENT_OLD)
-
-#define NM_SECRET_AGENT_SIMPLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimplePrivate))
+#include "nm-utils/nm-secret-utils.h"
 
-enum {
-	REQUEST_SECRETS,
-
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
+/*****************************************************************************/
 
 typedef struct {
+	char                          *request_id;
+
 	NMSecretAgentSimple           *self;
 
-	char                          *request_id;
 	NMConnection                  *connection;
+	const char                    *setting_name;
 	char                         **hints;
 	NMSecretAgentOldGetSecretsFunc callback;
 	gpointer                       callback_data;
 	GCancellable                  *cancellable;
 	NMSecretAgentGetSecretsFlags   flags;
-} NMSecretAgentSimpleRequest;
+} RequestData;
+
+enum {
+	REQUEST_SECRETS,
+
+	LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
 
 typedef struct {
-	/* <char *request_id, NMSecretAgentSimpleRequest *request> */
 	GHashTable *requests;
 
 	char *path;
 	gboolean enabled;
 } NMSecretAgentSimplePrivate;
 
-static void
-nm_secret_agent_simple_request_free (gpointer data)
-{
-	NMSecretAgentSimpleRequest *request = data;
+struct _NMSecretAgentSimple {
+	NMSecretAgentOld parent;
+	NMSecretAgentSimplePrivate _priv;
+};
 
-	g_clear_object (&request->cancellable);
-	g_object_unref (request->self);
-	g_object_unref (request->connection);
-	g_strfreev (request->hints);
+struct _NMSecretAgentSimpleClass {
+	NMSecretAgentOldClass parent;
+};
 
-	g_slice_free (NMSecretAgentSimpleRequest, request);
-}
+G_DEFINE_TYPE (NMSecretAgentSimple, nm_secret_agent_simple, NM_TYPE_SECRET_AGENT_OLD)
 
-static void
-nm_secret_agent_simple_request_cancel (NMSecretAgentSimpleRequest *request,
-                                       GError *error)
-{
-	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (request->self);
+#define NM_SECRET_AGENT_SIMPLE_GET_PRIVATE(self)  _NM_GET_PRIVATE (self, NMSecretAgentSimple, NM_IS_SECRET_AGENT_SIMPLE, NMSecretAgentOld)
 
-	request->callback (NM_SECRET_AGENT_OLD (request->self), request->connection,
-	                   NULL, error, request->callback_data);
-	g_hash_table_remove (priv->requests, request->request_id);
-}
+/*****************************************************************************/
 
 static void
-nm_secret_agent_simple_init (NMSecretAgentSimple *agent)
+_request_data_free (gpointer data)
 {
-	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (agent);
+	RequestData *request = data;
 
-	priv->requests = g_hash_table_new_full (nm_str_hash, g_str_equal,
-	                                        g_free, nm_secret_agent_simple_request_free);
+	g_free (request->request_id);
+	nm_clear_g_cancellable (&request->cancellable);
+	g_object_unref (request->connection);
+	g_strfreev (request->hints);
+
+	g_slice_free (RequestData, request);
 }
 
 static void
-nm_secret_agent_simple_finalize (GObject *object)
+_request_data_complete (RequestData *request,
+                        GVariant *secrets,
+                        GError *error,
+                        GHashTableIter *iter_to_remove)
 {
-	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (object);
-	GError *error;
-	GHashTableIter iter;
-	gpointer key;
-	gpointer value;
-
-	error = g_error_new (NM_SECRET_AGENT_ERROR,
-	                     NM_SECRET_AGENT_ERROR_AGENT_CANCELED,
-	                     "The secret agent is going away");
-
-	g_hash_table_iter_init (&iter, priv->requests);
-	while (g_hash_table_iter_next (&iter, &key, &value)) {
-		NMSecretAgentSimpleRequest *request = value;
-
-		request->callback (NM_SECRET_AGENT_OLD (object),
-		                   request->connection,
-		                   NULL, error,
-		                   request->callback_data);
-	}
+	NMSecretAgentSimple *self = request->self;
+	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (self);
 
-	g_hash_table_destroy (priv->requests);
-	g_error_free (error);
+	nm_assert ((secrets != NULL) != (error != NULL));
 
-	g_free (priv->path);
+	request->callback (NM_SECRET_AGENT_OLD (request->self),
+	                   request->connection,
+	                   secrets,
+	                   error,
+	                   request->callback_data);
 
-	G_OBJECT_CLASS (nm_secret_agent_simple_parent_class)->finalize (object);
+	if (iter_to_remove)
+		g_hash_table_iter_remove (iter_to_remove);
+	else
+		g_hash_table_remove (priv->requests, request);
 }
 
-static gboolean
-strv_has (char **haystack,
-          char   *needle)
-{
-	char **iter;
-
-	for (iter = haystack; iter && *iter; iter++) {
-		if (g_strcmp0 (*iter, needle) == 0)
-			return TRUE;
-	}
-
-	return FALSE;
-}
+/*****************************************************************************/
 
 /**
  * NMSecretAgentSimpleSecret:
@@ -164,70 +138,113 @@ typedef struct {
 	NMSecretAgentSimpleSecret base;
 	NMSetting *setting;
 	char *property;
-} NMSecretAgentSimpleSecretReal;
+} SecretReal;
 
 static void
-nm_secret_agent_simple_secret_free (NMSecretAgentSimpleSecret *secret)
+_secret_real_free (NMSecretAgentSimpleSecret *secret)
 {
-	NMSecretAgentSimpleSecretReal *real = (NMSecretAgentSimpleSecretReal *)secret;
+	SecretReal *real = (SecretReal *)secret;
 
 	g_free ((char *) secret->pretty_name);
 	g_free ((char *) secret->entry_id);
-	g_free (secret->value);
+	nm_free_secret (secret->value);
 	g_free ((char *) secret->vpn_type);
 	g_free (real->property);
 	g_clear_object (&real->setting);
 
-	g_slice_free (NMSecretAgentSimpleSecretReal, real);
+	g_slice_free (SecretReal, real);
 }
 
 static NMSecretAgentSimpleSecret *
-nm_secret_agent_simple_secret_new (NMSecretAgentSecretType secret_type,
-                                   const char *pretty_name,
-                                   NMSetting  *setting,
-                                   const char *property,
-                                   const char *vpn_type)
+_secret_real_new_plain (NMSecretAgentSecretType secret_type,
+                       const char *pretty_name,
+                       NMSetting  *setting,
+                       const char *property)
 {
-	NMSecretAgentSimpleSecretReal *real;
-	const char *vpn_prefix;
-	const char *value;
+	SecretReal *real;
+	gs_free char *value= NULL;
 
 	nm_assert (property);
 	nm_assert (NM_IS_SETTING (setting));
+	nm_assert (NM_IN_SET (secret_type, NM_SECRET_AGENT_SECRET_TYPE_PROPERTY, NM_SECRET_AGENT_SECRET_TYPE_SECRET));
+	nm_assert (g_object_class_find_property (G_OBJECT_GET_CLASS (setting), property));
+	nm_assert ((secret_type == NM_SECRET_AGENT_SECRET_TYPE_SECRET) == nm_setting_get_secret_flags (setting, property, NULL, NULL));
+
+	g_object_get (setting, property, &value, NULL);
+
+	real = g_slice_new (SecretReal);
+	*real = (SecretReal) {
+		.base.secret_type = secret_type,
+		.base.pretty_name = g_strdup (pretty_name),
+		.base.entry_id    = g_strdup_printf ("%s.%s", nm_setting_get_name (setting), property),
+		.base.value       = g_steal_pointer (&value),
+		.base.is_secret   = (secret_type != NM_SECRET_AGENT_SECRET_TYPE_PROPERTY),
+		.setting          = g_object_ref (setting),
+		.property         = g_strdup (property),
+	};
+	return &real->base;
+}
 
-	real = g_slice_new0 (NMSecretAgentSimpleSecretReal);
-	*((NMSecretAgentSecretType *) &real->base.secret_type) = secret_type;
-	real->setting = g_object_ref (setting);
-	real->base.pretty_name = g_strdup (pretty_name);
-	real->property = g_strdup (property);
-	switch (secret_type) {
-	case NM_SECRET_AGENT_SECRET_TYPE_PROPERTY:
-	case NM_SECRET_AGENT_SECRET_TYPE_SECRET:
-		nm_assert (!vpn_type);
-		nm_assert (g_object_class_find_property (G_OBJECT_GET_CLASS (setting), property));
-		nm_assert ((secret_type == NM_SECRET_AGENT_SECRET_TYPE_SECRET) == nm_setting_get_secret_flags (setting, property, NULL, NULL));
-		real->base.entry_id = g_strdup_printf ("%s.%s", nm_setting_get_name (setting), property);
-		g_object_get (setting, property, &real->base.value, NULL);
-		real->base.is_secret = (secret_type != NM_SECRET_AGENT_SECRET_TYPE_PROPERTY);
-		break;
-	case NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET:
-		vpn_prefix = NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS;
-		value = nm_setting_vpn_get_secret (NM_SETTING_VPN (setting), property);
-		real->base.entry_id = g_strdup_printf ("%s%s", vpn_prefix, property);
-		nm_assert (vpn_type);
-		real->base.vpn_type = g_strdup (vpn_type);
-		real->base.value = g_strdup (value);
-		real->base.is_secret = TRUE;
-		break;
-	}
-	nm_assert (real->base.entry_id);
+static NMSecretAgentSimpleSecret *
+_secret_real_new_vpn_secret (const char *pretty_name,
+                             NMSetting  *setting,
+                             const char *property,
+                             const char *vpn_type)
+{
+	SecretReal *real;
+	const char *value;
 
+	nm_assert (property);
+	nm_assert (NM_IS_SETTING_VPN (setting));
+	nm_assert (vpn_type);
+
+	value = nm_setting_vpn_get_secret (NM_SETTING_VPN (setting), property);
+
+	real = g_slice_new (SecretReal);
+	*real = (SecretReal) {
+		.base.secret_type = NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET,
+		.base.pretty_name = g_strdup (pretty_name),
+		.base.entry_id    = g_strdup_printf ("%s%s", NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS, property),
+		.base.value       = g_strdup (value),
+		.base.is_secret   = TRUE,
+		.base.vpn_type    = g_strdup (vpn_type),
+		.setting          = g_object_ref (setting),
+		.property         = g_strdup (property),
+	};
 	return &real->base;
 }
 
+static NMSecretAgentSimpleSecret *
+_secret_real_new_wireguard_peer_psk (NMSettingWireGuard *s_wg,
+                                     const char *public_key,
+                                     const char *preshared_key)
+{
+	SecretReal *real;
+
+	nm_assert (NM_IS_SETTING_WIREGUARD (s_wg));
+	nm_assert (public_key);
+
+	real = g_slice_new (SecretReal);
+	*real = (SecretReal) {
+		.base.secret_type        = NM_SECRET_AGENT_SECRET_TYPE_WIREGUARD_PEER_PSK,
+		.base.pretty_name        = g_strdup_printf (_("Preshared-key for %s"),
+		                                            public_key),
+		.base.entry_id           = g_strdup_printf (NM_SETTING_WIREGUARD_SETTING_NAME"."NM_SETTING_WIREGUARD_PEERS".%s."NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY,
+		                                            public_key),
+		.base.value              = g_strdup (preshared_key),
+		.base.is_secret          = TRUE,
+		.base.no_prompt_entry_id = TRUE,
+		.setting                 = NM_SETTING (g_object_ref (s_wg)),
+		.property                = g_strdup (public_key),
+	};
+	return &real->base;
+}
+
+/*****************************************************************************/
+
 static gboolean
-add_8021x_secrets (NMSecretAgentSimpleRequest *request,
-                   GPtrArray                  *secrets)
+add_8021x_secrets (RequestData *request,
+                   GPtrArray *secrets)
 {
 	NMSetting8021x *s_8021x = nm_connection_get_setting_802_1x (request->connection);
 	const char *eap_method;
@@ -238,11 +255,10 @@ add_8021x_secrets (NMSecretAgentSimpleRequest *request,
 		char **iter;
 
 		for (iter = request->hints; *iter; iter++) {
-			secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-			                                            _(*iter),
-			                                            NM_SETTING (s_8021x),
-			                                            *iter,
-			                                            NULL);
+			secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+			                                 _(*iter),
+			                                 NM_SETTING (s_8021x),
+			                                 *iter);
 			g_ptr_array_add (secrets, secret);
 		}
 
@@ -253,41 +269,37 @@ add_8021x_secrets (NMSecretAgentSimpleRequest *request,
 	if (!eap_method)
 		return FALSE;
 
-	if (   !strcmp (eap_method, "md5")
-	    || !strcmp (eap_method, "leap")
-	    || !strcmp (eap_method, "ttls")
-	    || !strcmp (eap_method, "peap")) {
+	if (NM_IN_STRSET (eap_method, "md5",
+	                              "leap",
+	                              "ttls",
+	                              "peap")) {
 		/* TTLS and PEAP are actually much more complicated, but this complication
 		 * is not visible here since we only care about phase2 authentication
 		 * (and don't even care of which one)
 		 */
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
-		                                            _("Username"),
-		                                            NM_SETTING (s_8021x),
-		                                            NM_SETTING_802_1X_IDENTITY,
-		                                            NULL);
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
+		                                 _("Username"),
+		                                 NM_SETTING (s_8021x),
+		                                 NM_SETTING_802_1X_IDENTITY);
 		g_ptr_array_add (secrets, secret);
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-		                                            _("Password"),
-		                                            NM_SETTING (s_8021x),
-		                                            NM_SETTING_802_1X_PASSWORD,
-		                                            NULL);
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("Password"),
+		                                 NM_SETTING (s_8021x),
+		                                 NM_SETTING_802_1X_PASSWORD);
 		g_ptr_array_add (secrets, secret);
 		return TRUE;
 	}
 
-	if (!strcmp (eap_method, "tls")) {
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
-		                                            _("Identity"),
-		                                            NM_SETTING (s_8021x),
-		                                            NM_SETTING_802_1X_IDENTITY,
-		                                            NULL);
+	if (nm_streq (eap_method, "tls")) {
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
+		                                 _("Identity"),
+		                                 NM_SETTING (s_8021x),
+		                                 NM_SETTING_802_1X_IDENTITY);
 		g_ptr_array_add (secrets, secret);
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-		                                            _("Private key password"),
-		                                            NM_SETTING (s_8021x),
-		                                            NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD,
-		                                            NULL);
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("Private key password"),
+		                                 NM_SETTING (s_8021x),
+		                                 NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD);
 		g_ptr_array_add (secrets, secret);
 		return TRUE;
 	}
@@ -296,7 +308,7 @@ add_8021x_secrets (NMSecretAgentSimpleRequest *request,
 }
 
 static gboolean
-add_wireless_secrets (NMSecretAgentSimpleRequest *request,
+add_wireless_secrets (RequestData *request,
                       GPtrArray                  *secrets)
 {
 	NMSettingWirelessSecurity *s_wsec = nm_connection_get_setting_wireless_security (request->connection);
@@ -306,76 +318,67 @@ add_wireless_secrets (NMSecretAgentSimpleRequest *request,
 	if (!key_mgmt)
 		return FALSE;
 
-	if (!strcmp (key_mgmt, "wpa-none") || !strcmp (key_mgmt, "wpa-psk")) {
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-		                                            _("Password"),
-		                                            NM_SETTING (s_wsec),
-		                                            NM_SETTING_WIRELESS_SECURITY_PSK,
-		                                            NULL);
+	if (NM_IN_STRSET (key_mgmt, "wpa-none", "wpa-psk", "sae")) {
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("Password"),
+		                                 NM_SETTING (s_wsec),
+		                                 NM_SETTING_WIRELESS_SECURITY_PSK);
 		g_ptr_array_add (secrets, secret);
 		return TRUE;
 	}
 
-	if (!strcmp (key_mgmt, "none")) {
-		int index;
-		char *key;
+	if (nm_streq (key_mgmt, "none")) {
+		guint32 index;
+		char key[100];
 
 		index = nm_setting_wireless_security_get_wep_tx_keyidx (s_wsec);
-		key = g_strdup_printf ("wep-key%d", index);
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-		                                            _("Key"),
-		                                            NM_SETTING (s_wsec),
-		                                            key,
-		                                            NULL);
-		g_free (key);
-
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("Key"),
+		                                 NM_SETTING (s_wsec),
+		                                 nm_sprintf_buf (key, "wep-key%u", (guint) index));
 		g_ptr_array_add (secrets, secret);
 		return TRUE;
 	}
 
-	if (!strcmp (key_mgmt, "iee8021x")) {
-		if (!g_strcmp0 (nm_setting_wireless_security_get_auth_alg (s_wsec), "leap")) {
-			secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-			                                            _("Password"),
-			                                            NM_SETTING (s_wsec),
-			                                            NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD,
-			                                            NULL);
+	if (nm_streq (key_mgmt, "iee8021x")) {
+		if (nm_streq0 (nm_setting_wireless_security_get_auth_alg (s_wsec), "leap")) {
+			secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+			                                 _("Password"),
+			                                 NM_SETTING (s_wsec),
+			                                 NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD);
 			g_ptr_array_add (secrets, secret);
 			return TRUE;
 		} else
 			return add_8021x_secrets (request, secrets);
 	}
 
-	if (!strcmp (key_mgmt, "wpa-eap"))
+	if (nm_streq (key_mgmt, "wpa-eap"))
 		return add_8021x_secrets (request, secrets);
 
 	return FALSE;
 }
 
 static gboolean
-add_pppoe_secrets (NMSecretAgentSimpleRequest *request,
+add_pppoe_secrets (RequestData *request,
                    GPtrArray                  *secrets)
 {
 	NMSettingPppoe *s_pppoe = nm_connection_get_setting_pppoe (request->connection);
 	NMSecretAgentSimpleSecret *secret;
 
-	secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
-	                                            _("Username"),
-	                                            NM_SETTING (s_pppoe),
-	                                            NM_SETTING_PPPOE_USERNAME,
-	                                            NULL);
+	secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
+	                                 _("Username"),
+	                                 NM_SETTING (s_pppoe),
+	                                 NM_SETTING_PPPOE_USERNAME);
 	g_ptr_array_add (secrets, secret);
-	secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
-	                                            _("Service"),
-	                                            NM_SETTING (s_pppoe),
-	                                            NM_SETTING_PPPOE_SERVICE,
-	                                            NULL);
+	secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
+	                                 _("Service"),
+	                                 NM_SETTING (s_pppoe),
+	                                 NM_SETTING_PPPOE_SERVICE);
 	g_ptr_array_add (secrets, secret);
-	secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-	                                            _("Password"),
-	                                            NM_SETTING (s_pppoe),
-	                                            NM_SETTING_PPPOE_PASSWORD,
-	                                            NULL);
+	secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+	                                 _("Password"),
+	                                 NM_SETTING (s_pppoe),
+	                                 NM_SETTING_PPPOE_PASSWORD);
 	g_ptr_array_add (secrets, secret);
 	return TRUE;
 }
@@ -403,11 +406,10 @@ add_vpn_secret_helper (GPtrArray *secrets, NMSettingVpn *s_vpn, const char *name
 	flags = get_vpn_secret_flags (s_vpn, name);
 	if (   flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED
 	    || flags & NM_SETTING_SECRET_FLAG_NOT_SAVED) {
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET,
-		                                            ui_name,
-		                                            NM_SETTING (s_vpn),
-		                                            name,
-		                                            nm_setting_vpn_get_service_type (s_vpn));
+		secret = _secret_real_new_vpn_secret (ui_name,
+		                                      NM_SETTING (s_vpn),
+		                                      name,
+		                                      nm_setting_vpn_get_service_type (s_vpn));
 
 		/* Check for duplicates */
 		for (i = 0; i < secrets->len; i++) {
@@ -416,7 +418,7 @@ add_vpn_secret_helper (GPtrArray *secrets, NMSettingVpn *s_vpn, const char *name
 			if (   s->secret_type == secret->secret_type
 			    && nm_streq0 (s->vpn_type, secret->vpn_type)
 			    && nm_streq0 (s->entry_id, secret->entry_id)) {
-				nm_secret_agent_simple_secret_free (secret);
+				_secret_real_free (secret);
 				return;
 			}
 		}
@@ -428,9 +430,9 @@ add_vpn_secret_helper (GPtrArray *secrets, NMSettingVpn *s_vpn, const char *name
 #define VPN_MSG_TAG "x-vpn-message:"
 
 static gboolean
-add_vpn_secrets (NMSecretAgentSimpleRequest *request,
-                 GPtrArray                  *secrets,
-                 char                       **msg)
+add_vpn_secrets (RequestData *request,
+                 GPtrArray *secrets,
+                 char **msg)
 {
 	NMSettingVpn *s_vpn = nm_connection_get_setting_vpn (request->connection);
 	const VpnPasswordName *secret_names, *p;
@@ -459,22 +461,98 @@ add_vpn_secrets (NMSecretAgentSimpleRequest *request,
 	return TRUE;
 }
 
+static gboolean
+add_wireguard_secrets (RequestData *request,
+                       GPtrArray *secrets,
+                       char **msg,
+                       GError **error)
+{
+	NMSettingWireGuard *s_wg;
+	NMSecretAgentSimpleSecret *secret;
+	guint i;
+
+	s_wg = NM_SETTING_WIREGUARD (nm_connection_get_setting (request->connection, NM_TYPE_SETTING_WIREGUARD));
+	if (!s_wg) {
+		g_set_error (error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
+		             "Cannot service a WireGuard secrets request %s for a connection without WireGuard settings",
+		             request->request_id);
+		return FALSE;
+	}
+
+	if (   !request->hints
+	    || !request->hints[0]
+	    || g_strv_contains (NM_CAST_STRV_CC (request->hints), NM_SETTING_WIREGUARD_PRIVATE_KEY)) {
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("WireGuard private-key"),
+		                                 NM_SETTING (s_wg),
+		                                 NM_SETTING_WIREGUARD_PRIVATE_KEY);
+		g_ptr_array_add (secrets, secret);
+	}
+
+	if (request->hints) {
+
+		for (i = 0; request->hints[i]; i++) {
+			NMWireGuardPeer *peer;
+			const char *name = request->hints[i];
+			gs_free char *public_key = NULL;
+
+			if (nm_streq (name, NM_SETTING_WIREGUARD_PRIVATE_KEY))
+				continue;
+
+			if (NM_STR_HAS_PREFIX (name, NM_SETTING_WIREGUARD_PEERS".")) {
+				const char *tmp;
+
+				tmp = &name[NM_STRLEN (NM_SETTING_WIREGUARD_PEERS".")];
+				if (NM_STR_HAS_SUFFIX (tmp, "."NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY)) {
+					public_key = g_strndup (tmp,
+					                       strlen (tmp) - NM_STRLEN ("."NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY));
+				}
+			}
+
+			if (!public_key)
+				continue;
+
+			peer = nm_setting_wireguard_get_peer_by_public_key (s_wg, public_key, NULL);
+
+			g_ptr_array_add (secrets, _secret_real_new_wireguard_peer_psk (s_wg,
+			                                                               (  peer
+			                                                                ? nm_wireguard_peer_get_public_key (peer)
+			                                                                : public_key),
+			                                                               (  peer
+			                                                                ? nm_wireguard_peer_get_preshared_key (peer)
+			                                                                : NULL)));
+		}
+	}
+
+	*msg = g_strdup_printf (_("Secrets are required to connect WireGuard VPN '%s'"),
+	                        nm_connection_get_id (request->connection));
+	return TRUE;
+}
+
 typedef struct {
 	GPid auth_dialog_pid;
-	char read_buf[5];
 	GString *auth_dialog_response;
-	NMSecretAgentSimpleRequest *request;
+	RequestData *request;
 	GPtrArray *secrets;
-	guint child_watch_id;
+	GCancellable *cancellable;
 	gulong cancellable_id;
+	guint child_watch_id;
+	GInputStream *input_stream;
+	GOutputStream *output_stream;
+	char read_buf[5];
 } AuthDialogData;
 
 static void
 _auth_dialog_data_free (AuthDialogData *data)
 {
+	nm_clear_g_signal_handler (data->cancellable, &data->cancellable_id);
+	g_clear_object (&data->cancellable);
+	nm_clear_g_source (&data->child_watch_id);
 	g_ptr_array_unref (data->secrets);
 	g_spawn_close_pid (data->auth_dialog_pid);
 	g_string_free (data->auth_dialog_response, TRUE);
+	g_object_unref (data->input_stream);
+	g_object_unref (data->output_stream);
 	g_slice_free (AuthDialogData, data);
 }
 
@@ -482,17 +560,19 @@ static void
 _auth_dialog_exited (GPid pid, int status, gpointer user_data)
 {
 	AuthDialogData *data = user_data;
-	NMSecretAgentSimpleRequest *request = data->request;
+	RequestData *request = data->request;
 	GPtrArray *secrets = data->secrets;
 	NMSettingVpn *s_vpn = nm_connection_get_setting_vpn (request->connection);
-	GKeyFile *keyfile = NULL;
+	gs_unref_keyfile GKeyFile *keyfile = NULL;
 	gs_strfreev char **groups = NULL;
 	gs_free char *title = NULL;
 	gs_free char *message = NULL;
 	int i;
 	gs_free_error GError *error = NULL;
 
-	g_cancellable_disconnect (request->cancellable, data->cancellable_id);
+	data->child_watch_id = 0;
+
+	nm_clear_g_cancellable_disconnect (data->cancellable, &data->cancellable_id);
 
 	if (status != 0) {
 		g_set_error (&error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
@@ -509,7 +589,7 @@ _auth_dialog_exited (GPid pid, int status, gpointer user_data)
 	}
 
 	groups = g_key_file_get_groups (keyfile, NULL);
-	if (g_strcmp0 (groups[0], "VPN Plugin UI") != 0) {
+	if (!nm_streq0 (groups[0], "VPN Plugin UI")) {
 		g_set_error (&error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
 		             "Expected [VPN Plugin UI] in auth dialog response");
 		goto out;
@@ -524,18 +604,18 @@ _auth_dialog_exited (GPid pid, int status, gpointer user_data)
 		goto out;
 
 	for (i = 1; groups[i]; i++) {
+		gs_free char *pretty_name = NULL;
+
 		if (!g_key_file_get_boolean (keyfile, groups[i], "IsSecret", NULL))
 			continue;
 		if (!g_key_file_get_boolean (keyfile, groups[i], "ShouldAsk", NULL))
 			continue;
 
-		g_ptr_array_add (secrets,
-			nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET,
-		                                           g_key_file_get_string (keyfile, groups[i], "Label", NULL),
-		                                           NM_SETTING (s_vpn),
-		                                           groups[i],
-		                                           nm_setting_vpn_get_service_type (s_vpn)));
-
+		pretty_name = g_key_file_get_string (keyfile, groups[i], "Label", NULL);
+		g_ptr_array_add (secrets, _secret_real_new_vpn_secret (pretty_name,
+		                                                       NM_SETTING (s_vpn),
+		                                                       groups[i],
+		                                                       nm_setting_vpn_get_service_type (s_vpn)));
 	}
 
 out:
@@ -550,24 +630,20 @@ out:
 		}
 	}
 
-	if (error) {
-		nm_secret_agent_simple_request_cancel (request, error);
-	} else {
+	if (error)
+		_request_data_complete (request, NULL, error, NULL);
+	else {
 		g_signal_emit (request->self, signals[REQUEST_SECRETS], 0,
 		               request->request_id, title, message, secrets);
 	}
 
-	g_clear_pointer (&keyfile, g_key_file_unref);
 	_auth_dialog_data_free (data);
 }
 
 static void
 _request_cancelled (GObject *object, gpointer user_data)
 {
-	AuthDialogData *data = user_data;
-
-	g_source_remove (data->child_watch_id);
-	_auth_dialog_data_free (data);
+	_auth_dialog_data_free (user_data);
 }
 
 static void
@@ -584,14 +660,15 @@ _auth_dialog_read_done (GObject *source_object,
 	switch (read_size) {
 	case -1:
 		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-			nm_secret_agent_simple_request_cancel (data->request, error);
+			_request_data_complete (data->request, NULL, error, NULL);
 		_auth_dialog_data_free (data);
 		break;
 	case 0:
 		/* Done reading. Let's wait for the auth dialog to exit so that we're able to collect the status.
 		 * Remember we can be cancelled in between. */
 		data->child_watch_id = g_child_watch_add (data->auth_dialog_pid, _auth_dialog_exited, data);
-		data->cancellable_id = g_cancellable_connect (data->request->cancellable,
+		data->cancellable = g_object_ref (data->request->cancellable);
+		data->cancellable_id = g_cancellable_connect (data->cancellable,
 		                                              G_CALLBACK (_request_cancelled), data, NULL);
 		break;
 	default:
@@ -615,12 +692,11 @@ _auth_dialog_write_done (GObject *source_object,
                         gpointer user_data)
 {
 	GOutputStream *auth_dialog_out = G_OUTPUT_STREAM (source_object);
-	GString *auth_dialog_request = user_data;
+	_nm_unused gs_free char *auth_dialog_request_free = user_data;
 
 	/* We don't care about write errors. If there are any problems, the
 	 * reader shall notice. */
 	g_output_stream_write_finish (auth_dialog_out, res, NULL);
-	g_string_free (auth_dialog_request, TRUE);
 	g_output_stream_close (auth_dialog_out, NULL, NULL);
 }
 
@@ -661,7 +737,7 @@ _add_secret_to_string (const char *key, const char *value, gpointer user_data)
 }
 
 static gboolean
-try_spawn_vpn_auth_helper (NMSecretAgentSimpleRequest *request,
+try_spawn_vpn_auth_helper (RequestData *request,
                            GPtrArray *secrets)
 {
 	NMSettingVpn *s_vpn = nm_connection_get_setting_vpn (request->connection);
@@ -683,6 +759,8 @@ try_spawn_vpn_auth_helper (NMSecretAgentSimpleRequest *request,
 	GInputStream *auth_dialog_out;
 	GError *error = NULL;
 	GString *auth_dialog_request;
+	char *auth_dialog_request_str;
+	gsize auth_dialog_request_len;
 	AuthDialogData *data;
 
 	plugin_info = nm_vpn_plugin_info_list_find_by_service (nm_vpn_get_plugin_infos (),
@@ -720,20 +798,26 @@ try_spawn_vpn_auth_helper (NMSecretAgentSimpleRequest *request,
 	nm_setting_vpn_foreach_data_item (s_vpn, _add_data_item_to_string, auth_dialog_request);
 	nm_setting_vpn_foreach_secret (s_vpn, _add_secret_to_string, auth_dialog_request);
 	g_string_append (auth_dialog_request, "DONE\nQUIT\n");
-
-	data = g_slice_alloc0 (sizeof (AuthDialogData));
-	data->auth_dialog_response = g_string_new_len (NULL, sizeof (data->read_buf));
-	data->auth_dialog_pid = auth_dialog_pid;
-	data->request = request;
-	data->secrets = secrets;
+	auth_dialog_request_len = auth_dialog_request->len;
+	auth_dialog_request_str = g_string_free (auth_dialog_request, FALSE);
+
+	data = g_slice_new (AuthDialogData);
+	*data = (AuthDialogData) {
+		.auth_dialog_response = g_string_new_len (NULL, sizeof (data->read_buf)),
+		.auth_dialog_pid = auth_dialog_pid,
+		.request = request,
+		.secrets = g_ptr_array_ref (secrets),
+		.input_stream = auth_dialog_out,
+		.output_stream = auth_dialog_in,
+	};
 
 	g_output_stream_write_async (auth_dialog_in,
-	                             auth_dialog_request->str,
-	                             auth_dialog_request->len,
+	                             auth_dialog_request_str,
+	                             auth_dialog_request_len,
 	                             G_PRIORITY_DEFAULT,
 	                             request->cancellable,
 	                             _auth_dialog_write_done,
-	                             auth_dialog_request);
+	                             auth_dialog_request_str);
 
 	g_input_stream_read_async (auth_dialog_out,
 	                           data->read_buf,
@@ -747,30 +831,27 @@ try_spawn_vpn_auth_helper (NMSecretAgentSimpleRequest *request,
 }
 
 static void
-request_secrets_from_ui (NMSecretAgentSimpleRequest *request)
+request_secrets_from_ui (RequestData *request)
 {
-	GPtrArray *secrets;
+	gs_unref_ptrarray GPtrArray *secrets = NULL;
+	gs_free_error GError *error = NULL;
 	NMSecretAgentSimplePrivate *priv;
 	NMSecretAgentSimpleSecret *secret;
 	const char *title;
-	char *msg;
-	gboolean ok = TRUE;
+	gs_free char *msg = NULL;
 
 	priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (request->self);
 	g_return_if_fail (priv->enabled);
 
 	/* We only handle requests for connection with @path if set. */
 	if (priv->path && !g_str_has_prefix (request->request_id, priv->path)) {
-		gs_free_error GError *error = NULL;
-
-		error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
-		                     "Request for %s secrets doesn't match path %s",
-		                     request->request_id, priv->path);
-		nm_secret_agent_simple_request_cancel (request, error);
-		return;
+		g_set_error (&error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
+		             "Request for %s secrets doesn't match path %s",
+		             request->request_id, priv->path);
+		goto out_fail_error;
 	}
 
-	secrets = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_secret_agent_simple_secret_free);
+	secrets = g_ptr_array_new_with_free_func ((GDestroyNotify) _secret_real_free);
 
 	if (nm_connection_is_type (request->connection, NM_SETTING_WIRELESS_SETTING_NAME)) {
 		NMSettingWireless *s_wireless;
@@ -785,42 +866,43 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request)
 		title = _("Authentication required by wireless network");
 		msg = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."), ssid_utf8);
 
-		ok = add_wireless_secrets (request, secrets);
+		if (!add_wireless_secrets (request, secrets))
+			goto out_fail;
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_WIRED_SETTING_NAME)) {
 		title = _("Wired 802.1X authentication");
 		msg = g_strdup_printf (_("Secrets are required to access the wired network '%s'"),
 		                       nm_connection_get_id (request->connection));
 
-		ok = add_8021x_secrets (request, secrets);
+		if (!add_8021x_secrets (request, secrets))
+			goto out_fail;
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_PPPOE_SETTING_NAME)) {
 		title = _("DSL authentication");
 		msg = g_strdup_printf (_("Secrets are required for the DSL connection '%s'"),
 		                       nm_connection_get_id (request->connection));
 
-		ok = add_pppoe_secrets (request, secrets);
+		if (!add_pppoe_secrets (request, secrets))
+			goto out_fail;
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_GSM_SETTING_NAME)) {
 		NMSettingGsm *s_gsm = nm_connection_get_setting_gsm (request->connection);
 
-		if (strv_has (request->hints, "pin")) {
+		if (g_strv_contains (NM_CAST_STRV_CC (request->hints), NM_SETTING_GSM_PIN)) {
 			title = _("PIN code required");
 			msg = g_strdup (_("PIN code is needed for the mobile broadband device"));
 
-			secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
-			                                            _("PIN"),
-			                                            NM_SETTING (s_gsm),
-			                                            NM_SETTING_GSM_PIN,
-			                                            NULL);
+			secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
+			                                 _("PIN"),
+			                                 NM_SETTING (s_gsm),
+			                                 NM_SETTING_GSM_PIN);
 			g_ptr_array_add (secrets, secret);
 		} else {
 			title = _("Mobile broadband network password");
 			msg = g_strdup_printf (_("A password is required to connect to '%s'."),
 			                       nm_connection_get_id (request->connection));
 
-			secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-			                                            _("Password"),
-			                                            NM_SETTING (s_gsm),
-			                                            NM_SETTING_GSM_PASSWORD,
-			                                            NULL);
+			secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+			                                 _("Password"),
+			                                 NM_SETTING (s_gsm),
+			                                 NM_SETTING_GSM_PASSWORD);
 			g_ptr_array_add (secrets, secret);
 		}
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_MACSEC_SETTING_NAME)) {
@@ -831,16 +913,20 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request)
 
 		if (nm_setting_macsec_get_mode (s_macsec) == NM_SETTING_MACSEC_MODE_PSK) {
 			title = _("MACsec PSK authentication");
-			secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-			                                            _("MKA CAK"),
-			                                            NM_SETTING (s_macsec),
-			                                            NM_SETTING_MACSEC_MKA_CAK,
-			                                            NULL);
+			secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+			                                 _("MKA CAK"),
+			                                 NM_SETTING (s_macsec),
+			                                 NM_SETTING_MACSEC_MKA_CAK);
 			g_ptr_array_add (secrets, secret);
 		} else {
 			title = _("MACsec EAP authentication");
-			ok = add_8021x_secrets (request, secrets);
+			if (!add_8021x_secrets (request, secrets))
+				goto out_fail;
 		}
+	} else if (nm_connection_is_type (request->connection, NM_SETTING_WIREGUARD_SETTING_NAME)) {
+		title = _("WireGuard VPN secret");
+		if (!add_wireguard_secrets (request, secrets, &msg, &error))
+			goto out_fail_error;
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_CDMA_SETTING_NAME)) {
 		NMSettingCdma *s_cdma = nm_connection_get_setting_cdma (request->connection);
 
@@ -848,11 +934,10 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request)
 		msg = g_strdup_printf (_("A password is required to connect to '%s'."),
 		                       nm_connection_get_id (request->connection));
 
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-		                                            _("Password"),
-		                                            NM_SETTING (s_cdma),
-		                                            NM_SETTING_CDMA_PASSWORD,
-		                                            NULL);
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("Password"),
+		                                 NM_SETTING (s_cdma),
+		                                 NM_SETTING_CDMA_PASSWORD);
 		g_ptr_array_add (secrets, secret);
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_BLUETOOTH_SETTING_NAME)) {
 		NMSetting *setting = NULL;
@@ -865,76 +950,76 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request)
 				setting = nm_connection_get_setting_by_name (request->connection, NM_SETTING_CDMA_SETTING_NAME);
 		}
 
-		if (setting) {
-			title = _("Mobile broadband network password");
-			msg = g_strdup_printf (_("A password is required to connect to '%s'."),
-			                       nm_connection_get_id (request->connection));
+		if (!setting)
+			goto out_fail;
 
-			secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-			                                            _("Password"),
-			                                            setting,
-			                                            "password",
-			                                            NULL);
-			g_ptr_array_add (secrets, secret);
-		} else
-			ok = FALSE;
+		title = _("Mobile broadband network password");
+		msg = g_strdup_printf (_("A password is required to connect to '%s'."),
+		                       nm_connection_get_id (request->connection));
+
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("Password"),
+		                                 setting,
+		                                 "password");
+		g_ptr_array_add (secrets, secret);
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_VPN_SETTING_NAME)) {
 		title = _("VPN password required");
-		msg = NULL;
 
 		if (try_spawn_vpn_auth_helper (request, secrets)) {
 			/* This will emit REQUEST_SECRETS when ready */
 			return;
 		}
 
-		ok = add_vpn_secrets (request, secrets, &msg);
-		if (!msg)
+		if (!add_vpn_secrets (request, secrets, &msg))
+			goto out_fail;
+		if (!msg) {
 			msg = g_strdup_printf (_("A password is required to connect to '%s'."),
 			                       nm_connection_get_id (request->connection));
+		}
 	} else
-		ok = FALSE;
+		goto out_fail;
 
-	if (!ok) {
-		gs_free_error GError *error = NULL;
-
-		error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
-		                     "Cannot service a secrets request %s for a %s connection",
-		                     request->request_id,
-		                     nm_connection_get_connection_type (request->connection));
-		nm_secret_agent_simple_request_cancel (request, error);
-		g_ptr_array_unref (secrets);
-		return;
-	}
+	if (secrets->len == 0)
+		goto out_fail;
 
 	g_signal_emit (request->self, signals[REQUEST_SECRETS], 0,
 	               request->request_id, title, msg, secrets);
+	return;
+
+out_fail:
+	g_set_error (&error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
+	             "Cannot service a secrets request %s for a %s connection",
+	             request->request_id,
+	             nm_connection_get_connection_type (request->connection));
+out_fail_error:
+	_request_data_complete (request, NULL, error, NULL);
+
 }
 
 static void
-nm_secret_agent_simple_get_secrets (NMSecretAgentOld                 *agent,
-                                    NMConnection                     *connection,
-                                    const char                       *connection_path,
-                                    const char                       *setting_name,
-                                    const char                      **hints,
-                                    NMSecretAgentGetSecretsFlags      flags,
-                                    NMSecretAgentOldGetSecretsFunc    callback,
-                                    gpointer                          callback_data)
+get_secrets (NMSecretAgentOld                 *agent,
+             NMConnection                     *connection,
+             const char                       *connection_path,
+             const char                       *setting_name,
+             const char                      **hints,
+             NMSecretAgentGetSecretsFlags      flags,
+             NMSecretAgentOldGetSecretsFunc    callback,
+             gpointer                          callback_data)
 {
 	NMSecretAgentSimple *self = NM_SECRET_AGENT_SIMPLE (agent);
 	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (self);
-	NMSecretAgentSimpleRequest *request;
-	char *request_id;
-	GError *error;
+	RequestData *request;
+	gs_free_error GError *error = NULL;
+	gs_free char *request_id = NULL;
+	const char *request_id_setting_name;
 
 	request_id = g_strdup_printf ("%s/%s", connection_path, setting_name);
-	if (g_hash_table_lookup (priv->requests, request_id) != NULL) {
+
+	if (g_hash_table_contains (priv->requests, &request_id)) {
 		/* We already have a request pending for this (connection, setting) */
 		error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
 		                     "Request for %s secrets already pending", request_id);
-	nope:
 		callback (agent, connection, NULL, error, callback_data);
-		g_error_free (error);
-		g_free (request_id);
 		return;
 	}
 
@@ -942,19 +1027,27 @@ nm_secret_agent_simple_get_secrets (NMSecretAgentOld                 *agent,
 		/* We don't do stored passwords */
 		error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_NO_SECRETS,
 		                     "Stored passwords not supported");
-		goto nope;
+		callback (agent, connection, NULL, error, callback_data);
+		return;
 	}
 
-	request = g_slice_new (NMSecretAgentSimpleRequest);
-	request->self = g_object_ref (self);
-	request->connection = g_object_ref (connection);
-	request->hints = g_strdupv ((char **)hints);
-	request->callback = callback;
-	request->callback_data = callback_data;
-	request->request_id = request_id;
-	request->flags = flags;
-	request->cancellable = g_cancellable_new ();
-	g_hash_table_replace (priv->requests, request->request_id, request);
+	nm_assert (g_str_has_suffix (request_id, setting_name));
+	request_id_setting_name = &request_id[strlen (request_id) - strlen (setting_name)];
+	nm_assert (nm_streq (request_id_setting_name, setting_name));
+
+	request = g_slice_new (RequestData);
+	*request = (RequestData) {
+		.self = self,
+		.connection = g_object_ref (connection),
+		.setting_name = request_id_setting_name,
+		.hints = g_strdupv ((char **) hints),
+		.callback = callback,
+		.callback_data = callback_data,
+		.request_id = g_steal_pointer (&request_id),
+		.flags = flags,
+		.cancellable = g_cancellable_new (),
+	};
+	g_hash_table_add (priv->requests, request);
 
 	if (priv->enabled)
 		request_secrets_from_ui (request);
@@ -980,28 +1073,34 @@ nm_secret_agent_simple_response (NMSecretAgentSimple *self,
                                  GPtrArray           *secrets)
 {
 	NMSecretAgentSimplePrivate *priv;
-	NMSecretAgentSimpleRequest *request;
-	GVariant *dict = NULL;
-	GError *error = NULL;
+	RequestData *request;
+	gs_unref_variant GVariant *secrets_dict = NULL;
+	gs_free_error GError *error = NULL;
 	int i;
 
 	g_return_if_fail (NM_IS_SECRET_AGENT_SIMPLE (self));
 
 	priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (self);
-	request = g_hash_table_lookup (priv->requests, request_id);
+	request = g_hash_table_lookup (priv->requests, &request_id);
 	g_return_if_fail (request != NULL);
 
 	if (secrets) {
 		GVariantBuilder conn_builder, *setting_builder;
 		GVariantBuilder vpn_secrets_builder;
+		GVariantBuilder wg_secrets_builder;
+		GVariantBuilder wg_peer_builder;
 		GHashTable *settings;
 		GHashTableIter iter;
 		const char *name;
 		gboolean has_vpn = FALSE;
+		gboolean has_wg = FALSE;
 
-		settings = g_hash_table_new (nm_str_hash, g_str_equal);
+		settings = g_hash_table_new_full (nm_str_hash,
+		                                  g_str_equal,
+		                                  NULL,
+		                                  (GDestroyNotify) g_variant_builder_unref);
 		for (i = 0; i < secrets->len; i++) {
-			NMSecretAgentSimpleSecretReal *secret = secrets->pdata[i];
+			SecretReal *secret = secrets->pdata[i];
 
 			setting_builder = g_hash_table_lookup (settings, nm_setting_get_name (secret->setting));
 			if (!setting_builder) {
@@ -1025,6 +1124,19 @@ nm_secret_agent_simple_response (NMSecretAgentSimple *self,
 				g_variant_builder_add (&vpn_secrets_builder, "{ss}",
 				                       secret->property, secret->base.value);
 				break;
+			case NM_SECRET_AGENT_SECRET_TYPE_WIREGUARD_PEER_PSK:
+				if (!has_wg) {
+					g_variant_builder_init (&wg_secrets_builder, G_VARIANT_TYPE ("aa{sv}"));
+					has_wg = TRUE;
+				}
+				g_variant_builder_init (&wg_peer_builder, G_VARIANT_TYPE ("a{sv}"));
+				g_variant_builder_add (&wg_peer_builder, "{sv}",
+				                       NM_WIREGUARD_PEER_ATTR_PUBLIC_KEY, g_variant_new_string (secret->property));
+				g_variant_builder_add (&wg_peer_builder, "{sv}",
+				                       NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY, g_variant_new_string (secret->base.value));
+				g_variant_builder_add (&wg_secrets_builder, "a{sv}",
+				                       &wg_peer_builder);
+				break;
 			}
 		}
 
@@ -1034,53 +1146,69 @@ nm_secret_agent_simple_response (NMSecretAgentSimple *self,
 			                       g_variant_builder_end (&vpn_secrets_builder));
 		}
 
+		if (has_wg) {
+			g_variant_builder_add (setting_builder, "{sv}",
+			                       NM_SETTING_WIREGUARD_PEERS,
+			                       g_variant_builder_end (&wg_secrets_builder));
+		}
+
 		g_variant_builder_init (&conn_builder, NM_VARIANT_TYPE_CONNECTION);
 		g_hash_table_iter_init (&iter, settings);
 		while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &setting_builder))
 			g_variant_builder_add (&conn_builder, "{sa{sv}}", name, setting_builder);
-		dict = g_variant_builder_end (&conn_builder);
+		secrets_dict = g_variant_ref_sink (g_variant_builder_end (&conn_builder));
 		g_hash_table_destroy (settings);
 	} else {
 		error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_USER_CANCELED,
 		                     "User cancelled");
 	}
 
-	request->callback (NM_SECRET_AGENT_OLD (self), request->connection, dict, error, request->callback_data);
-
-	g_clear_error (&error);
-	g_hash_table_remove (priv->requests, request_id);
+	_request_data_complete (request, secrets_dict, error, NULL);
 }
 
 static void
-nm_secret_agent_simple_cancel_get_secrets (NMSecretAgentOld *agent,
-                                           const char       *connection_path,
-                                           const char       *setting_name)
+cancel_get_secrets (NMSecretAgentOld *agent,
+                    const char       *connection_path,
+                    const char       *setting_name)
 {
 	NMSecretAgentSimple *self = NM_SECRET_AGENT_SIMPLE (agent);
 	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (self);
+	gs_free_error GError *error = NULL;
 	gs_free char *request_id = NULL;
+	RequestData *request;
 
 	request_id = g_strdup_printf ("%s/%s", connection_path, setting_name);
-	g_hash_table_remove (priv->requests, request_id);
+	request = g_hash_table_lookup (priv->requests, &request_id);
+	if (!request) {
+		/* this is really a bug of the caller (or us?). We cannot invoke a callback,
+		 * hence the caller cannot cleanup the request. */
+		g_return_if_reached ();
+	}
+
+	g_set_error (&error,
+	             NM_SECRET_AGENT_ERROR,
+	             NM_SECRET_AGENT_ERROR_AGENT_CANCELED,
+	             "The secret agent is going away");
+	_request_data_complete (request, NULL, error, NULL);
 }
 
 static void
-nm_secret_agent_simple_save_secrets (NMSecretAgentOld                *agent,
-                                     NMConnection                    *connection,
-                                     const char                      *connection_path,
-                                     NMSecretAgentOldSaveSecretsFunc  callback,
-                                     gpointer                         callback_data)
+save_secrets (NMSecretAgentOld                *agent,
+              NMConnection                    *connection,
+              const char                      *connection_path,
+              NMSecretAgentOldSaveSecretsFunc  callback,
+              gpointer                         callback_data)
 {
 	/* We don't support secret storage */
 	callback (agent, connection, NULL, callback_data);
 }
 
 static void
-nm_secret_agent_simple_delete_secrets (NMSecretAgentOld                  *agent,
-                                       NMConnection                      *connection,
-                                       const char                        *connection_path,
-                                       NMSecretAgentOldDeleteSecretsFunc  callback,
-                                       gpointer                           callback_data)
+delete_secrets (NMSecretAgentOld                  *agent,
+                NMConnection                      *connection,
+                const char                        *connection_path,
+                NMSecretAgentOldDeleteSecretsFunc  callback,
+                gpointer                           callback_data)
 {
 	/* We don't support secret storage, so there's nothing to delete. */
 	callback (agent, connection, NULL, callback_data);
@@ -1100,7 +1228,8 @@ void
 nm_secret_agent_simple_enable (NMSecretAgentSimple *self, const char *path)
 {
 	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (self);
-	GList *requests, *iter;
+	gs_free RequestData **requests = NULL;
+	gsize i;
 	gs_free char *path_full = NULL;
 
 	/* The path is only used to match a request_id with the current
@@ -1109,10 +1238,9 @@ nm_secret_agent_simple_enable (NMSecretAgentSimple *self, const char *path)
 	 */
 	path_full = path ? g_strdup_printf ("%s/", path) : NULL;
 
-	if (g_strcmp0 (path_full, priv->path) != 0) {
+	if (!nm_streq0 (path_full, priv->path)) {
 		g_free (priv->path);
-		priv->path = path_full;
-		path_full = NULL;
+		priv->path = g_steal_pointer (&path_full);
 	}
 
 	if (priv->enabled)
@@ -1120,27 +1248,85 @@ nm_secret_agent_simple_enable (NMSecretAgentSimple *self, const char *path)
 	priv->enabled = TRUE;
 
 	/* Service pending secret requests. */
-	requests = g_hash_table_get_values (priv->requests);
-	for (iter = requests; iter; iter = g_list_next (iter))
-		request_secrets_from_ui (iter->data);
+	requests = (RequestData **) g_hash_table_get_keys_as_array (priv->requests, NULL);
+	for (i = 0; requests[i]; i++)
+		request_secrets_from_ui (requests[i]);
+}
+
+/*****************************************************************************/
+
+static void
+nm_secret_agent_simple_init (NMSecretAgentSimple *agent)
+{
+	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (agent);
 
-	g_list_free (requests);
+	G_STATIC_ASSERT_EXPR (G_STRUCT_OFFSET (RequestData, request_id) == 0);
+	priv->requests = g_hash_table_new_full (nm_pstr_hash, nm_pstr_equal,
+	                                        NULL, _request_data_free);
+}
+
+/**
+ * nm_secret_agent_simple_new:
+ * @name: the identifier of secret agent
+ *
+ * Creates a new #NMSecretAgentSimple. It does not serve any requests until
+ * nm_secret_agent_simple_enable() is called.
+ *
+ * Returns: a new #NMSecretAgentSimple if the agent creation is successful
+ * or %NULL in case of a failure.
+ */
+NMSecretAgentSimple *
+nm_secret_agent_simple_new (const char *name)
+{
+	return g_initable_new (NM_TYPE_SECRET_AGENT_SIMPLE, NULL, NULL,
+	                       NM_SECRET_AGENT_OLD_IDENTIFIER, name,
+	                       NM_SECRET_AGENT_OLD_CAPABILITIES, NM_SECRET_AGENT_CAPABILITY_VPN_HINTS,
+	                       NULL);
+}
+
+static void
+dispose (GObject *object)
+{
+	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (object);
+	gs_free_error GError *error = NULL;
+	GHashTableIter iter;
+	RequestData *request;
+
+	g_hash_table_iter_init (&iter, priv->requests);
+	while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &request)) {
+		if (!error)
+			nm_utils_error_set_cancelled (&error, TRUE, "NMSecretAgentSimple");
+		_request_data_complete (request, NULL, error, &iter);
+	}
+
+	G_OBJECT_CLASS (nm_secret_agent_simple_parent_class)->dispose (object);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (object);
+
+	g_hash_table_destroy (priv->requests);
+
+	g_free (priv->path);
+
+	G_OBJECT_CLASS (nm_secret_agent_simple_parent_class)->finalize (object);
 }
 
 void
 nm_secret_agent_simple_class_init (NMSecretAgentSimpleClass *klass)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	NMSecretAgentOldClass *agent_class = NM_SECRET_AGENT_OLD_CLASS (klass);
 
-	g_type_class_add_private (klass, sizeof (NMSecretAgentSimplePrivate));
-
-	gobject_class->finalize = nm_secret_agent_simple_finalize;
+	object_class->dispose = dispose;
+	object_class->finalize = finalize;
 
-	agent_class->get_secrets = nm_secret_agent_simple_get_secrets;
-	agent_class->cancel_get_secrets = nm_secret_agent_simple_cancel_get_secrets;
-	agent_class->save_secrets = nm_secret_agent_simple_save_secrets;
-	agent_class->delete_secrets = nm_secret_agent_simple_delete_secrets;
+	agent_class->get_secrets        = get_secrets;
+	agent_class->cancel_get_secrets = cancel_get_secrets;
+	agent_class->save_secrets       = save_secrets;
+	agent_class->delete_secrets     = delete_secrets;
 
 	/**
 	 * NMSecretAgentSimple::request-secrets:
@@ -1174,22 +1360,3 @@ nm_secret_agent_simple_class_init (NMSecretAgentSimpleClass *klass)
 	                                         G_TYPE_STRING, /* prompt */
 	                                         G_TYPE_PTR_ARRAY);
 }
-
-/**
- * nm_secret_agent_simple_new:
- * @name: the identifier of secret agent
- *
- * Creates a new #NMSecretAgentSimple. It does not serve any requests until
- * nm_secret_agent_simple_enable() is called.
- *
- * Returns: a new #NMSecretAgentSimple if the agent creation is successful
- * or %NULL in case of a failure.
- */
-NMSecretAgentOld *
-nm_secret_agent_simple_new (const char *name)
-{
-	return g_initable_new (NM_TYPE_SECRET_AGENT_SIMPLE, NULL, NULL,
-	                       NM_SECRET_AGENT_OLD_IDENTIFIER, name,
-	                       NM_SECRET_AGENT_OLD_CAPABILITIES, NM_SECRET_AGENT_CAPABILITY_VPN_HINTS,
-	                       NULL);
-}
diff --git a/clients/common/nm-secret-agent-simple.h b/clients/common/nm-secret-agent-simple.h
index 529aaeac..4a666d17 100644
--- a/clients/common/nm-secret-agent-simple.h
+++ b/clients/common/nm-secret-agent-simple.h
@@ -21,48 +21,44 @@
 
 #include "nm-secret-agent-old.h"
 
-#define NM_TYPE_SECRET_AGENT_SIMPLE            (nm_secret_agent_simple_get_type ())
-#define NM_SECRET_AGENT_SIMPLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple))
-#define NM_SECRET_AGENT_SIMPLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass))
-#define NM_IS_SECRET_AGENT_SIMPLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SECRET_AGENT_SIMPLE))
-#define NM_IS_SECRET_AGENT_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SECRET_AGENT_SIMPLE))
-#define NM_SECRET_AGENT_SIMPLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass))
-
-/* Signals */
-#define NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS  "request-secrets"
-
-typedef struct {
-	NMSecretAgentOld parent;
-
-} NMSecretAgentSimple;
-
-typedef struct {
-	NMSecretAgentOldClass parent;
-
-} NMSecretAgentSimpleClass;
-
 typedef enum {
 	NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
 	NM_SECRET_AGENT_SECRET_TYPE_SECRET,
 	NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET,
+	NM_SECRET_AGENT_SECRET_TYPE_WIREGUARD_PEER_PSK,
 } NMSecretAgentSecretType;
 
 typedef struct {
-	const NMSecretAgentSecretType secret_type;
+	NMSecretAgentSecretType secret_type;
 	const char *pretty_name;
 	const char *entry_id;
 	char *value;
 	const char *vpn_type;
-	gboolean is_secret;
+	bool is_secret:1;
+	bool no_prompt_entry_id:1;
 } NMSecretAgentSimpleSecret;
 
 #define NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS "vpn.secrets."
 
 #define NM_SECRET_AGENT_VPN_TYPE_OPENCONNECT  NM_DBUS_INTERFACE".openconnect"
 
+/*****************************************************************************/
+
+#define NM_TYPE_SECRET_AGENT_SIMPLE            (nm_secret_agent_simple_get_type ())
+#define NM_SECRET_AGENT_SIMPLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple))
+#define NM_SECRET_AGENT_SIMPLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass))
+#define NM_IS_SECRET_AGENT_SIMPLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SECRET_AGENT_SIMPLE))
+#define NM_IS_SECRET_AGENT_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SECRET_AGENT_SIMPLE))
+#define NM_SECRET_AGENT_SIMPLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass))
+
+#define NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS  "request-secrets"
+
+typedef struct _NMSecretAgentSimple      NMSecretAgentSimple;
+typedef struct _NMSecretAgentSimpleClass NMSecretAgentSimpleClass;
+
 GType nm_secret_agent_simple_get_type (void);
 
-NMSecretAgentOld *nm_secret_agent_simple_new                 (const char          *name);
+NMSecretAgentSimple *nm_secret_agent_simple_new              (const char          *name);
 
 void              nm_secret_agent_simple_response            (NMSecretAgentSimple *self,
                                                               const char          *request_id,
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index c3237f12..ea905972 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c
@@ -25,9 +25,13 @@
 
 #include "nm-vpn-helpers.h"
 
-#include <string.h>
+#include <arpa/inet.h>
+#include <net/if.h>
 
+#include "nm-client-utils.h"
 #include "nm-utils.h"
+#include "nm-utils/nm-io-utils.h"
+#include "nm-utils/nm-secret-utils.h"
 
 /*****************************************************************************/
 
@@ -115,27 +119,27 @@ nm_vpn_supports_ipv6 (NMConnection *connection)
 const VpnPasswordName *
 nm_vpn_get_secret_names (const char *service_type)
 {
-	static const VpnPasswordName const generic_vpn_secrets[] = {
+	static const VpnPasswordName generic_vpn_secrets[] = {
 		{ "password", N_("Password") },
 		{ 0 }
 	};
-	static const VpnPasswordName const openvpn_secrets[] = {
+	static const VpnPasswordName openvpn_secrets[] = {
 		{ "password", N_("Password") },
 		{ "cert-pass", N_("Certificate password") },
 		{ "http-proxy-password", N_("HTTP proxy password") },
 		{ 0 }
 	};
-	static const VpnPasswordName const vpnc_secrets[] = {
+	static const VpnPasswordName vpnc_secrets[] = {
 		{ "Xauth password", N_("Password") },
 		{ "IPSec secret", N_("Group password") },
 		{ 0 }
 	};
-	static const VpnPasswordName const swan_secrets[] = {
+	static const VpnPasswordName swan_secrets[] = {
 		{ "xauthpassword", N_("Password") },
 		{ "pskvalue", N_("Group password") },
 		{ 0 }
 	};
-	static const VpnPasswordName const openconnect_secrets[] = {
+	static const VpnPasswordName openconnect_secrets[] = {
 		{ "gateway", N_("Gateway") },
 		{ "cookie", N_("Cookie") },
 		{ "gwcert", N_("Gateway certificate hash") },
@@ -249,3 +253,556 @@ nm_vpn_openconnect_authenticate_helper (const char *host,
 	return TRUE;
 }
 
+static gboolean
+_wg_complete_peer (GPtrArray **p_peers,
+                   NMWireGuardPeer *peer_take,
+                   gsize peer_start_line_nr,
+                   const char *filename,
+                   GError **error)
+{
+	nm_auto_unref_wgpeer NMWireGuardPeer *peer = peer_take;
+	gs_free_error GError *local = NULL;
+
+	if (!peer)
+		return TRUE;
+
+	if (!nm_wireguard_peer_is_valid (peer, TRUE, TRUE, &local)) {
+		nm_utils_error_set (error, NM_UTILS_ERROR_UNKNOWN,
+		                    _("Invalid peer starting at %s:%zu: %s"),
+		                    filename,
+		                    peer_start_line_nr,
+		                    local->message);
+		return FALSE;
+	}
+
+	if (!*p_peers)
+		*p_peers = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_wireguard_peer_unref);
+	g_ptr_array_add (*p_peers, g_steal_pointer (&peer));
+	return TRUE;
+}
+
+static gboolean
+_line_match (char *line, const char *key, gsize key_len, const char **out_key, char **out_value)
+{
+	nm_assert (line);
+	nm_assert (key);
+	nm_assert (strlen (key) == key_len);
+	nm_assert (!strchr (key, '='));
+	nm_assert (out_key && !*out_key);
+	nm_assert (out_value && !*out_value);
+
+	/* Note that `wg-quick` (linux.bash) does case-insensitive comparison (shopt -s nocasematch).
+	 * `wg setconf` does case-insensitive comparison too (with strncasecmp, which is locale dependent).
+	 *
+	 * We do a case-insensitive comparison of the key, however in a locale-independent manner. */
+
+	if (g_ascii_strncasecmp (line, key, key_len) != 0)
+		return FALSE;
+
+	if (line[key_len] != '=')
+		return FALSE;
+
+	*out_key = key;
+	*out_value = &line[key_len + 1];
+	return TRUE;
+}
+
+#define line_match(line, key, out_key, out_value) \
+	_line_match ((line), ""key"", NM_STRLEN (key), (out_key), (out_value))
+
+static gboolean
+value_split_word (char **line_remainder, char **out_word)
+{
+	char *str;
+
+	if ((*line_remainder)[0] == '\0')
+		return FALSE;
+
+	*out_word = *line_remainder;
+
+	str = strchrnul (*line_remainder, ',');
+	if (str[0] == ',') {
+		str[0] = '\0';
+		*line_remainder = &str[1];
+	} else
+		*line_remainder = str;
+	return TRUE;
+}
+
+NMConnection *
+nm_vpn_wireguard_import (const char *filename,
+                         GError **error)
+{
+	nm_auto_clear_secret_ptr NMSecretPtr file_content = NM_SECRET_PTR_INIT ();
+	char ifname[IFNAMSIZ];
+	gs_free char *uuid = NULL;
+	gboolean ifname_valid = FALSE;
+	const char *cstr;
+	char *line_remainder;
+	gs_unref_object NMConnection *connection = NULL;
+	NMSettingConnection *s_con;
+	NMSettingIPConfig *s_ip4;
+	NMSettingIPConfig *s_ip6;
+	NMSettingWireGuard *s_wg;
+	gs_free_error GError *local = NULL;
+	enum {
+		LINE_CONTEXT_INIT,
+		LINE_CONTEXT_INTERFACE,
+		LINE_CONTEXT_PEER,
+	} line_context;
+	gsize line_nr;
+	gsize current_peer_start_line_nr = 0;
+	nm_auto_unref_wgpeer NMWireGuardPeer *current_peer = NULL;
+	gs_unref_ptrarray GPtrArray *data_dns_v4 = NULL;
+	gs_unref_ptrarray GPtrArray *data_dns_v6 = NULL;
+	gs_unref_ptrarray GPtrArray *data_addr_v4 = NULL;
+	gs_unref_ptrarray GPtrArray *data_addr_v6 = NULL;
+	gs_unref_ptrarray GPtrArray *data_peers = NULL;
+	const char *data_private_key = NULL;
+	gint64 data_table;
+	guint data_listen_port = 0;
+	guint data_fwmark = 0;
+	guint data_mtu = 0;
+	int is_v4;
+	guint i;
+
+	g_return_val_if_fail (filename, NULL);
+	g_return_val_if_fail (!error || !*error, NULL);
+
+	/* contrary to "wg-quick", we never interpret the filename as "/etc/wireguard/$INTERFACE.conf".
+	 * If the filename has no '/', it is interpreted as relative to the current working directory.
+	 * However, we do require a suitable filename suffix and that the name corresponds to the interface
+	 * name. */
+	cstr = strrchr (filename, '/');
+	cstr = cstr ? &cstr[1] : filename;
+	if (NM_STR_HAS_SUFFIX (cstr, ".conf")) {
+		gsize len = strlen (cstr) - NM_STRLEN (".conf");
+
+		if (len > 0 && len < sizeof (ifname)) {
+			memcpy (ifname, cstr, len);
+			ifname[len] = '\0';
+
+			if (nm_utils_is_valid_iface_name (ifname, NULL))
+				ifname_valid = TRUE;
+		}
+	}
+	if (!ifname_valid) {
+		nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN,
+		                            _("The WireGuard config file must be a valid interface name followed by \".conf\""));
+		return FALSE;
+	}
+
+	if (nm_utils_file_get_contents (-1,
+	                                filename,
+	                                10*1024*1024,
+	                                NM_UTILS_FILE_GET_CONTENTS_FLAG_SECRET,
+	                                &file_content.str,
+	                                &file_content.len,
+	                                error) < 0)
+		return NULL;
+
+	/* We interpret the file like `wg-quick up` and `wg setconf` do.
+	 *
+	 * Of course the WireGuard scripts do something fundamentlly different. They
+	 * perform actions to configure the WireGuard link in kernel, add routes and
+	 * addresses, and call resolvconf. It all happens at the time when the script
+	 * run.
+	 *
+	 * This code here instead generates a NetworkManager connection profile so that
+	 * NetworkManager will apply a similar configuration when later activating the profile. */
+
+#define _TABLE_AUTO  ((gint64) -1)
+#define _TABLE_OFF   ((gint64) -2)
+
+	data_table = _TABLE_AUTO;
+
+	line_remainder = file_content.str;
+	line_context = LINE_CONTEXT_INIT;
+	line_nr = 0;
+	while (line_remainder[0] != '\0') {
+		const char *matched_key = NULL;
+		char *value = NULL;
+		char *line;
+		char ch;
+		gint64 i64;
+
+		line_nr++;
+
+		line = line_remainder;
+		line_remainder = strchrnul (line, '\n');
+		if (line_remainder[0] != '\0')
+			(line_remainder++)[0] = '\0';
+
+		/* Drop all spaces and truncate at first '#'.
+		 * See wg's config_read_line().
+		 *
+		 * Note that wg-quick doesn't do that.
+		 *
+		 * Neither `wg setconf` nor `wg-quick` does a strict parsing.
+		 * We don't either. Just try to interpret the file (mostly) the same as
+		 * they would.
+		 */
+		{
+			gsize l, n;
+
+			n = 0;
+			for (l = 0; (ch = line[l]); l++) {
+				if (g_ascii_isspace (ch)) {
+					/* wg-setconf strips all whitespace before parsing the content. That means,
+					 * *[I nterface]" will be accepted. We do that too. */
+					continue;
+				}
+				if (ch == '#')
+					break;
+				line[n++] = line[l];
+			}
+			if (n == 0)
+				continue;
+			line[n] = '\0';
+		}
+
+		if (g_ascii_strcasecmp (line, "[Interface]") == 0) {
+			if (!_wg_complete_peer (&data_peers,
+			                        g_steal_pointer (&current_peer),
+			                        current_peer_start_line_nr,
+			                        filename,
+			                        error))
+				return FALSE;
+			line_context = LINE_CONTEXT_INTERFACE;
+			continue;
+		}
+
+		if (g_ascii_strcasecmp (line, "[Peer]") == 0) {
+			if (!_wg_complete_peer (&data_peers,
+			                        g_steal_pointer (&current_peer),
+			                        current_peer_start_line_nr,
+			                        filename,
+			                        error))
+				return FALSE;
+			current_peer_start_line_nr = line_nr;
+			current_peer = nm_wireguard_peer_new ();
+			line_context = LINE_CONTEXT_PEER;
+			continue;
+		}
+
+		if (line_context == LINE_CONTEXT_INTERFACE) {
+
+			if (line_match (line, "Address", &matched_key, &value)) {
+				char *value_word;
+
+				while (value_split_word (&value, &value_word)) {
+					GPtrArray **p_data_addr;
+					NMIPAddr addr_bin;
+					int addr_family;
+					int prefix_len;
+
+					if (!nm_utils_parse_inaddr_prefix_bin (AF_UNSPEC,
+					                                       value_word,
+					                                       &addr_family,
+					                                       &addr_bin,
+					                                       &prefix_len))
+						goto fail_invalid_value;
+
+					p_data_addr =   (addr_family == AF_INET)
+					              ? &data_addr_v4
+					              : &data_addr_v6;
+
+					if (!*p_data_addr)
+						*p_data_addr = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_ip_address_unref);
+
+					g_ptr_array_add (*p_data_addr,
+					                 nm_ip_address_new_binary (addr_family,
+					                                           &addr_bin,
+					                                             prefix_len == -1
+					                                           ? ((addr_family == AF_INET) ? 32 : 128)
+					                                           : prefix_len,
+					                                           NULL));
+				}
+				continue;
+			}
+
+			if (line_match (line, "MTU", &matched_key, &value)) {
+				i64 = _nm_utils_ascii_str_to_int64 (value, 0, 0, G_MAXUINT32, -1);
+				if (i64 == -1)
+					goto fail_invalid_value;
+
+				/* wg-quick accepts the "MTU" value, but it also fetches routes to
+				 * autodetect it. NetworkManager won't do that, we can only configure
+				 * an explicit MTU or no autodetection will be performed. */
+				data_mtu = i64;
+				continue;
+			}
+
+			if (line_match (line, "DNS", &matched_key, &value)) {
+				char *value_word;
+
+				while (value_split_word (&value, &value_word)) {
+					char addr_s[NM_CONST_MAX (INET_ADDRSTRLEN, INET6_ADDRSTRLEN)];
+					GPtrArray **p_data_dns;
+					NMIPAddr addr_bin;
+					int addr_family;
+
+					if (!nm_utils_parse_inaddr_bin (AF_UNSPEC,
+					                                value_word,
+					                                &addr_family,
+					                                &addr_bin))
+						goto fail_invalid_value;
+
+					p_data_dns =   (addr_family == AF_INET)
+					             ? &data_dns_v4
+					             : &data_dns_v6;
+					if (!*p_data_dns)
+						*p_data_dns = g_ptr_array_new_with_free_func (g_free);
+
+					inet_ntop (addr_family, &addr_bin, addr_s, sizeof (addr_s));
+					g_ptr_array_add (*p_data_dns, g_strdup (addr_s));
+				}
+				continue;
+			}
+
+			if (line_match (line, "Table", &matched_key, &value)) {
+
+				if (nm_streq (value, "auto"))
+					data_table = _TABLE_AUTO;
+				else if (nm_streq (value, "off"))
+					data_table = _TABLE_OFF;
+				else {
+					/* we don't support table names from /etc/iproute2/rt_tables
+					 * But we accept hex like `ip route add` would. */
+					i64 = _nm_utils_ascii_str_to_int64 (value, 0, 0, G_MAXINT32, -1);
+					if (i64 == -1)
+						goto fail_invalid_value;
+					data_table = i64;
+				}
+				continue;
+			}
+
+			if (   line_match (line, "PreUp", &matched_key, &value)
+			    || line_match (line, "PreDown", &matched_key, &value)
+			    || line_match (line, "PostUp", &matched_key, &value)
+			    || line_match (line, "PostDown", &matched_key, &value)) {
+				/* we don't run any scripts. Silently ignore these parameters. */
+				continue;
+			}
+
+			if (line_match (line, "SaveConfig", &matched_key, &value)) {
+				/* we ignore the setting, but enforce that it's either true or false (like
+				 * wg-quick. */
+				if (!NM_IN_STRSET (value, "true", "false"))
+					goto fail_invalid_value;
+				continue;
+			}
+
+			if (line_match (line, "ListenPort", &matched_key, &value)) {
+				/* we don't use getaddrinfo(), unlike `wg setconf`. Just interpret
+				 * the port as plain decimal number. */
+				i64 = _nm_utils_ascii_str_to_int64 (value, 10, 0, 0xFFFF, -1);
+				if (i64 == -1)
+					goto fail_invalid_value;
+				data_listen_port = i64;
+				continue;
+			}
+
+			if (line_match (line, "FwMark", &matched_key, &value)) {
+				if (nm_streq (value, "off"))
+					data_fwmark = 0;
+				else {
+					i64 = _nm_utils_ascii_str_to_int64 (value, 0, 0, G_MAXINT32, -1);
+					if (i64 == -1)
+						goto fail_invalid_value;
+					data_fwmark = i64;
+				}
+				continue;
+			}
+
+			if (line_match (line, "PrivateKey", &matched_key, &value)) {
+				if (!nm_utils_base64secret_decode (value, NM_WIREGUARD_PUBLIC_KEY_LEN, NULL))
+					goto fail_invalid_secret;
+				data_private_key = value;
+				continue;
+			}
+
+			goto fail_invalid_line;
+		}
+
+
+		if (line_context == LINE_CONTEXT_PEER) {
+
+			if (line_match (line, "Endpoint", &matched_key, &value)) {
+				if (!nm_wireguard_peer_set_endpoint (current_peer, value, FALSE))
+					goto fail_invalid_value;
+				continue;
+			}
+
+			if (line_match (line, "PublicKey", &matched_key, &value)) {
+				if (!nm_wireguard_peer_set_public_key (current_peer, value, FALSE))
+					goto fail_invalid_value;
+				continue;
+			}
+
+			if (line_match (line, "AllowedIPs", &matched_key, &value)) {
+				char *value_word;
+
+				while (value_split_word (&value, &value_word)) {
+					if (!nm_wireguard_peer_append_allowed_ip (current_peer,
+					                                          value_word,
+					                                          FALSE))
+						goto fail_invalid_value;
+				}
+				continue;
+			}
+
+			if (line_match (line, "PersistentKeepalive", &matched_key, &value)) {
+				if (nm_streq (value, "off"))
+					i64 = 0;
+				else {
+					i64 = _nm_utils_ascii_str_to_int64 (value, 10, 0, G_MAXUINT16, -1);
+					if (i64 == -1)
+						goto fail_invalid_value;
+				}
+				nm_wireguard_peer_set_persistent_keepalive (current_peer, i64);
+				continue;
+			}
+
+			if (line_match (line, "PresharedKey", &matched_key, &value)) {
+				if (!nm_wireguard_peer_set_preshared_key (current_peer, value, FALSE))
+					goto fail_invalid_secret;
+				nm_wireguard_peer_set_preshared_key_flags (current_peer, NM_SETTING_SECRET_FLAG_NONE);
+				continue;
+			}
+
+			goto fail_invalid_line;
+		}
+
+fail_invalid_line:
+		nm_utils_error_set (error, NM_UTILS_ERROR_INVALID_ARGUMENT,
+		                    _("unrecognized line at %s:%zu"),
+		                    filename, line_nr);
+		return FALSE;
+fail_invalid_value:
+		nm_utils_error_set (error, NM_UTILS_ERROR_INVALID_ARGUMENT,
+		                    _("invalid value for '%s' at %s:%zu"),
+		                    matched_key, filename, line_nr);
+		return FALSE;
+fail_invalid_secret:
+		nm_utils_error_set (error, NM_UTILS_ERROR_INVALID_ARGUMENT,
+		                    _("invalid secret '%s' at %s:%zu"),
+		                    matched_key, filename, line_nr);
+		return FALSE;
+	}
+
+	if (!_wg_complete_peer (&data_peers,
+	                        g_steal_pointer (&current_peer),
+	                        current_peer_start_line_nr,
+	                        filename,
+	                        error))
+		return FALSE;
+
+	connection = nm_simple_connection_new ();
+	s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ());
+	nm_connection_add_setting (connection, NM_SETTING (s_con));
+	s_ip4 = NM_SETTING_IP_CONFIG (nm_setting_ip4_config_new ());
+	nm_connection_add_setting (connection, NM_SETTING (s_ip4));
+	s_ip6 = NM_SETTING_IP_CONFIG (nm_setting_ip6_config_new ());
+	nm_connection_add_setting (connection, NM_SETTING (s_ip6));
+	s_wg = NM_SETTING_WIREGUARD (nm_setting_wireguard_new ());
+	nm_connection_add_setting (connection, NM_SETTING (s_wg));
+
+	uuid = nm_utils_uuid_generate ();
+
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_ID,
+	              ifname,
+	              NM_SETTING_CONNECTION_UUID,
+	              uuid,
+	              NM_SETTING_CONNECTION_TYPE,
+	              NM_SETTING_WIREGUARD_SETTING_NAME,
+	              NM_SETTING_CONNECTION_INTERFACE_NAME,
+	              ifname,
+	              NULL);
+
+	g_object_set (s_wg,
+	              NM_SETTING_WIREGUARD_PRIVATE_KEY,
+	              data_private_key,
+	              NM_SETTING_WIREGUARD_LISTEN_PORT,
+	              data_listen_port,
+	              NM_SETTING_WIREGUARD_FWMARK,
+	              data_fwmark,
+	              NM_SETTING_WIREGUARD_MTU,
+	              data_mtu,
+	              NULL);
+
+	if (data_peers) {
+		for (i = 0; i < data_peers->len; i++)
+			nm_setting_wireguard_append_peer (s_wg, data_peers->pdata[i]);
+	}
+
+	for (is_v4 = 0; is_v4 < 2; is_v4++) {
+		const char *method_disabled = is_v4 ? NM_SETTING_IP4_CONFIG_METHOD_DISABLED : NM_SETTING_IP6_CONFIG_METHOD_IGNORE;
+		const char *method_manual   = is_v4 ? NM_SETTING_IP4_CONFIG_METHOD_MANUAL   : NM_SETTING_IP6_CONFIG_METHOD_MANUAL;
+		NMSettingIPConfig *s_ip     = is_v4 ? s_ip4                                 : s_ip6;
+		GPtrArray *data_dns         = is_v4 ? data_dns_v4                           : data_dns_v6;
+		GPtrArray *data_addr        = is_v4 ? data_addr_v4                          : data_addr_v6;
+
+		if (data_dns && !data_addr) {
+			/* When specifying "DNS", we also require an "Address" for the same address
+			 * family. That is because a NMSettingIPConfig cannot have @method_disabled
+			 * and DNS settings at the same time.
+			 *
+			 * We don't have addresses. Silently ignore the DNS setting. */
+			data_dns = NULL;
+		}
+
+		g_object_set (s_ip,
+		              NM_SETTING_IP_CONFIG_METHOD,
+		              data_addr ? method_manual : method_disabled,
+		              NULL);
+
+		if (data_addr) {
+			for (i = 0; i < data_addr->len; i++)
+				nm_setting_ip_config_add_address (s_ip, data_addr->pdata[i]);
+		}
+		if (data_dns) {
+			for (i = 0; i < data_dns->len; i++)
+				nm_setting_ip_config_add_dns (s_ip, data_dns->pdata[i]);
+		}
+
+		if (data_table == _TABLE_AUTO) {
+			/* in the "auto" setting, wg-quick adds peer-routes automatically to the main
+			 * table. NetworkManager will do that too, but there are differences:
+			 *
+			 * - NetworkManager (contrary to wg-quick) does not check whether the peer-route is necessary.
+			 *   It will always add a route for each allowed-ips range, even if there is already another
+			 *   route that would ensure packets to the endpoint are routed via the WireGuard interface.
+			 *   If you don't want that, disable "wireguard.peer-routes", and add the necessary routes
+			 *   yourself to "ipv4.routes" and "ipv6.routes".
+			 *
+			 * - With "auto", wg-quick also configures policy routing to handle default-routes (/0) to
+			 *   avoid routing loops. That is not yet solved by NetworkManager, you need to configure
+			 *   that explicitly (for example, by adding a direct route to the gateway on the interface
+			 *   that has the default-route, or by using a script (possibly dispatcher script).
+			 */
+		} else if (data_table == _TABLE_OFF) {
+			if (is_v4) {
+				g_object_set (s_wg,
+				              NM_SETTING_WIREGUARD_PEER_ROUTES,
+				              FALSE,
+				              NULL);
+			}
+		} else {
+			g_object_set (s_ip,
+			              NM_SETTING_IP_CONFIG_ROUTE_TABLE,
+			              (guint) data_table,
+			              NULL);
+		}
+	}
+
+	if (!nm_connection_normalize (connection, NULL, NULL, &local)) {
+		nm_utils_error_set (error, NM_UTILS_ERROR_INVALID_ARGUMENT,
+		                    _("Failed to create WireGuard connection: %s"),
+		                    local->message);
+		return FALSE;
+	}
+
+	return g_steal_pointer (&connection);
+}
diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h
index 4c15faa1..686687ba 100644
--- a/clients/common/nm-vpn-helpers.h
+++ b/clients/common/nm-vpn-helpers.h
@@ -39,4 +39,7 @@ gboolean nm_vpn_openconnect_authenticate_helper (const char *host,
                                                  int *status,
                                                  GError **error);
 
+NMConnection *nm_vpn_wireguard_import (const char *filename,
+                                       GError **error);
+
 #endif  /* __NM_VPN_HELPERS_H__ */
diff --git a/clients/common/settings-docs.h b/clients/common/settings-docs.h
index 462ba364..7b958faa 100644
--- a/clients/common/settings-docs.h
+++ b/clients/common/settings-docs.h
@@ -24,14 +24,14 @@
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_AUTH_ALG N_("When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the 802.11 authentication algorithm required by the AP here.  One of \"open\" for Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") the \"leap-username\" and \"leap-password\" properties must be specified.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_FILS N_("Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the connection.  One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not supported).  When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and no global default is set, FILS will be optionally enabled.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_GROUP N_("A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\".")
-#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure WPA-PSK), or \"wpa-eap\" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.")
+#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise). This property must be set for any Wi-Fi connection that uses security.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD N_("The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS N_("Flags indicating how to handle the \"leap-password\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME N_("The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PAIRWISE N_("A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of \"tkip\" or \"ccmp\".")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PMF N_("Indicates whether Protected Management Frames (802.11w) must be enabled for the connection.  One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) (disable PMF), NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) (enable PMF if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (enable PMF and fail if not supported).  When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and no global default is set, PMF will be optionally enabled.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PROTO N_("List of strings specifying the allowed WPA protocol versions to use. Each element may be one \"wpa\" (allow WPA) or \"rsn\" (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.")
-#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PSK N_("Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi network.")
+#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PSK N_("Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII passphrase of 8 to 63 characters that is (as specified in the 802.11i standard) hashed to derive the actual key, or the key in form of 64 hexadecimal character. The WPA3-Personal networks use a passphrase of any length for SAE authentication.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS N_("Flags indicating how to handle the \"psk\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS N_("Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", and \"wep-key3\" properties.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE N_("Controls the interpretation of WEP keys.  Allowed values are NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-character hexadecimal string, or a 5- or 13-character ASCII password; or NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as a string and will be hashed using the de-facto MD5 method to derive the actual WEP key.")
@@ -144,7 +144,7 @@
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_READ_ONLY N_("FALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_SECONDARIES N_("List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_SLAVE_TYPE N_("Setting name of the device type of this slave's master connection (eg, \"bond\"), or NULL if this connection is not a slave.")
-#define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are \"${CONNECTION}\", \"${DEVICE}\", \"${MAC}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the interface name of the device and \"${MAC}\" is the permanent MAC address of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to \"${CONNECTION}\" and uses a unique, fixed ID for the connection.")
+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are \"${CONNECTION}\", \"${DEVICE}\", \"${MAC}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds to the interface name of the device and \"${MAC}\" is the permanent MAC address of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to \"${CONNECTION}\" and uses a unique, fixed ID for the connection.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").")
@@ -357,8 +357,17 @@
 #define DESCRIBE_DOC_NM_SETTING_VXLAN_SOURCE_PORT_MIN N_("Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.")
 #define DESCRIBE_DOC_NM_SETTING_VXLAN_TOS N_("Specifies the TOS value to use in outgoing packets.")
 #define DESCRIBE_DOC_NM_SETTING_VXLAN_TTL N_("Specifies the time-to-live value to use in outgoing packets.")
+#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_PEER N_("The P2P device that should be connected to. Currently this is the only way to create or join a group.")
+#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_WFD_IES N_("The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display requires a protocol specific information element to be set in certain Wi-Fi frames. These can be specified here for the purpose of establishing a connection. This setting is only useful when implementing a Wi-Fi Display client.")
+#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_WPS_METHOD N_("Flags indicating which mode of WPS is to be used. There's little point in changing the default setting as NetworkManager will automatically determine the best method to use.")
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_MAC_ADDRESS N_("If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1")
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_NETWORK_NAME N_("Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_FWMARK N_("The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_LISTEN_PORT N_("The listen-port. If listen-port is not specified, the port will be chosen randomly when the interface comes up.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments. If zero a default MTU is used. Note that contrary to wg-quick's MTU setting, this does not take into account the current routes at the time of activation.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PEER_ROUTES N_("Whether to automatically add routes for the AllowedIPs ranges of the peers. If TRUE (the default), NetworkManager will automatically add routes in the routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, no such routes are added automatically. In this case, the user may want to configure static routes in ipv4.routes and ipv6.routes, respectively.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PRIVATE_KEY N_("The 256 bit private-key in base64 encoding.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS N_("Flags indicating how to handle the \"private-key\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WPAN_CHANNEL N_("IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use whatever the device is already set to\".")
 #define DESCRIBE_DOC_NM_SETTING_WPAN_MAC_ADDRESS N_("If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) MAC layer device whose permanent MAC address matches.")
 #define DESCRIBE_DOC_NM_SETTING_WPAN_PAGE N_("IEEE 802.15.4 channel page. A positive integer or -1, meaning \"do not set, use whatever the device is already set to\".")
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 462ba364..7b958faa 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -24,14 +24,14 @@
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_AUTH_ALG N_("When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the 802.11 authentication algorithm required by the AP here.  One of \"open\" for Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") the \"leap-username\" and \"leap-password\" properties must be specified.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_FILS N_("Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the connection.  One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not supported).  When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and no global default is set, FILS will be optionally enabled.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_GROUP N_("A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\".")
-#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure WPA-PSK), or \"wpa-eap\" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.")
+#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise). This property must be set for any Wi-Fi connection that uses security.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD N_("The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS N_("Flags indicating how to handle the \"leap-password\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME N_("The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PAIRWISE N_("A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of \"tkip\" or \"ccmp\".")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PMF N_("Indicates whether Protected Management Frames (802.11w) must be enabled for the connection.  One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) (disable PMF), NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) (enable PMF if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (enable PMF and fail if not supported).  When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and no global default is set, PMF will be optionally enabled.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PROTO N_("List of strings specifying the allowed WPA protocol versions to use. Each element may be one \"wpa\" (allow WPA) or \"rsn\" (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.")
-#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PSK N_("Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi network.")
+#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PSK N_("Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII passphrase of 8 to 63 characters that is (as specified in the 802.11i standard) hashed to derive the actual key, or the key in form of 64 hexadecimal character. The WPA3-Personal networks use a passphrase of any length for SAE authentication.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS N_("Flags indicating how to handle the \"psk\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS N_("Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", and \"wep-key3\" properties.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE N_("Controls the interpretation of WEP keys.  Allowed values are NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-character hexadecimal string, or a 5- or 13-character ASCII password; or NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as a string and will be hashed using the de-facto MD5 method to derive the actual WEP key.")
@@ -144,7 +144,7 @@
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_READ_ONLY N_("FALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_SECONDARIES N_("List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_SLAVE_TYPE N_("Setting name of the device type of this slave's master connection (eg, \"bond\"), or NULL if this connection is not a slave.")
-#define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are \"${CONNECTION}\", \"${DEVICE}\", \"${MAC}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the interface name of the device and \"${MAC}\" is the permanent MAC address of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to \"${CONNECTION}\" and uses a unique, fixed ID for the connection.")
+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are \"${CONNECTION}\", \"${DEVICE}\", \"${MAC}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds to the interface name of the device and \"${MAC}\" is the permanent MAC address of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to \"${CONNECTION}\" and uses a unique, fixed ID for the connection.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").")
@@ -357,8 +357,17 @@
 #define DESCRIBE_DOC_NM_SETTING_VXLAN_SOURCE_PORT_MIN N_("Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.")
 #define DESCRIBE_DOC_NM_SETTING_VXLAN_TOS N_("Specifies the TOS value to use in outgoing packets.")
 #define DESCRIBE_DOC_NM_SETTING_VXLAN_TTL N_("Specifies the time-to-live value to use in outgoing packets.")
+#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_PEER N_("The P2P device that should be connected to. Currently this is the only way to create or join a group.")
+#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_WFD_IES N_("The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display requires a protocol specific information element to be set in certain Wi-Fi frames. These can be specified here for the purpose of establishing a connection. This setting is only useful when implementing a Wi-Fi Display client.")
+#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_WPS_METHOD N_("Flags indicating which mode of WPS is to be used. There's little point in changing the default setting as NetworkManager will automatically determine the best method to use.")
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_MAC_ADDRESS N_("If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1")
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_NETWORK_NAME N_("Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_FWMARK N_("The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_LISTEN_PORT N_("The listen-port. If listen-port is not specified, the port will be chosen randomly when the interface comes up.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments. If zero a default MTU is used. Note that contrary to wg-quick's MTU setting, this does not take into account the current routes at the time of activation.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PEER_ROUTES N_("Whether to automatically add routes for the AllowedIPs ranges of the peers. If TRUE (the default), NetworkManager will automatically add routes in the routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, no such routes are added automatically. In this case, the user may want to configure static routes in ipv4.routes and ipv6.routes, respectively.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PRIVATE_KEY N_("The 256 bit private-key in base64 encoding.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS N_("Flags indicating how to handle the \"private-key\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WPAN_CHANNEL N_("IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use whatever the device is already set to\".")
 #define DESCRIBE_DOC_NM_SETTING_WPAN_MAC_ADDRESS N_("If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) MAC layer device whose permanent MAC address matches.")
 #define DESCRIBE_DOC_NM_SETTING_WPAN_PAGE N_("IEEE 802.15.4 channel page. A positive integer or -1, meaning \"do not set, use whatever the device is already set to\".")
diff --git a/clients/common/tests/test-general.c b/clients/common/tests/test-general.c
index 8f96eb26..c39901ba 100644
--- a/clients/common/tests/test-general.c
+++ b/clients/common/tests/test-general.c
@@ -20,6 +20,7 @@
 #include "nm-default.h"
 
 #include "nm-meta-setting-access.h"
+#include "nm-vpn-helpers.h"
 
 #include "nm-utils/nm-test-utils.h"
 
@@ -145,6 +146,96 @@ test_client_meta_check (void)
 
 /*****************************************************************************/
 
+static void
+test_client_import_wireguard_test0 (void)
+{
+	gs_unref_object NMConnection *connection;
+	NMSettingWireGuard *s_wg;
+	NMWireGuardPeer *peer;
+	gs_free_error GError *error = NULL;
+
+	connection = nm_vpn_wireguard_import (NM_BUILD_SRCDIR"/clients/common/tests/wg-test0.conf",
+	                                      &error);
+
+	g_assert_no_error (error);
+
+	g_assert_cmpstr (nm_connection_get_id (connection), ==, "wg-test0");
+	g_assert_cmpstr (nm_connection_get_interface_name (connection), ==, "wg-test0");
+	g_assert_cmpstr (nm_connection_get_connection_type (connection), ==, NM_SETTING_WIREGUARD_SETTING_NAME);
+
+	s_wg = NM_SETTING_WIREGUARD (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIREGUARD));
+
+	g_assert_cmpint (nm_setting_wireguard_get_listen_port (s_wg), ==, 51820);
+	g_assert_cmpstr (nm_setting_wireguard_get_private_key (s_wg), ==, "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk=");
+
+	g_assert_cmpint (nm_setting_wireguard_get_peers_len (s_wg), ==, 3);
+
+	peer = nm_setting_wireguard_get_peer (s_wg, 0);
+	g_assert_cmpstr (nm_wireguard_peer_get_public_key (peer), ==, "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=");
+	g_assert_cmpstr (nm_wireguard_peer_get_endpoint (peer), ==, "192.95.5.67:1234");
+	g_assert_cmpint (nm_wireguard_peer_get_allowed_ips_len (peer), ==, 2);
+	g_assert_cmpstr (nm_wireguard_peer_get_allowed_ip (peer, 0, NULL), ==, "10.192.122.3/32");
+	g_assert_cmpstr (nm_wireguard_peer_get_allowed_ip (peer, 1, NULL), ==, "10.192.124.1/24");
+
+	peer = nm_setting_wireguard_get_peer (s_wg, 1);
+	g_assert_cmpstr (nm_wireguard_peer_get_public_key (peer), ==, "TrMvSoP4jYQlY6RIzBgbssQqY3vxI2Pi+y71lOWWXX0=");
+	g_assert_cmpstr (nm_wireguard_peer_get_endpoint (peer), ==, "[2607:5300:60:6b0::c05f:543]:2468");
+	g_assert_cmpint (nm_wireguard_peer_get_allowed_ips_len (peer), ==, 2);
+	g_assert_cmpstr (nm_wireguard_peer_get_allowed_ip (peer, 0, NULL), ==, "10.192.122.4/32");
+	g_assert_cmpstr (nm_wireguard_peer_get_allowed_ip (peer, 1, NULL), ==, "192.168.0.0/16");
+
+	peer = nm_setting_wireguard_get_peer (s_wg, 2);
+	g_assert_cmpstr (nm_wireguard_peer_get_public_key (peer), ==, "gN65BkIKy1eCE9pP1wdc8ROUtkHLF2PfAqYdyYBz6EA=");
+	g_assert_cmpstr (nm_wireguard_peer_get_endpoint (peer), ==, "test.wireguard.com:18981");
+	g_assert_cmpint (nm_wireguard_peer_get_allowed_ips_len (peer), ==, 1);
+	g_assert_cmpstr (nm_wireguard_peer_get_allowed_ip (peer, 0, NULL), ==, "10.10.10.230/32");
+}
+
+static void
+test_client_import_wireguard_test1 (void)
+{
+	gs_free_error GError *error = NULL;
+
+	nm_vpn_wireguard_import (NM_BUILD_SRCDIR"/clients/common/tests/wg-test1.conf", &error);
+	g_assert_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT);
+	g_assert (g_str_has_prefix (error->message, "invalid secret 'PrivateKey'"));
+	g_assert (g_str_has_suffix (error->message, "wg-test1.conf:2"));
+}
+
+static void
+test_client_import_wireguard_test2 (void)
+{
+	gs_free_error GError *error = NULL;
+
+	nm_vpn_wireguard_import (NM_BUILD_SRCDIR"/clients/common/tests/wg-test2.conf", &error);
+
+	g_assert_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT);
+	g_assert (g_str_has_prefix (error->message, "unrecognized line at"));
+	g_assert (g_str_has_suffix (error->message, "wg-test2.conf:5"));
+}
+
+static void
+test_client_import_wireguard_test3 (void)
+{
+	gs_free_error GError *error = NULL;
+
+	nm_vpn_wireguard_import (NM_BUILD_SRCDIR"/clients/common/tests/wg-test3.conf", &error);
+	g_assert_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT);
+	g_assert (g_str_has_prefix (error->message, "invalid value for 'ListenPort'"));
+	g_assert (g_str_has_suffix (error->message, "wg-test3.conf:3"));
+}
+
+static void
+test_client_import_wireguard_missing (void)
+{
+	gs_free_error GError *error = NULL;
+
+	nm_vpn_wireguard_import (NM_BUILD_SRCDIR"/clients/common/tests/wg-missing.conf", &error);
+	g_assert_error (error, G_FILE_ERROR, G_FILE_ERROR_NOENT);
+}
+
+/*****************************************************************************/
+
 NMTST_DEFINE ();
 
 int
@@ -153,6 +244,11 @@ main (int argc, char **argv)
 	nmtst_init (&argc, &argv, TRUE);
 
 	g_test_add_func ("/client/meta/check", test_client_meta_check);
+	g_test_add_func ("/client/import/wireguard/test0", test_client_import_wireguard_test0);
+	g_test_add_func ("/client/import/wireguard/test1", test_client_import_wireguard_test1);
+	g_test_add_func ("/client/import/wireguard/test2", test_client_import_wireguard_test2);
+	g_test_add_func ("/client/import/wireguard/test3", test_client_import_wireguard_test3);
+	g_test_add_func ("/client/import/wireguard/missing", test_client_import_wireguard_missing);
 
 	return g_test_run ();
 }
diff --git a/clients/common/tests/wg-test0.conf b/clients/common/tests/wg-test0.conf
new file mode 100644
index 00000000..61438c29
--- /dev/null
+++ b/clients/common/tests/wg-test0.conf
@@ -0,0 +1,18 @@
+[Interface]
+PrivateKey = yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk=
+ListenPort = 51820
+
+[Peer]
+PublicKey = xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=
+Endpoint = 192.95.5.67:1234
+AllowedIPs = 10.192.122.3/32, 10.192.124.1/24
+
+[Peer]
+PublicKey = TrMvSoP4jYQlY6RIzBgbssQqY3vxI2Pi+y71lOWWXX0=
+Endpoint = [2607:5300:60:6b0::c05f:543]:2468
+AllowedIPs = 10.192.122.4/32, 192.168.0.0/16
+
+[Peer]
+PublicKey = gN65BkIKy1eCE9pP1wdc8ROUtkHLF2PfAqYdyYBz6EA=
+Endpoint = test.wireguard.com:18981
+AllowedIPs = 10.10.10.230/32
diff --git a/clients/common/tests/wg-test1.conf b/clients/common/tests/wg-test1.conf
new file mode 100644
index 00000000..ceb267ac
--- /dev/null
+++ b/clients/common/tests/wg-test1.conf
@@ -0,0 +1,3 @@
+[Interface]
+PrivateKey = bad
+ListenPort = 51820
diff --git a/clients/common/tests/wg-test2.conf b/clients/common/tests/wg-test2.conf
new file mode 100644
index 00000000..f691c2af
--- /dev/null
+++ b/clients/common/tests/wg-test2.conf
@@ -0,0 +1,8 @@
+[Interface]
+PrivateKey = yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk=
+ListenPort = 51820
+
+[Beer]
+PublicKey = xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=
+Endpoint = 192.95.5.67:1234
+AllowedIPs = 10.192.122.3/32, 10.192.124.1/24
diff --git a/clients/common/tests/wg-test3.conf b/clients/common/tests/wg-test3.conf
new file mode 100644
index 00000000..9956e400
--- /dev/null
+++ b/clients/common/tests/wg-test3.conf
@@ -0,0 +1,3 @@
+[Interface]
+PrivateKey = yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk=
+ListenPort = 666666666
diff --git a/clients/tests/test-client.check-on-disk/test_001.expected b/clients/tests/test-client.check-on-disk/test_001.expected
index c2e11e89..616e457c 100644
--- a/clients/tests/test-client.check-on-disk/test_001.expected
+++ b/clients/tests/test-client.check-on-disk/test_001.expected
@@ -1,5 +1,5 @@
 size: 395
-location: clients/tests/test-client.py:829:test_001()/1
+location: clients/tests/test-client.py:841:test_001()/1
 cmd: $NMCLI 
 lang: C
 returncode: 0
@@ -15,7 +15,7 @@ Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details.
 
 <<<
 size: 438
-location: clients/tests/test-client.py:829:test_001()/2
+location: clients/tests/test-client.py:841:test_001()/2
 cmd: $NMCLI 
 lang: pl_PL.UTF-8
 returncode: 0
@@ -33,7 +33,7 @@ o użyciu.
 
 <<<
 size: 188
-location: clients/tests/test-client.py:831:test_001()/3
+location: clients/tests/test-client.py:843:test_001()/3
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: C
 returncode: 10
@@ -43,7 +43,7 @@ Error: Device 'wlan0' not found.
 
 <<<
 size: 214
-location: clients/tests/test-client.py:831:test_001()/4
+location: clients/tests/test-client.py:843:test_001()/4
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: pl_PL.UTF-8
 returncode: 10
@@ -53,7 +53,7 @@ Błąd: Nie odnaleziono urządzenia „wlan0”.
 
 <<<
 size: 120
-location: clients/tests/test-client.py:833:test_001()/5
+location: clients/tests/test-client.py:845:test_001()/5
 cmd: $NMCLI c s
 lang: C
 returncode: 0
@@ -63,7 +63,7 @@ stdout: 1 bytes
 
 <<<
 size: 130
-location: clients/tests/test-client.py:833:test_001()/6
+location: clients/tests/test-client.py:845:test_001()/6
 cmd: $NMCLI c s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -73,7 +73,7 @@ stdout: 1 bytes
 
 <<<
 size: 192
-location: clients/tests/test-client.py:835:test_001()/7
+location: clients/tests/test-client.py:847:test_001()/7
 cmd: $NMCLI bogus s
 lang: C
 returncode: 2
@@ -83,7 +83,7 @@ Error: argument 'bogus' not understood. Try passing --help instead.
 
 <<<
 size: 221
-location: clients/tests/test-client.py:835:test_001()/8
+location: clients/tests/test-client.py:847:test_001()/8
 cmd: $NMCLI bogus s
 lang: pl_PL.UTF-8
 returncode: 2
@@ -92,12 +92,12 @@ stderr: 87 bytes
 Błąd: nie zrozumiano parametru „bogus”. Można użyć „--help” zamiast tego.
 
 <<<
-size: 1413
-location: clients/tests/test-client.py:838:test_001()/9
+size: 1488
+location: clients/tests/test-client.py:850:test_001()/9
 cmd: $NMCLI general permissions
 lang: C
 returncode: 0
-stdout: 1275 bytes
+stdout: 1350 bytes
 >>>
 PERMISSION                                                        VALUE   
 org.freedesktop.NetworkManager.enable-disable-network             yes     
@@ -116,14 +116,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1441
-location: clients/tests/test-client.py:838:test_001()/10
+size: 1517
+location: clients/tests/test-client.py:850:test_001()/10
 cmd: $NMCLI general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1292 bytes
+stdout: 1368 bytes
 >>>
 PERMISSION                                                        VALUE    
 org.freedesktop.NetworkManager.enable-disable-network             tak      
@@ -142,14 +143,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1543
-location: clients/tests/test-client.py:838:test_001()/11
+size: 1618
+location: clients/tests/test-client.py:850:test_001()/11
 cmd: $NMCLI --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1392 bytes
+stdout: 1467 bytes
 >>>
 PERMISSION                                                        VALUE   
 org.freedesktop.NetworkManager.enable-disable-network             yes     
@@ -168,14 +170,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1570
-location: clients/tests/test-client.py:838:test_001()/12
+size: 1646
+location: clients/tests/test-client.py:850:test_001()/12
 cmd: $NMCLI --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1409 bytes
+stdout: 1485 bytes
 >>>
 PERMISSION                                                        VALUE    
 org.freedesktop.NetworkManager.enable-disable-network             tak      
@@ -194,14 +197,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1620
-location: clients/tests/test-client.py:838:test_001()/13
+size: 1695
+location: clients/tests/test-client.py:850:test_001()/13
 cmd: $NMCLI --pretty general permissions
 lang: C
 returncode: 0
-stdout: 1472 bytes
+stdout: 1547 bytes
 >>>
 ==============================
   NetworkManager permissions
@@ -224,14 +228,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1677
-location: clients/tests/test-client.py:838:test_001()/14
+size: 1753
+location: clients/tests/test-client.py:850:test_001()/14
 cmd: $NMCLI --pretty general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1519 bytes
+stdout: 1595 bytes
 >>>
 =====================================
   Uprawnienia usługi NetworkManager
@@ -254,14 +259,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1749
-location: clients/tests/test-client.py:838:test_001()/15
+size: 1824
+location: clients/tests/test-client.py:850:test_001()/15
 cmd: $NMCLI --pretty --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1589 bytes
+stdout: 1664 bytes
 >>>
 ==============================
   NetworkManager permissions
@@ -284,14 +290,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1806
-location: clients/tests/test-client.py:838:test_001()/16
+size: 1882
+location: clients/tests/test-client.py:850:test_001()/16
 cmd: $NMCLI --pretty --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1636 bytes
+stdout: 1712 bytes
 >>>
 =====================================
   Uprawnienia usługi NetworkManager
@@ -314,14 +321,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1045
-location: clients/tests/test-client.py:838:test_001()/17
+size: 1094
+location: clients/tests/test-client.py:850:test_001()/17
 cmd: $NMCLI --terse general permissions
 lang: C
 returncode: 0
-stdout: 899 bytes
+stdout: 948 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -339,14 +347,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1055
-location: clients/tests/test-client.py:838:test_001()/18
+size: 1104
+location: clients/tests/test-client.py:850:test_001()/18
 cmd: $NMCLI --terse general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 899 bytes
+stdout: 948 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -364,14 +373,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1175
-location: clients/tests/test-client.py:838:test_001()/19
+size: 1224
+location: clients/tests/test-client.py:850:test_001()/19
 cmd: $NMCLI --terse --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1016 bytes
+stdout: 1065 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -389,14 +399,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1185
-location: clients/tests/test-client.py:838:test_001()/20
+size: 1234
+location: clients/tests/test-client.py:850:test_001()/20
 cmd: $NMCLI --terse --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1016 bytes
+stdout: 1065 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -414,14 +425,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1429
-location: clients/tests/test-client.py:838:test_001()/21
+size: 1504
+location: clients/tests/test-client.py:850:test_001()/21
 cmd: $NMCLI --mode tabular general permissions
 lang: C
 returncode: 0
-stdout: 1275 bytes
+stdout: 1350 bytes
 >>>
 PERMISSION                                                        VALUE   
 org.freedesktop.NetworkManager.enable-disable-network             yes     
@@ -440,14 +452,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1456
-location: clients/tests/test-client.py:838:test_001()/22
+size: 1532
+location: clients/tests/test-client.py:850:test_001()/22
 cmd: $NMCLI --mode tabular general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1292 bytes
+stdout: 1368 bytes
 >>>
 PERMISSION                                                        VALUE    
 org.freedesktop.NetworkManager.enable-disable-network             tak      
@@ -466,14 +479,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1558
-location: clients/tests/test-client.py:838:test_001()/23
+size: 1633
+location: clients/tests/test-client.py:850:test_001()/23
 cmd: $NMCLI --mode tabular --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1392 bytes
+stdout: 1467 bytes
 >>>
 PERMISSION                                                        VALUE   
 org.freedesktop.NetworkManager.enable-disable-network             yes     
@@ -492,14 +506,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1585
-location: clients/tests/test-client.py:838:test_001()/24
+size: 1661
+location: clients/tests/test-client.py:850:test_001()/24
 cmd: $NMCLI --mode tabular --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1409 bytes
+stdout: 1485 bytes
 >>>
 PERMISSION                                                        VALUE    
 org.freedesktop.NetworkManager.enable-disable-network             tak      
@@ -518,14 +533,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1635
-location: clients/tests/test-client.py:838:test_001()/25
+size: 1710
+location: clients/tests/test-client.py:850:test_001()/25
 cmd: $NMCLI --mode tabular --pretty general permissions
 lang: C
 returncode: 0
-stdout: 1472 bytes
+stdout: 1547 bytes
 >>>
 ==============================
   NetworkManager permissions
@@ -548,14 +564,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1692
-location: clients/tests/test-client.py:838:test_001()/26
+size: 1768
+location: clients/tests/test-client.py:850:test_001()/26
 cmd: $NMCLI --mode tabular --pretty general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1519 bytes
+stdout: 1595 bytes
 >>>
 =====================================
   Uprawnienia usługi NetworkManager
@@ -578,14 +595,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1764
-location: clients/tests/test-client.py:838:test_001()/27
+size: 1839
+location: clients/tests/test-client.py:850:test_001()/27
 cmd: $NMCLI --mode tabular --pretty --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1589 bytes
+stdout: 1664 bytes
 >>>
 ==============================
   NetworkManager permissions
@@ -608,14 +626,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1821
-location: clients/tests/test-client.py:838:test_001()/28
+size: 1897
+location: clients/tests/test-client.py:850:test_001()/28
 cmd: $NMCLI --mode tabular --pretty --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1636 bytes
+stdout: 1712 bytes
 >>>
 =====================================
   Uprawnienia usługi NetworkManager
@@ -638,14 +657,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1060
-location: clients/tests/test-client.py:838:test_001()/29
+size: 1109
+location: clients/tests/test-client.py:850:test_001()/29
 cmd: $NMCLI --mode tabular --terse general permissions
 lang: C
 returncode: 0
-stdout: 899 bytes
+stdout: 948 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -663,14 +683,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1070
-location: clients/tests/test-client.py:838:test_001()/30
+size: 1119
+location: clients/tests/test-client.py:850:test_001()/30
 cmd: $NMCLI --mode tabular --terse general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 899 bytes
+stdout: 948 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -688,14 +709,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1190
-location: clients/tests/test-client.py:838:test_001()/31
+size: 1239
+location: clients/tests/test-client.py:850:test_001()/31
 cmd: $NMCLI --mode tabular --terse --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1016 bytes
+stdout: 1065 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -713,14 +735,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1200
-location: clients/tests/test-client.py:838:test_001()/32
+size: 1249
+location: clients/tests/test-client.py:850:test_001()/32
 cmd: $NMCLI --mode tabular --terse --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1016 bytes
+stdout: 1065 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -738,14 +761,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 2335
-location: clients/tests/test-client.py:838:test_001()/33
+size: 2464
+location: clients/tests/test-client.py:850:test_001()/33
 cmd: $NMCLI --mode multiline general permissions
 lang: C
 returncode: 0
-stdout: 2179 bytes
+stdout: 2308 bytes
 >>>
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-network
 VALUE:                                  yes
@@ -779,14 +803,16 @@ PERMISSION:                             org.freedesktop.NetworkManager.enable-di
 VALUE:                                  unknown
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  unknown
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  unknown
 
 <<<
-size: 2351
-location: clients/tests/test-client.py:838:test_001()/34
+size: 2481
+location: clients/tests/test-client.py:850:test_001()/34
 cmd: $NMCLI --mode multiline general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2185 bytes
+stdout: 2315 bytes
 >>>
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-network
 VALUE:                                  tak
@@ -820,14 +846,16 @@ PERMISSION:                             org.freedesktop.NetworkManager.enable-di
 VALUE:                                  nieznane
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  nieznane
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  nieznane
 
 <<<
-size: 2464
-location: clients/tests/test-client.py:838:test_001()/35
+size: 2593
+location: clients/tests/test-client.py:850:test_001()/35
 cmd: $NMCLI --mode multiline --color yes general permissions
 lang: C
 returncode: 0
-stdout: 2296 bytes
+stdout: 2425 bytes
 >>>
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-network
 VALUE:                                  yes
@@ -861,14 +889,16 @@ PERMISSION:                             org.freedesktop.NetworkManager.enable-di
 VALUE:                                  unknown
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  unknown
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  unknown
 
 <<<
-size: 2480
-location: clients/tests/test-client.py:838:test_001()/36
+size: 2610
+location: clients/tests/test-client.py:850:test_001()/36
 cmd: $NMCLI --mode multiline --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2302 bytes
+stdout: 2432 bytes
 >>>
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-network
 VALUE:                                  tak
@@ -902,14 +932,16 @@ PERMISSION:                             org.freedesktop.NetworkManager.enable-di
 VALUE:                                  nieznane
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  nieznane
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  nieznane
 
 <<<
-size: 3837
-location: clients/tests/test-client.py:838:test_001()/37
+size: 4046
+location: clients/tests/test-client.py:850:test_001()/37
 cmd: $NMCLI --mode multiline --pretty general permissions
 lang: C
 returncode: 0
-stdout: 3672 bytes
+stdout: 3881 bytes
 >>>
 ===============================================================================
                           NetworkManager permissions
@@ -962,14 +994,17 @@ VALUE:                                  unknown
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  unknown
 -------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  unknown
+-------------------------------------------------------------------------------
 
 <<<
-size: 3858
-location: clients/tests/test-client.py:838:test_001()/38
+size: 4068
+location: clients/tests/test-client.py:850:test_001()/38
 cmd: $NMCLI --mode multiline --pretty general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3683 bytes
+stdout: 3893 bytes
 >>>
 ===============================================================================
                        Uprawnienia usługi NetworkManager
@@ -1022,14 +1057,17 @@ VALUE:                                  nieznane
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  nieznane
 -------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  nieznane
+-------------------------------------------------------------------------------
 
 <<<
-size: 3966
-location: clients/tests/test-client.py:838:test_001()/39
+size: 4175
+location: clients/tests/test-client.py:850:test_001()/39
 cmd: $NMCLI --mode multiline --pretty --color yes general permissions
 lang: C
 returncode: 0
-stdout: 3789 bytes
+stdout: 3998 bytes
 >>>
 ===============================================================================
                           NetworkManager permissions
@@ -1082,14 +1120,17 @@ VALUE:                                  unknown
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  unknown
 -------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  unknown
+-------------------------------------------------------------------------------
 
 <<<
-size: 3987
-location: clients/tests/test-client.py:838:test_001()/40
+size: 4197
+location: clients/tests/test-client.py:850:test_001()/40
 cmd: $NMCLI --mode multiline --pretty --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3800 bytes
+stdout: 4010 bytes
 >>>
 ===============================================================================
                        Uprawnienia usługi NetworkManager
@@ -1142,14 +1183,17 @@ VALUE:                                  nieznane
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  nieznane
 -------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  nieznane
+-------------------------------------------------------------------------------
 
 <<<
-size: 1335
-location: clients/tests/test-client.py:838:test_001()/41
+size: 1401
+location: clients/tests/test-client.py:850:test_001()/41
 cmd: $NMCLI --mode multiline --terse general permissions
 lang: C
 returncode: 0
-stdout: 1171 bytes
+stdout: 1237 bytes
 >>>
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
 VALUE:yes
@@ -1183,14 +1227,16 @@ PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
 VALUE:unknown
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.wifi.scan
+VALUE:unknown
 
 <<<
-size: 1345
-location: clients/tests/test-client.py:838:test_001()/42
+size: 1411
+location: clients/tests/test-client.py:850:test_001()/42
 cmd: $NMCLI --mode multiline --terse general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1171 bytes
+stdout: 1237 bytes
 >>>
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
 VALUE:yes
@@ -1224,14 +1270,16 @@ PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
 VALUE:unknown
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.wifi.scan
+VALUE:unknown
 
 <<<
-size: 1464
-location: clients/tests/test-client.py:838:test_001()/43
+size: 1530
+location: clients/tests/test-client.py:850:test_001()/43
 cmd: $NMCLI --mode multiline --terse --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1288 bytes
+stdout: 1354 bytes
 >>>
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
 VALUE:yes
@@ -1265,14 +1313,16 @@ PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
 VALUE:unknown
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.wifi.scan
+VALUE:unknown
 
 <<<
-size: 1474
-location: clients/tests/test-client.py:838:test_001()/44
+size: 1540
+location: clients/tests/test-client.py:850:test_001()/44
 cmd: $NMCLI --mode multiline --terse --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1288 bytes
+stdout: 1354 bytes
 >>>
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
 VALUE:yes
@@ -1306,5 +1356,7 @@ PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
 VALUE:unknown
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.wifi.scan
+VALUE:unknown
 
 <<<
diff --git a/clients/tests/test-client.check-on-disk/test_002.expected b/clients/tests/test-client.check-on-disk/test_002.expected
index 76b3ab58..a80fa009 100644
--- a/clients/tests/test-client.check-on-disk/test_002.expected
+++ b/clients/tests/test-client.check-on-disk/test_002.expected
@@ -1,5 +1,5 @@
 size: 377
-location: clients/tests/test-client.py:844:test_002()/1
+location: clients/tests/test-client.py:856:test_002()/1
 cmd: $NMCLI d
 lang: C
 returncode: 0
@@ -14,7 +14,7 @@ wlan1   wifi      unavailable  --
 
 <<<
 size: 392
-location: clients/tests/test-client.py:844:test_002()/2
+location: clients/tests/test-client.py:856:test_002()/2
 cmd: $NMCLI d
 lang: pl_PL.UTF-8
 returncode: 0
@@ -29,7 +29,7 @@ wlan1   wifi      niedostępne  --
 
 <<<
 size: 978
-location: clients/tests/test-client.py:846:test_002()/3
+location: clients/tests/test-client.py:858:test_002()/3
 cmd: $NMCLI -f all d
 lang: C
 returncode: 0
@@ -44,7 +44,7 @@ wlan1   wifi      unavailable  unknown           unknown           /org/freedesk
 
 <<<
 size: 993
-location: clients/tests/test-client.py:846:test_002()/4
+location: clients/tests/test-client.py:858:test_002()/4
 cmd: $NMCLI -f all d
 lang: pl_PL.UTF-8
 returncode: 0
@@ -59,7 +59,7 @@ wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedes
 
 <<<
 size: 739
-location: clients/tests/test-client.py:848:test_002()/5
+location: clients/tests/test-client.py:860:test_002()/5
 cmd: $NMCLI 
 lang: C
 returncode: 0
@@ -95,7 +95,7 @@ Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details.
 
 <<<
 size: 812
-location: clients/tests/test-client.py:848:test_002()/6
+location: clients/tests/test-client.py:860:test_002()/6
 cmd: $NMCLI 
 lang: pl_PL.UTF-8
 returncode: 0
@@ -132,12 +132,12 @@ Strony podręcznika nmcli(1) i nmcli-examples(5) zawierają pełne informacje
 o użyciu.
 
 <<<
-size: 1260
-location: clients/tests/test-client.py:850:test_002()/7
+size: 1250
+location: clients/tests/test-client.py:862:test_002()/7
 cmd: $NMCLI -f AP -mode multiline d show wlan0
 lang: C
 returncode: 0
-stdout: 1107 bytes
+stdout: 1097 bytes
 >>>
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-3
@@ -146,7 +146,7 @@ AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
-AP[1].SECURITY:                         WPA1 WPA2
+AP[1].SECURITY:                         WPA3
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
@@ -154,7 +154,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-2
 AP[3].MODE:                             Infra
@@ -165,12 +165,12 @@ AP[3].BARS:                             **
 AP[3].SECURITY:                         WPA1 WPA2
 
 <<<
-size: 1297
-location: clients/tests/test-client.py:850:test_002()/8
+size: 1287
+location: clients/tests/test-client.py:862:test_002()/8
 cmd: $NMCLI -f AP -mode multiline d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1134 bytes
+stdout: 1124 bytes
 >>>
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-3
@@ -179,7 +179,7 @@ AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
-AP[1].SECURITY:                         WPA1 WPA2
+AP[1].SECURITY:                         WPA3
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
@@ -187,7 +187,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-2
 AP[3].MODE:                             Infrastruktura
@@ -198,12 +198,12 @@ AP[3].BARS:                             **
 AP[3].SECURITY:                         WPA1 WPA2
 
 <<<
-size: 1714
-location: clients/tests/test-client.py:851:test_002()/9
+size: 1704
+location: clients/tests/test-client.py:863:test_002()/9
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: C
 returncode: 0
-stdout: 1558 bytes
+stdout: 1548 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -215,7 +215,7 @@ AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
-AP[1].SECURITY:                         WPA1 WPA2
+AP[1].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
@@ -224,7 +224,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-2
@@ -237,12 +237,12 @@ AP[3].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 
 <<<
-size: 1759
-location: clients/tests/test-client.py:851:test_002()/10
+size: 1749
+location: clients/tests/test-client.py:863:test_002()/10
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1592 bytes
+stdout: 1582 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -254,7 +254,7 @@ AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
-AP[1].SECURITY:                         WPA1 WPA2
+AP[1].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
@@ -263,7 +263,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-2
@@ -276,12 +276,12 @@ AP[3].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 
 <<<
-size: 591
-location: clients/tests/test-client.py:852:test_002()/11
+size: 581
+location: clients/tests/test-client.py:864:test_002()/11
 cmd: $NMCLI -f AP -mode multiline -t d show wlan0
 lang: C
 returncode: 0
-stdout: 435 bytes
+stdout: 425 bytes
 >>>
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-3
@@ -290,7 +290,7 @@ AP[1].CHAN:1
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:55
 AP[1].BARS:**  
-AP[1].SECURITY:WPA1 WPA2
+AP[1].SECURITY:WPA3
 AP[2].IN-USE: 
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
@@ -298,7 +298,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:44
 AP[2].BARS:**  
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-2
 AP[3].MODE:Infra
@@ -309,12 +309,12 @@ AP[3].BARS:**
 AP[3].SECURITY:WPA1 WPA2
 
 <<<
-size: 628
-location: clients/tests/test-client.py:852:test_002()/12
+size: 618
+location: clients/tests/test-client.py:864:test_002()/12
 cmd: $NMCLI -f AP -mode multiline -t d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 462 bytes
+stdout: 452 bytes
 >>>
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-3
@@ -323,7 +323,7 @@ AP[1].CHAN:1
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:55
 AP[1].BARS:**  
-AP[1].SECURITY:WPA1 WPA2
+AP[1].SECURITY:WPA3
 AP[2].IN-USE: 
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
@@ -331,7 +331,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:44
 AP[2].BARS:**  
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-2
 AP[3].MODE:Infrastruktura
@@ -343,33 +343,33 @@ AP[3].SECURITY:WPA1 WPA2
 
 <<<
 size: 455
-location: clients/tests/test-client.py:853:test_002()/13
+location: clients/tests/test-client.py:865:test_002()/13
 cmd: $NMCLI -f AP -mode tabular d show wlan0
 lang: C
 returncode: 0
 stdout: 304 bytes
 >>>
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1 WPA2 
+AP[1]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1      
 AP[3]          wlan0-ap-2  Infra  1     54 Mbit/s  34      **    WPA1 WPA2 
 
 <<<
 size: 499
-location: clients/tests/test-client.py:853:test_002()/14
+location: clients/tests/test-client.py:865:test_002()/14
 cmd: $NMCLI -f AP -mode tabular d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 338 bytes
 >>>
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1 WPA2 
+AP[1]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1      
 AP[3]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  34      **    WPA1 WPA2 
 
 <<<
 size: 614
-location: clients/tests/test-client.py:854:test_002()/15
+location: clients/tests/test-client.py:866:test_002()/15
 cmd: $NMCLI -f AP -mode tabular -p d show wlan0
 lang: C
 returncode: 0
@@ -380,13 +380,13 @@ stdout: 460 bytes
 ==========================
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
-AP[1]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1 WPA2 
+AP[1]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1      
 AP[3]          wlan0-ap-2  Infra  1     54 Mbit/s  34      **    WPA1 WPA2 
 
 <<<
 size: 694
-location: clients/tests/test-client.py:854:test_002()/16
+location: clients/tests/test-client.py:866:test_002()/16
 cmd: $NMCLI -f AP -mode tabular -p d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -397,45 +397,45 @@ stdout: 530 bytes
 ===================================
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
-AP[1]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1 WPA2 
+AP[1]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1      
 AP[3]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  34      **    WPA1 WPA2 
 
 <<<
-size: 319
-location: clients/tests/test-client.py:855:test_002()/17
+size: 309
+location: clients/tests/test-client.py:867:test_002()/17
 cmd: $NMCLI -f AP -mode tabular -t d show wlan0
 lang: C
 returncode: 0
-stdout: 165 bytes
+stdout: 155 bytes
 >>>
-AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:44:**  :WPA1 WPA2
+AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:44:**  :WPA1
 AP[3]: :wlan0-ap-2:Infra:1:54 Mbit/s:34:**  :WPA1 WPA2
 
 <<<
-size: 356
-location: clients/tests/test-client.py:855:test_002()/18
+size: 346
+location: clients/tests/test-client.py:867:test_002()/18
 cmd: $NMCLI -f AP -mode tabular -t d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 192 bytes
+stdout: 182 bytes
 >>>
-AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:44:**  :WPA1 WPA2
+AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:44:**  :WPA1
 AP[3]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:34:**  :WPA1 WPA2
 
 <<<
 size: 1973
-location: clients/tests/test-client.py:857:test_002()/19
+location: clients/tests/test-client.py:869:test_002()/19
 cmd: $NMCLI -f ALL d wifi
 lang: C
 returncode: 0
 stdout: 1840 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-3  776C616E302D61702D33  60:B3:25:25:E2:C8  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  90:B1:5F:9E:E0:E3  Infra  1     2412 MHz  54 Mbit/s  44      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[1]  wlan0-ap-3  776C616E302D61702D33  60:B3:25:25:E2:C8  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  90:B1:5F:9E:E0:E3  Infra  1     2412 MHz  54 Mbit/s  44      **    WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
 AP[3]  wlan0-ap-2  776C616E302D61702D32  61:66:D2:E7:44:A2  Infra  1     2412 MHz  54 Mbit/s  34      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
@@ -445,15 +445,15 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2041
-location: clients/tests/test-client.py:857:test_002()/20
+location: clients/tests/test-client.py:869:test_002()/20
 cmd: $NMCLI -f ALL d wifi
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1898 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-3  776C616E302D61702D33  60:B3:25:25:E2:C8  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  90:B1:5F:9E:E0:E3  Infrastruktura  1     2412 MHz  54 Mb/s  44      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[1]  wlan0-ap-3  776C616E302D61702D33  60:B3:25:25:E2:C8  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  90:B1:5F:9E:E0:E3  Infrastruktura  1     2412 MHz  54 Mb/s  44      **    WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
 AP[3]  wlan0-ap-2  776C616E302D61702D32  61:66:D2:E7:44:A2  Infrastruktura  1     2412 MHz  54 Mb/s  34      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
@@ -463,7 +463,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 246
-location: clients/tests/test-client.py:859:test_002()/21
+location: clients/tests/test-client.py:871:test_002()/21
 cmd: $NMCLI c
 lang: C
 returncode: 0
@@ -474,7 +474,7 @@ con-1  5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --
 
 <<<
 size: 256
-location: clients/tests/test-client.py:859:test_002()/22
+location: clients/tests/test-client.py:871:test_002()/22
 cmd: $NMCLI c
 lang: pl_PL.UTF-8
 returncode: 0
@@ -485,7 +485,7 @@ con-1  5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --
 
 <<<
 size: 1224
-location: clients/tests/test-client.py:861:test_002()/23
+location: clients/tests/test-client.py:873:test_002()/23
 cmd: $NMCLI c s con-1
 lang: C
 returncode: 0
@@ -517,7 +517,7 @@ connection.llmnr:                       -1 (default)
 
 <<<
 size: 1236
-location: clients/tests/test-client.py:861:test_002()/24
+location: clients/tests/test-client.py:873:test_002()/24
 cmd: $NMCLI c s con-1
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003.expected b/clients/tests/test-client.check-on-disk/test_003.expected
index 2ee10a52..c2eac2c6 100644
--- a/clients/tests/test-client.check-on-disk/test_003.expected
+++ b/clients/tests/test-client.check-on-disk/test_003.expected
@@ -1,5 +1,5 @@
 size: 244
-location: clients/tests/test-client.py:872:test_003()/1
+location: clients/tests/test-client.py:884:test_003()/1
 cmd: $NMCLI c add type ethernet ifname '*' con-name con-xx1
 lang: C
 returncode: 0
@@ -9,7 +9,7 @@ Connection 'con-xx1' (UUID-con-xx1-REPLACED-REPLACED-REPLA) successfully added.
 
 <<<
 size: 316
-location: clients/tests/test-client.py:875:test_003()/2
+location: clients/tests/test-client.py:887:test_003()/2
 cmd: $NMCLI c s
 lang: C
 returncode: 0
@@ -21,7 +21,7 @@ con-xx1  UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 326
-location: clients/tests/test-client.py:875:test_003()/3
+location: clients/tests/test-client.py:887:test_003()/3
 cmd: $NMCLI c s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -33,7 +33,7 @@ con-xx1  UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 332
-location: clients/tests/test-client.py:880:test_003()/4
+location: clients/tests/test-client.py:892:test_003()/4
 cmd: $NMCLI connection add type gsm autoconnect no con-name con-gsm1 ifname '*' apn xyz.con-gsm1 serial.baud 5 serial.send-delay 100 serial.pari 1
 lang: C
 returncode: 0
@@ -43,7 +43,7 @@ Connection 'con-gsm1' (UUID-con-gsm1-REPLACED-REPLACED-REPL) successfully added.
 
 <<<
 size: 228
-location: clients/tests/test-client.py:885:test_003()/5
+location: clients/tests/test-client.py:897:test_003()/5
 cmd: $NMCLI c add type ethernet ifname '*'
 lang: C
 returncode: 0
@@ -53,7 +53,7 @@ Connection 'ethernet' (UUID-ethernet-REPLACED-REPLACED-REPL) successfully added.
 
 <<<
 size: 451
-location: clients/tests/test-client.py:888:test_003()/6
+location: clients/tests/test-client.py:900:test_003()/6
 cmd: $NMCLI c s
 lang: C
 returncode: 0
@@ -67,7 +67,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --
 
 <<<
 size: 461
-location: clients/tests/test-client.py:888:test_003()/7
+location: clients/tests/test-client.py:900:test_003()/7
 cmd: $NMCLI c s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -81,7 +81,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --
 
 <<<
 size: 1514
-location: clients/tests/test-client.py:891:test_003()/8
+location: clients/tests/test-client.py:903:test_003()/8
 cmd: $NMCLI -f ALL c s
 lang: C
 returncode: 0
@@ -95,7 +95,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never
 
 <<<
 size: 1524
-location: clients/tests/test-client.py:891:test_003()/9
+location: clients/tests/test-client.py:903:test_003()/9
 cmd: $NMCLI -f ALL c s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -109,7 +109,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy
 
 <<<
 size: 229
-location: clients/tests/test-client.py:895:test_003()/10
+location: clients/tests/test-client.py:907:test_003()/10
 cmd: $NMCLI --complete-args -f ALL c s ''
 lang: C
 returncode: 0
@@ -130,7 +130,7 @@ path
 uuid
 <<<
 size: 239
-location: clients/tests/test-client.py:895:test_003()/11
+location: clients/tests/test-client.py:907:test_003()/11
 cmd: $NMCLI --complete-args -f ALL c s ''
 lang: pl_PL.UTF-8
 returncode: 0
@@ -151,7 +151,7 @@ path
 uuid
 <<<
 size: 3987
-location: clients/tests/test-client.py:898:test_003()/12
+location: clients/tests/test-client.py:910:test_003()/12
 cmd: $NMCLI con s con-gsm1
 lang: C
 returncode: 0
@@ -245,7 +245,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 4016
-location: clients/tests/test-client.py:898:test_003()/13
+location: clients/tests/test-client.py:910:test_003()/13
 cmd: $NMCLI con s con-gsm1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -339,7 +339,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 252
-location: clients/tests/test-client.py:911:test_003()/14
+location: clients/tests/test-client.py:923:test_003()/14
 cmd: $NMCLI con up ethernet ifname eth0
 lang: C
 returncode: 0
@@ -349,7 +349,7 @@ Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkMa
 
 <<<
 size: 452
-location: clients/tests/test-client.py:914:test_003()/15
+location: clients/tests/test-client.py:926:test_003()/15
 cmd: $NMCLI con
 lang: C
 returncode: 0
@@ -363,7 +363,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 462
-location: clients/tests/test-client.py:914:test_003()/16
+location: clients/tests/test-client.py:926:test_003()/16
 cmd: $NMCLI con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -377,7 +377,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 1730
-location: clients/tests/test-client.py:917:test_003()/17
+location: clients/tests/test-client.py:929:test_003()/17
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
@@ -391,7 +391,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 1745
-location: clients/tests/test-client.py:917:test_003()/18
+location: clients/tests/test-client.py:929:test_003()/18
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -405,7 +405,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 774
-location: clients/tests/test-client.py:920:test_003()/19
+location: clients/tests/test-client.py:932:test_003()/19
 cmd: $NMCLI -f ALL con s -a
 lang: C
 returncode: 0
@@ -416,7 +416,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never
 
 <<<
 size: 786
-location: clients/tests/test-client.py:920:test_003()/20
+location: clients/tests/test-client.py:932:test_003()/20
 cmd: $NMCLI -f ALL con s -a
 lang: pl_PL.UTF-8
 returncode: 0
@@ -427,7 +427,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy
 
 <<<
 size: 352
-location: clients/tests/test-client.py:923:test_003()/21
+location: clients/tests/test-client.py:935:test_003()/21
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: C
 returncode: 0
@@ -438,7 +438,7 @@ ACTIVE-PATH                                         DEVICE  UUID
 
 <<<
 size: 362
-location: clients/tests/test-client.py:923:test_003()/22
+location: clients/tests/test-client.py:935:test_003()/22
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: pl_PL.UTF-8
 returncode: 0
@@ -449,7 +449,7 @@ ACTIVE-PATH                                         DEVICE  UUID
 
 <<<
 size: 241
-location: clients/tests/test-client.py:926:test_003()/23
+location: clients/tests/test-client.py:938:test_003()/23
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: C
 returncode: 0
@@ -460,7 +460,7 @@ UUID-ethernet-REPLACED-REPLACED-REPL  ethernet
 
 <<<
 size: 251
-location: clients/tests/test-client.py:926:test_003()/24
+location: clients/tests/test-client.py:938:test_003()/24
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: pl_PL.UTF-8
 returncode: 0
@@ -471,7 +471,7 @@ UUID-ethernet-REPLACED-REPLACED-REPL  ethernet
 
 <<<
 size: 3805
-location: clients/tests/test-client.py:929:test_003()/25
+location: clients/tests/test-client.py:941:test_003()/25
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
@@ -561,7 +561,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3833
-location: clients/tests/test-client.py:929:test_003()/26
+location: clients/tests/test-client.py:941:test_003()/26
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -651,7 +651,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 199
-location: clients/tests/test-client.py:932:test_003()/27
+location: clients/tests/test-client.py:944:test_003()/27
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: C
 returncode: 0
@@ -661,7 +661,7 @@ GENERAL.STATE:                          activated
 
 <<<
 size: 210
-location: clients/tests/test-client.py:932:test_003()/28
+location: clients/tests/test-client.py:944:test_003()/28
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -671,7 +671,7 @@ GENERAL.STATE:                          aktywowano
 
 <<<
 size: 4462
-location: clients/tests/test-client.py:935:test_003()/29
+location: clients/tests/test-client.py:947:test_003()/29
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
@@ -773,7 +773,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4494
-location: clients/tests/test-client.py:935:test_003()/30
+location: clients/tests/test-client.py:947:test_003()/30
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -875,7 +875,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1459
-location: clients/tests/test-client.py:938:test_003()/31
+location: clients/tests/test-client.py:950:test_003()/31
 cmd: $NMCLI -f ALL dev s eth0
 lang: C
 returncode: 0
@@ -895,7 +895,7 @@ Unknown parameter: eth0
 
 <<<
 size: 1474
-location: clients/tests/test-client.py:938:test_003()/32
+location: clients/tests/test-client.py:950:test_003()/32
 cmd: $NMCLI -f ALL dev s eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -915,7 +915,7 @@ Nieznany parametr: eth0
 
 <<<
 size: 3494
-location: clients/tests/test-client.py:941:test_003()/33
+location: clients/tests/test-client.py:953:test_003()/33
 cmd: $NMCLI -f ALL dev show eth0
 lang: C
 returncode: 0
@@ -981,7 +981,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 3529
-location: clients/tests/test-client.py:941:test_003()/34
+location: clients/tests/test-client.py:953:test_003()/34
 cmd: $NMCLI -f ALL dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1047,7 +1047,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 2239
-location: clients/tests/test-client.py:944:test_003()/35
+location: clients/tests/test-client.py:956:test_003()/35
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: C
 returncode: 0
@@ -1113,7 +1113,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2249
-location: clients/tests/test-client.py:944:test_003()/36
+location: clients/tests/test-client.py:956:test_003()/36
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1179,7 +1179,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 252
-location: clients/tests/test-client.py:911:test_003()/37
+location: clients/tests/test-client.py:923:test_003()/37
 cmd: $NMCLI con up ethernet ifname eth1
 lang: C
 returncode: 0
@@ -1189,7 +1189,7 @@ Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkMa
 
 <<<
 size: 518
-location: clients/tests/test-client.py:914:test_003()/38
+location: clients/tests/test-client.py:926:test_003()/38
 cmd: $NMCLI con
 lang: C
 returncode: 0
@@ -1204,7 +1204,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 528
-location: clients/tests/test-client.py:914:test_003()/39
+location: clients/tests/test-client.py:926:test_003()/39
 cmd: $NMCLI con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1219,7 +1219,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 2050
-location: clients/tests/test-client.py:917:test_003()/40
+location: clients/tests/test-client.py:929:test_003()/40
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
@@ -1234,7 +1234,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2066
-location: clients/tests/test-client.py:917:test_003()/41
+location: clients/tests/test-client.py:929:test_003()/41
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1249,7 +1249,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 1094
-location: clients/tests/test-client.py:920:test_003()/42
+location: clients/tests/test-client.py:932:test_003()/42
 cmd: $NMCLI -f ALL con s -a
 lang: C
 returncode: 0
@@ -1261,7 +1261,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never
 
 <<<
 size: 1107
-location: clients/tests/test-client.py:920:test_003()/43
+location: clients/tests/test-client.py:932:test_003()/43
 cmd: $NMCLI -f ALL con s -a
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1273,7 +1273,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy
 
 <<<
 size: 450
-location: clients/tests/test-client.py:923:test_003()/44
+location: clients/tests/test-client.py:935:test_003()/44
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: C
 returncode: 0
@@ -1285,7 +1285,7 @@ ACTIVE-PATH                                         DEVICE  UUID
 
 <<<
 size: 460
-location: clients/tests/test-client.py:923:test_003()/45
+location: clients/tests/test-client.py:935:test_003()/45
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1297,7 +1297,7 @@ ACTIVE-PATH                                         DEVICE  UUID
 
 <<<
 size: 241
-location: clients/tests/test-client.py:926:test_003()/46
+location: clients/tests/test-client.py:938:test_003()/46
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: C
 returncode: 0
@@ -1308,7 +1308,7 @@ UUID-ethernet-REPLACED-REPLACED-REPL  ethernet
 
 <<<
 size: 251
-location: clients/tests/test-client.py:926:test_003()/47
+location: clients/tests/test-client.py:938:test_003()/47
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1319,7 +1319,7 @@ UUID-ethernet-REPLACED-REPLACED-REPL  ethernet
 
 <<<
 size: 3805
-location: clients/tests/test-client.py:929:test_003()/48
+location: clients/tests/test-client.py:941:test_003()/48
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
@@ -1409,7 +1409,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3833
-location: clients/tests/test-client.py:929:test_003()/49
+location: clients/tests/test-client.py:941:test_003()/49
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1499,7 +1499,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 251
-location: clients/tests/test-client.py:932:test_003()/50
+location: clients/tests/test-client.py:944:test_003()/50
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: C
 returncode: 0
@@ -1511,7 +1511,7 @@ GENERAL.STATE:                          activated
 
 <<<
 size: 263
-location: clients/tests/test-client.py:932:test_003()/51
+location: clients/tests/test-client.py:944:test_003()/51
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1523,7 +1523,7 @@ GENERAL.STATE:                          aktywowano
 
 <<<
 size: 5127
-location: clients/tests/test-client.py:935:test_003()/52
+location: clients/tests/test-client.py:947:test_003()/52
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
@@ -1638,7 +1638,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5163
-location: clients/tests/test-client.py:935:test_003()/53
+location: clients/tests/test-client.py:947:test_003()/53
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1753,7 +1753,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1459
-location: clients/tests/test-client.py:938:test_003()/54
+location: clients/tests/test-client.py:950:test_003()/54
 cmd: $NMCLI -f ALL dev s eth0
 lang: C
 returncode: 0
@@ -1773,7 +1773,7 @@ Unknown parameter: eth0
 
 <<<
 size: 1474
-location: clients/tests/test-client.py:938:test_003()/55
+location: clients/tests/test-client.py:950:test_003()/55
 cmd: $NMCLI -f ALL dev s eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1793,7 +1793,7 @@ Nieznany parametr: eth0
 
 <<<
 size: 3494
-location: clients/tests/test-client.py:941:test_003()/56
+location: clients/tests/test-client.py:953:test_003()/56
 cmd: $NMCLI -f ALL dev show eth0
 lang: C
 returncode: 0
@@ -1859,7 +1859,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 3529
-location: clients/tests/test-client.py:941:test_003()/57
+location: clients/tests/test-client.py:953:test_003()/57
 cmd: $NMCLI -f ALL dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1925,7 +1925,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 2239
-location: clients/tests/test-client.py:944:test_003()/58
+location: clients/tests/test-client.py:956:test_003()/58
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: C
 returncode: 0
@@ -1991,7 +1991,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2249
-location: clients/tests/test-client.py:944:test_003()/59
+location: clients/tests/test-client.py:956:test_003()/59
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2057,7 +2057,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2068
-location: clients/tests/test-client.py:959:test_003()/60
+location: clients/tests/test-client.py:971:test_003()/60
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
@@ -2072,7 +2072,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2090
-location: clients/tests/test-client.py:959:test_003()/61
+location: clients/tests/test-client.py:971:test_003()/61
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2087,7 +2087,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 375
-location: clients/tests/test-client.py:962:test_003()/62
+location: clients/tests/test-client.py:974:test_003()/62
 cmd: $NMCLI -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -2101,7 +2101,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 385
-location: clients/tests/test-client.py:962:test_003()/63
+location: clients/tests/test-client.py:974:test_003()/63
 cmd: $NMCLI -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2115,7 +2115,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 5130
-location: clients/tests/test-client.py:965:test_003()/64
+location: clients/tests/test-client.py:977:test_003()/64
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
@@ -2230,7 +2230,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5167
-location: clients/tests/test-client.py:965:test_003()/65
+location: clients/tests/test-client.py:977:test_003()/65
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2345,7 +2345,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4505
-location: clients/tests/test-client.py:968:test_003()/66
+location: clients/tests/test-client.py:980:test_003()/66
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -2447,7 +2447,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4538
-location: clients/tests/test-client.py:968:test_003()/67
+location: clients/tests/test-client.py:980:test_003()/67
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2549,7 +2549,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 3494
-location: clients/tests/test-client.py:971:test_003()/68
+location: clients/tests/test-client.py:983:test_003()/68
 cmd: $NMCLI -f all dev show eth0
 lang: C
 returncode: 0
@@ -2615,7 +2615,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 3529
-location: clients/tests/test-client.py:971:test_003()/69
+location: clients/tests/test-client.py:983:test_003()/69
 cmd: $NMCLI -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2681,7 +2681,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 2350
-location: clients/tests/test-client.py:959:test_003()/70
+location: clients/tests/test-client.py:971:test_003()/70
 cmd: $NMCLI --color yes -f ALL con
 lang: C
 returncode: 0
@@ -2696,7 +2696,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2372
-location: clients/tests/test-client.py:959:test_003()/71
+location: clients/tests/test-client.py:971:test_003()/71
 cmd: $NMCLI --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2711,7 +2711,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 405
-location: clients/tests/test-client.py:962:test_003()/72
+location: clients/tests/test-client.py:974:test_003()/72
 cmd: $NMCLI --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -2725,7 +2725,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 415
-location: clients/tests/test-client.py:962:test_003()/73
+location: clients/tests/test-client.py:974:test_003()/73
 cmd: $NMCLI --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2739,7 +2739,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 5142
-location: clients/tests/test-client.py:965:test_003()/74
+location: clients/tests/test-client.py:977:test_003()/74
 cmd: $NMCLI --color yes con s ethernet
 lang: C
 returncode: 0
@@ -2854,7 +2854,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5179
-location: clients/tests/test-client.py:965:test_003()/75
+location: clients/tests/test-client.py:977:test_003()/75
 cmd: $NMCLI --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2969,7 +2969,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4517
-location: clients/tests/test-client.py:968:test_003()/76
+location: clients/tests/test-client.py:980:test_003()/76
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -3071,7 +3071,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4550
-location: clients/tests/test-client.py:968:test_003()/77
+location: clients/tests/test-client.py:980:test_003()/77
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3173,7 +3173,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 3506
-location: clients/tests/test-client.py:971:test_003()/78
+location: clients/tests/test-client.py:983:test_003()/78
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -3239,7 +3239,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 3541
-location: clients/tests/test-client.py:971:test_003()/79
+location: clients/tests/test-client.py:983:test_003()/79
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3305,7 +3305,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 2554
-location: clients/tests/test-client.py:959:test_003()/80
+location: clients/tests/test-client.py:971:test_003()/80
 cmd: $NMCLI --pretty -f ALL con
 lang: C
 returncode: 0
@@ -3324,7 +3324,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2598
-location: clients/tests/test-client.py:959:test_003()/81
+location: clients/tests/test-client.py:971:test_003()/81
 cmd: $NMCLI --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3343,7 +3343,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 586
-location: clients/tests/test-client.py:962:test_003()/82
+location: clients/tests/test-client.py:974:test_003()/82
 cmd: $NMCLI --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -3361,7 +3361,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 616
-location: clients/tests/test-client.py:962:test_003()/83
+location: clients/tests/test-client.py:974:test_003()/83
 cmd: $NMCLI --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3379,7 +3379,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 6384
-location: clients/tests/test-client.py:965:test_003()/84
+location: clients/tests/test-client.py:977:test_003()/84
 cmd: $NMCLI --pretty con s ethernet
 lang: C
 returncode: 0
@@ -3510,7 +3510,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 6440
-location: clients/tests/test-client.py:965:test_003()/85
+location: clients/tests/test-client.py:977:test_003()/85
 cmd: $NMCLI --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3641,7 +3641,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5446
-location: clients/tests/test-client.py:968:test_003()/86
+location: clients/tests/test-client.py:980:test_003()/86
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -3755,7 +3755,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5491
-location: clients/tests/test-client.py:968:test_003()/87
+location: clients/tests/test-client.py:980:test_003()/87
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3869,7 +3869,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4354
-location: clients/tests/test-client.py:971:test_003()/88
+location: clients/tests/test-client.py:983:test_003()/88
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: C
 returncode: 0
@@ -3946,7 +3946,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 4395
-location: clients/tests/test-client.py:971:test_003()/89
+location: clients/tests/test-client.py:983:test_003()/89
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4023,7 +4023,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 2836
-location: clients/tests/test-client.py:959:test_003()/90
+location: clients/tests/test-client.py:971:test_003()/90
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -4042,7 +4042,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2880
-location: clients/tests/test-client.py:959:test_003()/91
+location: clients/tests/test-client.py:971:test_003()/91
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4061,7 +4061,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 616
-location: clients/tests/test-client.py:962:test_003()/92
+location: clients/tests/test-client.py:974:test_003()/92
 cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -4079,7 +4079,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 646
-location: clients/tests/test-client.py:962:test_003()/93
+location: clients/tests/test-client.py:974:test_003()/93
 cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4097,7 +4097,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 6396
-location: clients/tests/test-client.py:965:test_003()/94
+location: clients/tests/test-client.py:977:test_003()/94
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: C
 returncode: 0
@@ -4228,7 +4228,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 6452
-location: clients/tests/test-client.py:965:test_003()/95
+location: clients/tests/test-client.py:977:test_003()/95
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4359,7 +4359,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5458
-location: clients/tests/test-client.py:968:test_003()/96
+location: clients/tests/test-client.py:980:test_003()/96
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -4473,7 +4473,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5503
-location: clients/tests/test-client.py:968:test_003()/97
+location: clients/tests/test-client.py:980:test_003()/97
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4587,7 +4587,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4366
-location: clients/tests/test-client.py:971:test_003()/98
+location: clients/tests/test-client.py:983:test_003()/98
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -4664,7 +4664,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 4407
-location: clients/tests/test-client.py:971:test_003()/99
+location: clients/tests/test-client.py:983:test_003()/99
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4741,7 +4741,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 1185
-location: clients/tests/test-client.py:959:test_003()/100
+location: clients/tests/test-client.py:971:test_003()/100
 cmd: $NMCLI --terse -f ALL con
 lang: C
 returncode: 0
@@ -4755,7 +4755,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1195
-location: clients/tests/test-client.py:959:test_003()/101
+location: clients/tests/test-client.py:971:test_003()/101
 cmd: $NMCLI --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4769,7 +4769,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 341
-location: clients/tests/test-client.py:962:test_003()/102
+location: clients/tests/test-client.py:974:test_003()/102
 cmd: $NMCLI --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -4782,7 +4782,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 351
-location: clients/tests/test-client.py:962:test_003()/103
+location: clients/tests/test-client.py:974:test_003()/103
 cmd: $NMCLI --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4795,7 +4795,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 2769
-location: clients/tests/test-client.py:965:test_003()/104
+location: clients/tests/test-client.py:977:test_003()/104
 cmd: $NMCLI --terse con s ethernet
 lang: C
 returncode: 0
@@ -4910,7 +4910,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2779
-location: clients/tests/test-client.py:965:test_003()/105
+location: clients/tests/test-client.py:977:test_003()/105
 cmd: $NMCLI --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5025,7 +5025,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2441
-location: clients/tests/test-client.py:968:test_003()/106
+location: clients/tests/test-client.py:980:test_003()/106
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -5127,7 +5127,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2451
-location: clients/tests/test-client.py:968:test_003()/107
+location: clients/tests/test-client.py:980:test_003()/107
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5229,7 +5229,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2245
-location: clients/tests/test-client.py:971:test_003()/108
+location: clients/tests/test-client.py:983:test_003()/108
 cmd: $NMCLI --terse -f all dev show eth0
 lang: C
 returncode: 0
@@ -5295,7 +5295,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2255
-location: clients/tests/test-client.py:971:test_003()/109
+location: clients/tests/test-client.py:983:test_003()/109
 cmd: $NMCLI --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5361,7 +5361,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 1467
-location: clients/tests/test-client.py:959:test_003()/110
+location: clients/tests/test-client.py:971:test_003()/110
 cmd: $NMCLI --terse --color yes -f ALL con
 lang: C
 returncode: 0
@@ -5375,7 +5375,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1477
-location: clients/tests/test-client.py:959:test_003()/111
+location: clients/tests/test-client.py:971:test_003()/111
 cmd: $NMCLI --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5389,7 +5389,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 371
-location: clients/tests/test-client.py:962:test_003()/112
+location: clients/tests/test-client.py:974:test_003()/112
 cmd: $NMCLI --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -5402,7 +5402,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 381
-location: clients/tests/test-client.py:962:test_003()/113
+location: clients/tests/test-client.py:974:test_003()/113
 cmd: $NMCLI --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5415,7 +5415,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 2781
-location: clients/tests/test-client.py:965:test_003()/114
+location: clients/tests/test-client.py:977:test_003()/114
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: C
 returncode: 0
@@ -5530,7 +5530,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2791
-location: clients/tests/test-client.py:965:test_003()/115
+location: clients/tests/test-client.py:977:test_003()/115
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5645,7 +5645,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2453
-location: clients/tests/test-client.py:968:test_003()/116
+location: clients/tests/test-client.py:980:test_003()/116
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -5747,7 +5747,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2463
-location: clients/tests/test-client.py:968:test_003()/117
+location: clients/tests/test-client.py:980:test_003()/117
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5849,7 +5849,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2257
-location: clients/tests/test-client.py:971:test_003()/118
+location: clients/tests/test-client.py:983:test_003()/118
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -5915,7 +5915,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2267
-location: clients/tests/test-client.py:971:test_003()/119
+location: clients/tests/test-client.py:983:test_003()/119
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5981,7 +5981,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2084
-location: clients/tests/test-client.py:959:test_003()/120
+location: clients/tests/test-client.py:971:test_003()/120
 cmd: $NMCLI --mode tabular -f ALL con
 lang: C
 returncode: 0
@@ -5996,7 +5996,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2106
-location: clients/tests/test-client.py:959:test_003()/121
+location: clients/tests/test-client.py:971:test_003()/121
 cmd: $NMCLI --mode tabular -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6011,7 +6011,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 391
-location: clients/tests/test-client.py:962:test_003()/122
+location: clients/tests/test-client.py:974:test_003()/122
 cmd: $NMCLI --mode tabular -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -6025,7 +6025,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 401
-location: clients/tests/test-client.py:962:test_003()/123
+location: clients/tests/test-client.py:974:test_003()/123
 cmd: $NMCLI --mode tabular -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6039,7 +6039,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 3416
-location: clients/tests/test-client.py:965:test_003()/124
+location: clients/tests/test-client.py:977:test_003()/124
 cmd: $NMCLI --mode tabular con s ethernet
 lang: C
 returncode: 0
@@ -6070,7 +6070,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 3450
-location: clients/tests/test-client.py:965:test_003()/125
+location: clients/tests/test-client.py:977:test_003()/125
 cmd: $NMCLI --mode tabular con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6101,7 +6101,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 2974
-location: clients/tests/test-client.py:968:test_003()/126
+location: clients/tests/test-client.py:980:test_003()/126
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -6128,7 +6128,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 3006
-location: clients/tests/test-client.py:968:test_003()/127
+location: clients/tests/test-client.py:980:test_003()/127
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6155,7 +6155,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 2971
-location: clients/tests/test-client.py:971:test_003()/128
+location: clients/tests/test-client.py:983:test_003()/128
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: C
 returncode: 0
@@ -6187,7 +6187,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 3002
-location: clients/tests/test-client.py:971:test_003()/129
+location: clients/tests/test-client.py:983:test_003()/129
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6219,7 +6219,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 2366
-location: clients/tests/test-client.py:959:test_003()/130
+location: clients/tests/test-client.py:971:test_003()/130
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: C
 returncode: 0
@@ -6234,7 +6234,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2388
-location: clients/tests/test-client.py:959:test_003()/131
+location: clients/tests/test-client.py:971:test_003()/131
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6249,7 +6249,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 421
-location: clients/tests/test-client.py:962:test_003()/132
+location: clients/tests/test-client.py:974:test_003()/132
 cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -6263,7 +6263,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 431
-location: clients/tests/test-client.py:962:test_003()/133
+location: clients/tests/test-client.py:974:test_003()/133
 cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6277,7 +6277,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 3428
-location: clients/tests/test-client.py:965:test_003()/134
+location: clients/tests/test-client.py:977:test_003()/134
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: C
 returncode: 0
@@ -6308,7 +6308,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 3462
-location: clients/tests/test-client.py:965:test_003()/135
+location: clients/tests/test-client.py:977:test_003()/135
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6339,7 +6339,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 2986
-location: clients/tests/test-client.py:968:test_003()/136
+location: clients/tests/test-client.py:980:test_003()/136
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -6366,7 +6366,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 3018
-location: clients/tests/test-client.py:968:test_003()/137
+location: clients/tests/test-client.py:980:test_003()/137
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6393,7 +6393,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 2983
-location: clients/tests/test-client.py:971:test_003()/138
+location: clients/tests/test-client.py:983:test_003()/138
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -6425,7 +6425,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 3014
-location: clients/tests/test-client.py:971:test_003()/139
+location: clients/tests/test-client.py:983:test_003()/139
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6457,7 +6457,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 2570
-location: clients/tests/test-client.py:959:test_003()/140
+location: clients/tests/test-client.py:971:test_003()/140
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: C
 returncode: 0
@@ -6476,7 +6476,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2614
-location: clients/tests/test-client.py:959:test_003()/141
+location: clients/tests/test-client.py:971:test_003()/141
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6495,7 +6495,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 602
-location: clients/tests/test-client.py:962:test_003()/142
+location: clients/tests/test-client.py:974:test_003()/142
 cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -6513,7 +6513,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 632
-location: clients/tests/test-client.py:962:test_003()/143
+location: clients/tests/test-client.py:974:test_003()/143
 cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6531,7 +6531,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 5607
-location: clients/tests/test-client.py:965:test_003()/144
+location: clients/tests/test-client.py:977:test_003()/144
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: C
 returncode: 0
@@ -6578,7 +6578,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 5701
-location: clients/tests/test-client.py:965:test_003()/145
+location: clients/tests/test-client.py:977:test_003()/145
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6625,7 +6625,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 4713
-location: clients/tests/test-client.py:968:test_003()/146
+location: clients/tests/test-client.py:980:test_003()/146
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -6664,7 +6664,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 4785
-location: clients/tests/test-client.py:968:test_003()/147
+location: clients/tests/test-client.py:980:test_003()/147
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6703,7 +6703,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 4468
-location: clients/tests/test-client.py:971:test_003()/148
+location: clients/tests/test-client.py:983:test_003()/148
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: C
 returncode: 0
@@ -6746,7 +6746,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 4536
-location: clients/tests/test-client.py:971:test_003()/149
+location: clients/tests/test-client.py:983:test_003()/149
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6789,7 +6789,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 2852
-location: clients/tests/test-client.py:959:test_003()/150
+location: clients/tests/test-client.py:971:test_003()/150
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -6808,7 +6808,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2896
-location: clients/tests/test-client.py:959:test_003()/151
+location: clients/tests/test-client.py:971:test_003()/151
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6827,7 +6827,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 632
-location: clients/tests/test-client.py:962:test_003()/152
+location: clients/tests/test-client.py:974:test_003()/152
 cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -6845,7 +6845,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 662
-location: clients/tests/test-client.py:962:test_003()/153
+location: clients/tests/test-client.py:974:test_003()/153
 cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6863,7 +6863,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 5619
-location: clients/tests/test-client.py:965:test_003()/154
+location: clients/tests/test-client.py:977:test_003()/154
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: C
 returncode: 0
@@ -6910,7 +6910,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 5713
-location: clients/tests/test-client.py:965:test_003()/155
+location: clients/tests/test-client.py:977:test_003()/155
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6957,7 +6957,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 4725
-location: clients/tests/test-client.py:968:test_003()/156
+location: clients/tests/test-client.py:980:test_003()/156
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -6996,7 +6996,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 4797
-location: clients/tests/test-client.py:968:test_003()/157
+location: clients/tests/test-client.py:980:test_003()/157
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7035,7 +7035,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 4480
-location: clients/tests/test-client.py:971:test_003()/158
+location: clients/tests/test-client.py:983:test_003()/158
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -7078,7 +7078,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 4548
-location: clients/tests/test-client.py:971:test_003()/159
+location: clients/tests/test-client.py:983:test_003()/159
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7121,7 +7121,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 1200
-location: clients/tests/test-client.py:959:test_003()/160
+location: clients/tests/test-client.py:971:test_003()/160
 cmd: $NMCLI --mode tabular --terse -f ALL con
 lang: C
 returncode: 0
@@ -7135,7 +7135,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1210
-location: clients/tests/test-client.py:959:test_003()/161
+location: clients/tests/test-client.py:971:test_003()/161
 cmd: $NMCLI --mode tabular --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7149,7 +7149,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 356
-location: clients/tests/test-client.py:962:test_003()/162
+location: clients/tests/test-client.py:974:test_003()/162
 cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -7162,7 +7162,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 366
-location: clients/tests/test-client.py:962:test_003()/163
+location: clients/tests/test-client.py:974:test_003()/163
 cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7175,7 +7175,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 828
-location: clients/tests/test-client.py:965:test_003()/164
+location: clients/tests/test-client.py:977:test_003()/164
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: C
 returncode: 0
@@ -7192,7 +7192,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 838
-location: clients/tests/test-client.py:965:test_003()/165
+location: clients/tests/test-client.py:977:test_003()/165
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7209,7 +7209,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 681
-location: clients/tests/test-client.py:968:test_003()/166
+location: clients/tests/test-client.py:980:test_003()/166
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -7224,7 +7224,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 691
-location: clients/tests/test-client.py:968:test_003()/167
+location: clients/tests/test-client.py:980:test_003()/167
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7239,7 +7239,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 1375
-location: clients/tests/test-client.py:971:test_003()/168
+location: clients/tests/test-client.py:983:test_003()/168
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: C
 returncode: 0
@@ -7256,7 +7256,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 1385
-location: clients/tests/test-client.py:971:test_003()/169
+location: clients/tests/test-client.py:983:test_003()/169
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7273,7 +7273,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 1482
-location: clients/tests/test-client.py:959:test_003()/170
+location: clients/tests/test-client.py:971:test_003()/170
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
 lang: C
 returncode: 0
@@ -7287,7 +7287,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1492
-location: clients/tests/test-client.py:959:test_003()/171
+location: clients/tests/test-client.py:971:test_003()/171
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7301,7 +7301,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 386
-location: clients/tests/test-client.py:962:test_003()/172
+location: clients/tests/test-client.py:974:test_003()/172
 cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -7314,7 +7314,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 396
-location: clients/tests/test-client.py:962:test_003()/173
+location: clients/tests/test-client.py:974:test_003()/173
 cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7327,7 +7327,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 840
-location: clients/tests/test-client.py:965:test_003()/174
+location: clients/tests/test-client.py:977:test_003()/174
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: C
 returncode: 0
@@ -7344,7 +7344,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 850
-location: clients/tests/test-client.py:965:test_003()/175
+location: clients/tests/test-client.py:977:test_003()/175
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7361,7 +7361,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 693
-location: clients/tests/test-client.py:968:test_003()/176
+location: clients/tests/test-client.py:980:test_003()/176
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -7376,7 +7376,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 703
-location: clients/tests/test-client.py:968:test_003()/177
+location: clients/tests/test-client.py:980:test_003()/177
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7391,7 +7391,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 1387
-location: clients/tests/test-client.py:971:test_003()/178
+location: clients/tests/test-client.py:983:test_003()/178
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -7408,7 +7408,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 1397
-location: clients/tests/test-client.py:971:test_003()/179
+location: clients/tests/test-client.py:983:test_003()/179
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7425,7 +7425,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 4198
-location: clients/tests/test-client.py:959:test_003()/180
+location: clients/tests/test-client.py:971:test_003()/180
 cmd: $NMCLI --mode multiline -f ALL con
 lang: C
 returncode: 0
@@ -7509,7 +7509,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4220
-location: clients/tests/test-client.py:959:test_003()/181
+location: clients/tests/test-client.py:971:test_003()/181
 cmd: $NMCLI --mode multiline -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7593,7 +7593,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 652
-location: clients/tests/test-client.py:962:test_003()/182
+location: clients/tests/test-client.py:974:test_003()/182
 cmd: $NMCLI --mode multiline -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -7610,7 +7610,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 662
-location: clients/tests/test-client.py:962:test_003()/183
+location: clients/tests/test-client.py:974:test_003()/183
 cmd: $NMCLI --mode multiline -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7627,7 +7627,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 5148
-location: clients/tests/test-client.py:965:test_003()/184
+location: clients/tests/test-client.py:977:test_003()/184
 cmd: $NMCLI --mode multiline con s ethernet
 lang: C
 returncode: 0
@@ -7742,7 +7742,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5185
-location: clients/tests/test-client.py:965:test_003()/185
+location: clients/tests/test-client.py:977:test_003()/185
 cmd: $NMCLI --mode multiline con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7857,7 +7857,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4523
-location: clients/tests/test-client.py:968:test_003()/186
+location: clients/tests/test-client.py:980:test_003()/186
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -7959,7 +7959,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4556
-location: clients/tests/test-client.py:968:test_003()/187
+location: clients/tests/test-client.py:980:test_003()/187
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8061,7 +8061,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 3512
-location: clients/tests/test-client.py:971:test_003()/188
+location: clients/tests/test-client.py:983:test_003()/188
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: C
 returncode: 0
@@ -8127,7 +8127,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 3547
-location: clients/tests/test-client.py:971:test_003()/189
+location: clients/tests/test-client.py:983:test_003()/189
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8193,7 +8193,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 4480
-location: clients/tests/test-client.py:959:test_003()/190
+location: clients/tests/test-client.py:971:test_003()/190
 cmd: $NMCLI --mode multiline --color yes -f ALL con
 lang: C
 returncode: 0
@@ -8277,7 +8277,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4502
-location: clients/tests/test-client.py:959:test_003()/191
+location: clients/tests/test-client.py:971:test_003()/191
 cmd: $NMCLI --mode multiline --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8361,7 +8361,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 682
-location: clients/tests/test-client.py:962:test_003()/192
+location: clients/tests/test-client.py:974:test_003()/192
 cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -8378,7 +8378,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 692
-location: clients/tests/test-client.py:962:test_003()/193
+location: clients/tests/test-client.py:974:test_003()/193
 cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8395,7 +8395,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 5160
-location: clients/tests/test-client.py:965:test_003()/194
+location: clients/tests/test-client.py:977:test_003()/194
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: C
 returncode: 0
@@ -8510,7 +8510,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5197
-location: clients/tests/test-client.py:965:test_003()/195
+location: clients/tests/test-client.py:977:test_003()/195
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8625,7 +8625,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4535
-location: clients/tests/test-client.py:968:test_003()/196
+location: clients/tests/test-client.py:980:test_003()/196
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -8727,7 +8727,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4568
-location: clients/tests/test-client.py:968:test_003()/197
+location: clients/tests/test-client.py:980:test_003()/197
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8829,7 +8829,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 3524
-location: clients/tests/test-client.py:971:test_003()/198
+location: clients/tests/test-client.py:983:test_003()/198
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -8895,7 +8895,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 3559
-location: clients/tests/test-client.py:971:test_003()/199
+location: clients/tests/test-client.py:983:test_003()/199
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8961,7 +8961,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 4824
-location: clients/tests/test-client.py:959:test_003()/200
+location: clients/tests/test-client.py:971:test_003()/200
 cmd: $NMCLI --mode multiline --pretty -f ALL con
 lang: C
 returncode: 0
@@ -9053,7 +9053,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4852
-location: clients/tests/test-client.py:959:test_003()/201
+location: clients/tests/test-client.py:971:test_003()/201
 cmd: $NMCLI --mode multiline --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9145,7 +9145,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 1199
-location: clients/tests/test-client.py:962:test_003()/202
+location: clients/tests/test-client.py:974:test_003()/202
 cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -9169,7 +9169,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 1215
-location: clients/tests/test-client.py:962:test_003()/203
+location: clients/tests/test-client.py:974:test_003()/203
 cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9193,7 +9193,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 6402
-location: clients/tests/test-client.py:965:test_003()/204
+location: clients/tests/test-client.py:977:test_003()/204
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: C
 returncode: 0
@@ -9324,7 +9324,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 6458
-location: clients/tests/test-client.py:965:test_003()/205
+location: clients/tests/test-client.py:977:test_003()/205
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9455,7 +9455,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5464
-location: clients/tests/test-client.py:968:test_003()/206
+location: clients/tests/test-client.py:980:test_003()/206
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -9569,7 +9569,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5509
-location: clients/tests/test-client.py:968:test_003()/207
+location: clients/tests/test-client.py:980:test_003()/207
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9683,7 +9683,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4372
-location: clients/tests/test-client.py:971:test_003()/208
+location: clients/tests/test-client.py:983:test_003()/208
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: C
 returncode: 0
@@ -9760,7 +9760,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 4413
-location: clients/tests/test-client.py:971:test_003()/209
+location: clients/tests/test-client.py:983:test_003()/209
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9837,7 +9837,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 5106
-location: clients/tests/test-client.py:959:test_003()/210
+location: clients/tests/test-client.py:971:test_003()/210
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -9929,7 +9929,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 5134
-location: clients/tests/test-client.py:959:test_003()/211
+location: clients/tests/test-client.py:971:test_003()/211
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10021,7 +10021,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 1229
-location: clients/tests/test-client.py:962:test_003()/212
+location: clients/tests/test-client.py:974:test_003()/212
 cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -10045,7 +10045,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 1245
-location: clients/tests/test-client.py:962:test_003()/213
+location: clients/tests/test-client.py:974:test_003()/213
 cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10069,7 +10069,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 6414
-location: clients/tests/test-client.py:965:test_003()/214
+location: clients/tests/test-client.py:977:test_003()/214
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: C
 returncode: 0
@@ -10200,7 +10200,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 6470
-location: clients/tests/test-client.py:965:test_003()/215
+location: clients/tests/test-client.py:977:test_003()/215
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10331,7 +10331,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5476
-location: clients/tests/test-client.py:968:test_003()/216
+location: clients/tests/test-client.py:980:test_003()/216
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -10445,7 +10445,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5521
-location: clients/tests/test-client.py:968:test_003()/217
+location: clients/tests/test-client.py:980:test_003()/217
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10559,7 +10559,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4384
-location: clients/tests/test-client.py:971:test_003()/218
+location: clients/tests/test-client.py:983:test_003()/218
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -10636,7 +10636,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 4425
-location: clients/tests/test-client.py:971:test_003()/219
+location: clients/tests/test-client.py:983:test_003()/219
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10713,7 +10713,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 1897
-location: clients/tests/test-client.py:959:test_003()/220
+location: clients/tests/test-client.py:971:test_003()/220
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: C
 returncode: 0
@@ -10797,7 +10797,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1907
-location: clients/tests/test-client.py:959:test_003()/221
+location: clients/tests/test-client.py:971:test_003()/221
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10881,7 +10881,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 398
-location: clients/tests/test-client.py:962:test_003()/222
+location: clients/tests/test-client.py:974:test_003()/222
 cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -10898,7 +10898,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 408
-location: clients/tests/test-client.py:962:test_003()/223
+location: clients/tests/test-client.py:974:test_003()/223
 cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10915,7 +10915,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 2786
-location: clients/tests/test-client.py:965:test_003()/224
+location: clients/tests/test-client.py:977:test_003()/224
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: C
 returncode: 0
@@ -11030,7 +11030,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2796
-location: clients/tests/test-client.py:965:test_003()/225
+location: clients/tests/test-client.py:977:test_003()/225
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11145,7 +11145,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2458
-location: clients/tests/test-client.py:968:test_003()/226
+location: clients/tests/test-client.py:980:test_003()/226
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -11247,7 +11247,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2468
-location: clients/tests/test-client.py:968:test_003()/227
+location: clients/tests/test-client.py:980:test_003()/227
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11349,7 +11349,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2262
-location: clients/tests/test-client.py:971:test_003()/228
+location: clients/tests/test-client.py:983:test_003()/228
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: C
 returncode: 0
@@ -11415,7 +11415,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2272
-location: clients/tests/test-client.py:971:test_003()/229
+location: clients/tests/test-client.py:983:test_003()/229
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11481,7 +11481,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2179
-location: clients/tests/test-client.py:959:test_003()/230
+location: clients/tests/test-client.py:971:test_003()/230
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: C
 returncode: 0
@@ -11565,7 +11565,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 2189
-location: clients/tests/test-client.py:959:test_003()/231
+location: clients/tests/test-client.py:971:test_003()/231
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11649,7 +11649,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 428
-location: clients/tests/test-client.py:962:test_003()/232
+location: clients/tests/test-client.py:974:test_003()/232
 cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -11666,7 +11666,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 438
-location: clients/tests/test-client.py:962:test_003()/233
+location: clients/tests/test-client.py:974:test_003()/233
 cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11683,7 +11683,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 2798
-location: clients/tests/test-client.py:965:test_003()/234
+location: clients/tests/test-client.py:977:test_003()/234
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: C
 returncode: 0
@@ -11798,7 +11798,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2808
-location: clients/tests/test-client.py:965:test_003()/235
+location: clients/tests/test-client.py:977:test_003()/235
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11913,7 +11913,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2470
-location: clients/tests/test-client.py:968:test_003()/236
+location: clients/tests/test-client.py:980:test_003()/236
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -12015,7 +12015,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2480
-location: clients/tests/test-client.py:968:test_003()/237
+location: clients/tests/test-client.py:980:test_003()/237
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12117,7 +12117,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2274
-location: clients/tests/test-client.py:971:test_003()/238
+location: clients/tests/test-client.py:983:test_003()/238
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -12183,7 +12183,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2284
-location: clients/tests/test-client.py:971:test_003()/239
+location: clients/tests/test-client.py:983:test_003()/239
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12249,7 +12249,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2069
-location: clients/tests/test-client.py:959:test_003()/240
+location: clients/tests/test-client.py:971:test_003()/240
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
@@ -12264,7 +12264,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2091
-location: clients/tests/test-client.py:959:test_003()/241
+location: clients/tests/test-client.py:971:test_003()/241
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12279,7 +12279,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 328
-location: clients/tests/test-client.py:962:test_003()/242
+location: clients/tests/test-client.py:974:test_003()/242
 cmd: $NMCLI -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -12292,7 +12292,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 338
-location: clients/tests/test-client.py:962:test_003()/243
+location: clients/tests/test-client.py:974:test_003()/243
 cmd: $NMCLI -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12305,7 +12305,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 180
-location: clients/tests/test-client.py:965:test_003()/244
+location: clients/tests/test-client.py:977:test_003()/244
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 10
@@ -12315,7 +12315,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 202
-location: clients/tests/test-client.py:965:test_003()/245
+location: clients/tests/test-client.py:977:test_003()/245
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -12325,7 +12325,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 841
-location: clients/tests/test-client.py:968:test_003()/246
+location: clients/tests/test-client.py:980:test_003()/246
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -12346,7 +12346,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 856
-location: clients/tests/test-client.py:968:test_003()/247
+location: clients/tests/test-client.py:980:test_003()/247
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12367,7 +12367,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 3515
-location: clients/tests/test-client.py:971:test_003()/248
+location: clients/tests/test-client.py:983:test_003()/248
 cmd: $NMCLI -f all dev show eth0
 lang: C
 returncode: 0
@@ -12432,12 +12432,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 3550
-location: clients/tests/test-client.py:971:test_003()/249
+size: 3552
+location: clients/tests/test-client.py:983:test_003()/249
 cmd: $NMCLI -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3399 bytes
+stdout: 3401 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -12495,11 +12495,11 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
 size: 2351
-location: clients/tests/test-client.py:959:test_003()/250
+location: clients/tests/test-client.py:971:test_003()/250
 cmd: $NMCLI --color yes -f ALL con
 lang: C
 returncode: 0
@@ -12514,7 +12514,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2373
-location: clients/tests/test-client.py:959:test_003()/251
+location: clients/tests/test-client.py:971:test_003()/251
 cmd: $NMCLI --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12529,7 +12529,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 340
-location: clients/tests/test-client.py:962:test_003()/252
+location: clients/tests/test-client.py:974:test_003()/252
 cmd: $NMCLI --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -12542,7 +12542,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 350
-location: clients/tests/test-client.py:962:test_003()/253
+location: clients/tests/test-client.py:974:test_003()/253
 cmd: $NMCLI --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12555,7 +12555,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 192
-location: clients/tests/test-client.py:965:test_003()/254
+location: clients/tests/test-client.py:977:test_003()/254
 cmd: $NMCLI --color yes con s ethernet
 lang: C
 returncode: 10
@@ -12565,7 +12565,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 214
-location: clients/tests/test-client.py:965:test_003()/255
+location: clients/tests/test-client.py:977:test_003()/255
 cmd: $NMCLI --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -12575,7 +12575,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 853
-location: clients/tests/test-client.py:968:test_003()/256
+location: clients/tests/test-client.py:980:test_003()/256
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -12596,7 +12596,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 868
-location: clients/tests/test-client.py:968:test_003()/257
+location: clients/tests/test-client.py:980:test_003()/257
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12617,7 +12617,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 3527
-location: clients/tests/test-client.py:971:test_003()/258
+location: clients/tests/test-client.py:983:test_003()/258
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -12682,12 +12682,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 3562
-location: clients/tests/test-client.py:971:test_003()/259
+size: 3564
+location: clients/tests/test-client.py:983:test_003()/259
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3399 bytes
+stdout: 3401 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -12745,11 +12745,11 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
 size: 2555
-location: clients/tests/test-client.py:959:test_003()/260
+location: clients/tests/test-client.py:971:test_003()/260
 cmd: $NMCLI --pretty -f ALL con
 lang: C
 returncode: 0
@@ -12768,7 +12768,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2599
-location: clients/tests/test-client.py:959:test_003()/261
+location: clients/tests/test-client.py:971:test_003()/261
 cmd: $NMCLI --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12787,7 +12787,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 539
-location: clients/tests/test-client.py:962:test_003()/262
+location: clients/tests/test-client.py:974:test_003()/262
 cmd: $NMCLI --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -12804,7 +12804,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 569
-location: clients/tests/test-client.py:962:test_003()/263
+location: clients/tests/test-client.py:974:test_003()/263
 cmd: $NMCLI --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12821,7 +12821,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 189
-location: clients/tests/test-client.py:965:test_003()/264
+location: clients/tests/test-client.py:977:test_003()/264
 cmd: $NMCLI --pretty con s ethernet
 lang: C
 returncode: 10
@@ -12831,7 +12831,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 211
-location: clients/tests/test-client.py:965:test_003()/265
+location: clients/tests/test-client.py:977:test_003()/265
 cmd: $NMCLI --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -12841,7 +12841,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 1377
-location: clients/tests/test-client.py:968:test_003()/266
+location: clients/tests/test-client.py:980:test_003()/266
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -12869,7 +12869,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1404
-location: clients/tests/test-client.py:968:test_003()/267
+location: clients/tests/test-client.py:980:test_003()/267
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12897,7 +12897,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4375
-location: clients/tests/test-client.py:971:test_003()/268
+location: clients/tests/test-client.py:983:test_003()/268
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: C
 returncode: 0
@@ -12973,12 +12973,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4416
-location: clients/tests/test-client.py:971:test_003()/269
+size: 4418
+location: clients/tests/test-client.py:983:test_003()/269
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4256 bytes
+stdout: 4258 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -13046,12 +13046,12 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/4
 -------------------------------------------------------------------------------
 
 <<<
 size: 2837
-location: clients/tests/test-client.py:959:test_003()/270
+location: clients/tests/test-client.py:971:test_003()/270
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -13070,7 +13070,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2881
-location: clients/tests/test-client.py:959:test_003()/271
+location: clients/tests/test-client.py:971:test_003()/271
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13089,7 +13089,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 551
-location: clients/tests/test-client.py:962:test_003()/272
+location: clients/tests/test-client.py:974:test_003()/272
 cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -13106,7 +13106,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 581
-location: clients/tests/test-client.py:962:test_003()/273
+location: clients/tests/test-client.py:974:test_003()/273
 cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13123,7 +13123,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 201
-location: clients/tests/test-client.py:965:test_003()/274
+location: clients/tests/test-client.py:977:test_003()/274
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: C
 returncode: 10
@@ -13133,7 +13133,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 223
-location: clients/tests/test-client.py:965:test_003()/275
+location: clients/tests/test-client.py:977:test_003()/275
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -13143,7 +13143,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 1389
-location: clients/tests/test-client.py:968:test_003()/276
+location: clients/tests/test-client.py:980:test_003()/276
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -13171,7 +13171,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1416
-location: clients/tests/test-client.py:968:test_003()/277
+location: clients/tests/test-client.py:980:test_003()/277
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13199,7 +13199,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4387
-location: clients/tests/test-client.py:971:test_003()/278
+location: clients/tests/test-client.py:983:test_003()/278
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -13275,12 +13275,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4428
-location: clients/tests/test-client.py:971:test_003()/279
+size: 4430
+location: clients/tests/test-client.py:983:test_003()/279
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4256 bytes
+stdout: 4258 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -13348,12 +13348,12 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/4
 -------------------------------------------------------------------------------
 
 <<<
 size: 1161
-location: clients/tests/test-client.py:959:test_003()/280
+location: clients/tests/test-client.py:971:test_003()/280
 cmd: $NMCLI --terse -f ALL con
 lang: C
 returncode: 0
@@ -13367,7 +13367,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1171
-location: clients/tests/test-client.py:959:test_003()/281
+location: clients/tests/test-client.py:971:test_003()/281
 cmd: $NMCLI --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13381,7 +13381,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 289
-location: clients/tests/test-client.py:962:test_003()/282
+location: clients/tests/test-client.py:974:test_003()/282
 cmd: $NMCLI --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -13393,7 +13393,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 299
-location: clients/tests/test-client.py:962:test_003()/283
+location: clients/tests/test-client.py:974:test_003()/283
 cmd: $NMCLI --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13405,7 +13405,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 188
-location: clients/tests/test-client.py:965:test_003()/284
+location: clients/tests/test-client.py:977:test_003()/284
 cmd: $NMCLI --terse con s ethernet
 lang: C
 returncode: 10
@@ -13415,7 +13415,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 210
-location: clients/tests/test-client.py:965:test_003()/285
+location: clients/tests/test-client.py:977:test_003()/285
 cmd: $NMCLI --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -13425,7 +13425,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 552
-location: clients/tests/test-client.py:968:test_003()/286
+location: clients/tests/test-client.py:980:test_003()/286
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -13446,7 +13446,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 562
-location: clients/tests/test-client.py:968:test_003()/287
+location: clients/tests/test-client.py:980:test_003()/287
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13467,7 +13467,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2265
-location: clients/tests/test-client.py:971:test_003()/288
+location: clients/tests/test-client.py:983:test_003()/288
 cmd: $NMCLI --terse -f all dev show eth0
 lang: C
 returncode: 0
@@ -13533,7 +13533,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManag
 
 <<<
 size: 2275
-location: clients/tests/test-client.py:971:test_003()/289
+location: clients/tests/test-client.py:983:test_003()/289
 cmd: $NMCLI --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13599,7 +13599,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManag
 
 <<<
 size: 1443
-location: clients/tests/test-client.py:959:test_003()/290
+location: clients/tests/test-client.py:971:test_003()/290
 cmd: $NMCLI --terse --color yes -f ALL con
 lang: C
 returncode: 0
@@ -13613,7 +13613,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1453
-location: clients/tests/test-client.py:959:test_003()/291
+location: clients/tests/test-client.py:971:test_003()/291
 cmd: $NMCLI --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13627,7 +13627,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 301
-location: clients/tests/test-client.py:962:test_003()/292
+location: clients/tests/test-client.py:974:test_003()/292
 cmd: $NMCLI --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -13639,7 +13639,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 311
-location: clients/tests/test-client.py:962:test_003()/293
+location: clients/tests/test-client.py:974:test_003()/293
 cmd: $NMCLI --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13651,7 +13651,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 200
-location: clients/tests/test-client.py:965:test_003()/294
+location: clients/tests/test-client.py:977:test_003()/294
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: C
 returncode: 10
@@ -13661,7 +13661,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 222
-location: clients/tests/test-client.py:965:test_003()/295
+location: clients/tests/test-client.py:977:test_003()/295
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -13671,7 +13671,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 564
-location: clients/tests/test-client.py:968:test_003()/296
+location: clients/tests/test-client.py:980:test_003()/296
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -13692,7 +13692,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 574
-location: clients/tests/test-client.py:968:test_003()/297
+location: clients/tests/test-client.py:980:test_003()/297
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13713,7 +13713,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2277
-location: clients/tests/test-client.py:971:test_003()/298
+location: clients/tests/test-client.py:983:test_003()/298
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -13779,7 +13779,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManag
 
 <<<
 size: 2287
-location: clients/tests/test-client.py:971:test_003()/299
+location: clients/tests/test-client.py:983:test_003()/299
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13845,7 +13845,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManag
 
 <<<
 size: 2084
-location: clients/tests/test-client.py:959:test_003()/300
+location: clients/tests/test-client.py:971:test_003()/300
 cmd: $NMCLI --mode tabular -f ALL con
 lang: C
 returncode: 0
@@ -13860,7 +13860,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2106
-location: clients/tests/test-client.py:959:test_003()/301
+location: clients/tests/test-client.py:971:test_003()/301
 cmd: $NMCLI --mode tabular -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13875,7 +13875,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 343
-location: clients/tests/test-client.py:962:test_003()/302
+location: clients/tests/test-client.py:974:test_003()/302
 cmd: $NMCLI --mode tabular -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -13888,7 +13888,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 353
-location: clients/tests/test-client.py:962:test_003()/303
+location: clients/tests/test-client.py:974:test_003()/303
 cmd: $NMCLI --mode tabular -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13901,7 +13901,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 195
-location: clients/tests/test-client.py:965:test_003()/304
+location: clients/tests/test-client.py:977:test_003()/304
 cmd: $NMCLI --mode tabular con s ethernet
 lang: C
 returncode: 10
@@ -13911,7 +13911,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 217
-location: clients/tests/test-client.py:965:test_003()/305
+location: clients/tests/test-client.py:977:test_003()/305
 cmd: $NMCLI --mode tabular con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -13921,7 +13921,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 676
-location: clients/tests/test-client.py:968:test_003()/306
+location: clients/tests/test-client.py:980:test_003()/306
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -13933,7 +13933,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 690
-location: clients/tests/test-client.py:968:test_003()/307
+location: clients/tests/test-client.py:980:test_003()/307
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13945,7 +13945,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 3011
-location: clients/tests/test-client.py:971:test_003()/308
+location: clients/tests/test-client.py:983:test_003()/308
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: C
 returncode: 0
@@ -13976,12 +13976,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
-size: 3042
-location: clients/tests/test-client.py:971:test_003()/309
+size: 3046
+location: clients/tests/test-client.py:983:test_003()/309
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2876 bytes
+stdout: 2880 bytes
 >>>
 NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
@@ -14004,12 +14004,12 @@ IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a:
 GROUP  OPTION                                                                                    
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
 
-NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                               
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4 
+NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                                 
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
 size: 2366
-location: clients/tests/test-client.py:959:test_003()/310
+location: clients/tests/test-client.py:971:test_003()/310
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: C
 returncode: 0
@@ -14024,7 +14024,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2388
-location: clients/tests/test-client.py:959:test_003()/311
+location: clients/tests/test-client.py:971:test_003()/311
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14039,7 +14039,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 355
-location: clients/tests/test-client.py:962:test_003()/312
+location: clients/tests/test-client.py:974:test_003()/312
 cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14052,7 +14052,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 365
-location: clients/tests/test-client.py:962:test_003()/313
+location: clients/tests/test-client.py:974:test_003()/313
 cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14065,7 +14065,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 207
-location: clients/tests/test-client.py:965:test_003()/314
+location: clients/tests/test-client.py:977:test_003()/314
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: C
 returncode: 10
@@ -14075,7 +14075,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 229
-location: clients/tests/test-client.py:965:test_003()/315
+location: clients/tests/test-client.py:977:test_003()/315
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14085,7 +14085,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 688
-location: clients/tests/test-client.py:968:test_003()/316
+location: clients/tests/test-client.py:980:test_003()/316
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -14097,7 +14097,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 702
-location: clients/tests/test-client.py:968:test_003()/317
+location: clients/tests/test-client.py:980:test_003()/317
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14109,7 +14109,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 3023
-location: clients/tests/test-client.py:971:test_003()/318
+location: clients/tests/test-client.py:983:test_003()/318
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -14140,12 +14140,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
-size: 3054
-location: clients/tests/test-client.py:971:test_003()/319
+size: 3058
+location: clients/tests/test-client.py:983:test_003()/319
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2876 bytes
+stdout: 2880 bytes
 >>>
 NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
@@ -14168,12 +14168,12 @@ IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a:
 GROUP  OPTION                                                                                    
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
 
-NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                               
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4 
+NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                                 
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
 size: 2570
-location: clients/tests/test-client.py:959:test_003()/320
+location: clients/tests/test-client.py:971:test_003()/320
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: C
 returncode: 0
@@ -14192,7 +14192,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2614
-location: clients/tests/test-client.py:959:test_003()/321
+location: clients/tests/test-client.py:971:test_003()/321
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14211,7 +14211,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 554
-location: clients/tests/test-client.py:962:test_003()/322
+location: clients/tests/test-client.py:974:test_003()/322
 cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14228,7 +14228,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 584
-location: clients/tests/test-client.py:962:test_003()/323
+location: clients/tests/test-client.py:974:test_003()/323
 cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14245,7 +14245,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 204
-location: clients/tests/test-client.py:965:test_003()/324
+location: clients/tests/test-client.py:977:test_003()/324
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: C
 returncode: 10
@@ -14255,7 +14255,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 226
-location: clients/tests/test-client.py:965:test_003()/325
+location: clients/tests/test-client.py:977:test_003()/325
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14265,7 +14265,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 1232
-location: clients/tests/test-client.py:968:test_003()/326
+location: clients/tests/test-client.py:980:test_003()/326
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -14284,7 +14284,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 1277
-location: clients/tests/test-client.py:968:test_003()/327
+location: clients/tests/test-client.py:980:test_003()/327
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14303,7 +14303,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 4528
-location: clients/tests/test-client.py:971:test_003()/328
+location: clients/tests/test-client.py:983:test_003()/328
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: C
 returncode: 0
@@ -14345,12 +14345,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
-size: 4596
-location: clients/tests/test-client.py:971:test_003()/329
+size: 4602
+location: clients/tests/test-client.py:983:test_003()/329
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4421 bytes
+stdout: 4427 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
@@ -14383,13 +14383,13 @@ GROUP  OPTION
 --------------------------------------------------------------------------------------------------
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
 
-NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                               
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4 
+NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                                 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
 size: 2852
-location: clients/tests/test-client.py:959:test_003()/330
+location: clients/tests/test-client.py:971:test_003()/330
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -14408,7 +14408,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2896
-location: clients/tests/test-client.py:959:test_003()/331
+location: clients/tests/test-client.py:971:test_003()/331
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14427,7 +14427,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 566
-location: clients/tests/test-client.py:962:test_003()/332
+location: clients/tests/test-client.py:974:test_003()/332
 cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14444,7 +14444,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 596
-location: clients/tests/test-client.py:962:test_003()/333
+location: clients/tests/test-client.py:974:test_003()/333
 cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14461,7 +14461,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 216
-location: clients/tests/test-client.py:965:test_003()/334
+location: clients/tests/test-client.py:977:test_003()/334
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: C
 returncode: 10
@@ -14471,7 +14471,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 238
-location: clients/tests/test-client.py:965:test_003()/335
+location: clients/tests/test-client.py:977:test_003()/335
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14481,7 +14481,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 1244
-location: clients/tests/test-client.py:968:test_003()/336
+location: clients/tests/test-client.py:980:test_003()/336
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -14500,7 +14500,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 1289
-location: clients/tests/test-client.py:968:test_003()/337
+location: clients/tests/test-client.py:980:test_003()/337
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14519,7 +14519,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 4540
-location: clients/tests/test-client.py:971:test_003()/338
+location: clients/tests/test-client.py:983:test_003()/338
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -14561,12 +14561,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
-size: 4608
-location: clients/tests/test-client.py:971:test_003()/339
+size: 4614
+location: clients/tests/test-client.py:983:test_003()/339
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4421 bytes
+stdout: 4427 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
@@ -14599,13 +14599,13 @@ GROUP  OPTION
 --------------------------------------------------------------------------------------------------
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
 
-NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                               
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4 
+NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                                 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
 size: 1176
-location: clients/tests/test-client.py:959:test_003()/340
+location: clients/tests/test-client.py:971:test_003()/340
 cmd: $NMCLI --mode tabular --terse -f ALL con
 lang: C
 returncode: 0
@@ -14619,7 +14619,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1186
-location: clients/tests/test-client.py:959:test_003()/341
+location: clients/tests/test-client.py:971:test_003()/341
 cmd: $NMCLI --mode tabular --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14633,7 +14633,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 304
-location: clients/tests/test-client.py:962:test_003()/342
+location: clients/tests/test-client.py:974:test_003()/342
 cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14645,7 +14645,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 314
-location: clients/tests/test-client.py:962:test_003()/343
+location: clients/tests/test-client.py:974:test_003()/343
 cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14657,7 +14657,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 203
-location: clients/tests/test-client.py:965:test_003()/344
+location: clients/tests/test-client.py:977:test_003()/344
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: C
 returncode: 10
@@ -14667,7 +14667,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 225
-location: clients/tests/test-client.py:965:test_003()/345
+location: clients/tests/test-client.py:977:test_003()/345
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14677,7 +14677,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 386
-location: clients/tests/test-client.py:968:test_003()/346
+location: clients/tests/test-client.py:980:test_003()/346
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -14687,7 +14687,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 396
-location: clients/tests/test-client.py:968:test_003()/347
+location: clients/tests/test-client.py:980:test_003()/347
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14697,7 +14697,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 1395
-location: clients/tests/test-client.py:971:test_003()/348
+location: clients/tests/test-client.py:983:test_003()/348
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: C
 returncode: 0
@@ -14714,7 +14714,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 1405
-location: clients/tests/test-client.py:971:test_003()/349
+location: clients/tests/test-client.py:983:test_003()/349
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14731,7 +14731,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 1458
-location: clients/tests/test-client.py:959:test_003()/350
+location: clients/tests/test-client.py:971:test_003()/350
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
 lang: C
 returncode: 0
@@ -14745,7 +14745,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1468
-location: clients/tests/test-client.py:959:test_003()/351
+location: clients/tests/test-client.py:971:test_003()/351
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14759,7 +14759,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 316
-location: clients/tests/test-client.py:962:test_003()/352
+location: clients/tests/test-client.py:974:test_003()/352
 cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14771,7 +14771,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 326
-location: clients/tests/test-client.py:962:test_003()/353
+location: clients/tests/test-client.py:974:test_003()/353
 cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14783,7 +14783,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 215
-location: clients/tests/test-client.py:965:test_003()/354
+location: clients/tests/test-client.py:977:test_003()/354
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: C
 returncode: 10
@@ -14793,7 +14793,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 237
-location: clients/tests/test-client.py:965:test_003()/355
+location: clients/tests/test-client.py:977:test_003()/355
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14803,7 +14803,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 398
-location: clients/tests/test-client.py:968:test_003()/356
+location: clients/tests/test-client.py:980:test_003()/356
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -14813,7 +14813,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 408
-location: clients/tests/test-client.py:968:test_003()/357
+location: clients/tests/test-client.py:980:test_003()/357
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14823,7 +14823,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 1407
-location: clients/tests/test-client.py:971:test_003()/358
+location: clients/tests/test-client.py:983:test_003()/358
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -14840,7 +14840,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 1417
-location: clients/tests/test-client.py:971:test_003()/359
+location: clients/tests/test-client.py:983:test_003()/359
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14857,7 +14857,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 4194
-location: clients/tests/test-client.py:959:test_003()/360
+location: clients/tests/test-client.py:971:test_003()/360
 cmd: $NMCLI --mode multiline -f ALL con
 lang: C
 returncode: 0
@@ -14941,7 +14941,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4214
-location: clients/tests/test-client.py:959:test_003()/361
+location: clients/tests/test-client.py:971:test_003()/361
 cmd: $NMCLI --mode multiline -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15025,7 +15025,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 526
-location: clients/tests/test-client.py:962:test_003()/362
+location: clients/tests/test-client.py:974:test_003()/362
 cmd: $NMCLI --mode multiline -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -15040,7 +15040,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 536
-location: clients/tests/test-client.py:962:test_003()/363
+location: clients/tests/test-client.py:974:test_003()/363
 cmd: $NMCLI --mode multiline -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15055,7 +15055,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 197
-location: clients/tests/test-client.py:965:test_003()/364
+location: clients/tests/test-client.py:977:test_003()/364
 cmd: $NMCLI --mode multiline con s ethernet
 lang: C
 returncode: 10
@@ -15065,7 +15065,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 219
-location: clients/tests/test-client.py:965:test_003()/365
+location: clients/tests/test-client.py:977:test_003()/365
 cmd: $NMCLI --mode multiline con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -15075,7 +15075,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 858
-location: clients/tests/test-client.py:968:test_003()/366
+location: clients/tests/test-client.py:980:test_003()/366
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -15096,7 +15096,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 873
-location: clients/tests/test-client.py:968:test_003()/367
+location: clients/tests/test-client.py:980:test_003()/367
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15117,7 +15117,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 3532
-location: clients/tests/test-client.py:971:test_003()/368
+location: clients/tests/test-client.py:983:test_003()/368
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: C
 returncode: 0
@@ -15182,12 +15182,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 3567
-location: clients/tests/test-client.py:971:test_003()/369
+size: 3569
+location: clients/tests/test-client.py:983:test_003()/369
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3399 bytes
+stdout: 3401 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -15245,11 +15245,11 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
 size: 4476
-location: clients/tests/test-client.py:959:test_003()/370
+location: clients/tests/test-client.py:971:test_003()/370
 cmd: $NMCLI --mode multiline --color yes -f ALL con
 lang: C
 returncode: 0
@@ -15333,7 +15333,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4496
-location: clients/tests/test-client.py:959:test_003()/371
+location: clients/tests/test-client.py:971:test_003()/371
 cmd: $NMCLI --mode multiline --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15417,7 +15417,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 538
-location: clients/tests/test-client.py:962:test_003()/372
+location: clients/tests/test-client.py:974:test_003()/372
 cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -15432,7 +15432,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 548
-location: clients/tests/test-client.py:962:test_003()/373
+location: clients/tests/test-client.py:974:test_003()/373
 cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15447,7 +15447,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 209
-location: clients/tests/test-client.py:965:test_003()/374
+location: clients/tests/test-client.py:977:test_003()/374
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: C
 returncode: 10
@@ -15457,7 +15457,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 231
-location: clients/tests/test-client.py:965:test_003()/375
+location: clients/tests/test-client.py:977:test_003()/375
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -15467,7 +15467,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 870
-location: clients/tests/test-client.py:968:test_003()/376
+location: clients/tests/test-client.py:980:test_003()/376
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -15488,7 +15488,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 885
-location: clients/tests/test-client.py:968:test_003()/377
+location: clients/tests/test-client.py:980:test_003()/377
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15509,7 +15509,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 3544
-location: clients/tests/test-client.py:971:test_003()/378
+location: clients/tests/test-client.py:983:test_003()/378
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -15574,12 +15574,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 3579
-location: clients/tests/test-client.py:971:test_003()/379
+size: 3581
+location: clients/tests/test-client.py:983:test_003()/379
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3399 bytes
+stdout: 3401 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -15637,11 +15637,11 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
 size: 4820
-location: clients/tests/test-client.py:959:test_003()/380
+location: clients/tests/test-client.py:971:test_003()/380
 cmd: $NMCLI --mode multiline --pretty -f ALL con
 lang: C
 returncode: 0
@@ -15733,7 +15733,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4846
-location: clients/tests/test-client.py:959:test_003()/381
+location: clients/tests/test-client.py:971:test_003()/381
 cmd: $NMCLI --mode multiline --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15825,7 +15825,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 992
-location: clients/tests/test-client.py:962:test_003()/382
+location: clients/tests/test-client.py:974:test_003()/382
 cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -15846,7 +15846,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 1008
-location: clients/tests/test-client.py:962:test_003()/383
+location: clients/tests/test-client.py:974:test_003()/383
 cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15867,7 +15867,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 206
-location: clients/tests/test-client.py:965:test_003()/384
+location: clients/tests/test-client.py:977:test_003()/384
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: C
 returncode: 10
@@ -15877,7 +15877,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 228
-location: clients/tests/test-client.py:965:test_003()/385
+location: clients/tests/test-client.py:977:test_003()/385
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -15887,7 +15887,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 1394
-location: clients/tests/test-client.py:968:test_003()/386
+location: clients/tests/test-client.py:980:test_003()/386
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -15915,7 +15915,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1421
-location: clients/tests/test-client.py:968:test_003()/387
+location: clients/tests/test-client.py:980:test_003()/387
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15943,7 +15943,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4392
-location: clients/tests/test-client.py:971:test_003()/388
+location: clients/tests/test-client.py:983:test_003()/388
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: C
 returncode: 0
@@ -16019,12 +16019,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4433
-location: clients/tests/test-client.py:971:test_003()/389
+size: 4435
+location: clients/tests/test-client.py:983:test_003()/389
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4256 bytes
+stdout: 4258 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -16092,12 +16092,12 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/4
 -------------------------------------------------------------------------------
 
 <<<
 size: 5102
-location: clients/tests/test-client.py:959:test_003()/390
+location: clients/tests/test-client.py:971:test_003()/390
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -16189,7 +16189,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 5128
-location: clients/tests/test-client.py:959:test_003()/391
+location: clients/tests/test-client.py:971:test_003()/391
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16281,7 +16281,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 1004
-location: clients/tests/test-client.py:962:test_003()/392
+location: clients/tests/test-client.py:974:test_003()/392
 cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -16302,7 +16302,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 1020
-location: clients/tests/test-client.py:962:test_003()/393
+location: clients/tests/test-client.py:974:test_003()/393
 cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16323,7 +16323,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 218
-location: clients/tests/test-client.py:965:test_003()/394
+location: clients/tests/test-client.py:977:test_003()/394
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: C
 returncode: 10
@@ -16333,7 +16333,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 240
-location: clients/tests/test-client.py:965:test_003()/395
+location: clients/tests/test-client.py:977:test_003()/395
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -16343,7 +16343,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 1406
-location: clients/tests/test-client.py:968:test_003()/396
+location: clients/tests/test-client.py:980:test_003()/396
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -16371,7 +16371,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1433
-location: clients/tests/test-client.py:968:test_003()/397
+location: clients/tests/test-client.py:980:test_003()/397
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16399,7 +16399,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4404
-location: clients/tests/test-client.py:971:test_003()/398
+location: clients/tests/test-client.py:983:test_003()/398
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -16475,12 +16475,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4445
-location: clients/tests/test-client.py:971:test_003()/399
+size: 4447
+location: clients/tests/test-client.py:983:test_003()/399
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4256 bytes
+stdout: 4258 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -16548,12 +16548,12 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/4
 -------------------------------------------------------------------------------
 
 <<<
 size: 1873
-location: clients/tests/test-client.py:959:test_003()/400
+location: clients/tests/test-client.py:971:test_003()/400
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: C
 returncode: 0
@@ -16637,7 +16637,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1883
-location: clients/tests/test-client.py:959:test_003()/401
+location: clients/tests/test-client.py:971:test_003()/401
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16721,7 +16721,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 336
-location: clients/tests/test-client.py:962:test_003()/402
+location: clients/tests/test-client.py:974:test_003()/402
 cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -16736,7 +16736,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 346
-location: clients/tests/test-client.py:962:test_003()/403
+location: clients/tests/test-client.py:974:test_003()/403
 cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16751,7 +16751,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 205
-location: clients/tests/test-client.py:965:test_003()/404
+location: clients/tests/test-client.py:977:test_003()/404
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: C
 returncode: 10
@@ -16761,7 +16761,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 227
-location: clients/tests/test-client.py:965:test_003()/405
+location: clients/tests/test-client.py:977:test_003()/405
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -16771,7 +16771,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 569
-location: clients/tests/test-client.py:968:test_003()/406
+location: clients/tests/test-client.py:980:test_003()/406
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -16792,7 +16792,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 579
-location: clients/tests/test-client.py:968:test_003()/407
+location: clients/tests/test-client.py:980:test_003()/407
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16813,7 +16813,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2282
-location: clients/tests/test-client.py:971:test_003()/408
+location: clients/tests/test-client.py:983:test_003()/408
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: C
 returncode: 0
@@ -16879,7 +16879,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManag
 
 <<<
 size: 2292
-location: clients/tests/test-client.py:971:test_003()/409
+location: clients/tests/test-client.py:983:test_003()/409
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16945,7 +16945,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManag
 
 <<<
 size: 2155
-location: clients/tests/test-client.py:959:test_003()/410
+location: clients/tests/test-client.py:971:test_003()/410
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: C
 returncode: 0
@@ -17029,7 +17029,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 2165
-location: clients/tests/test-client.py:959:test_003()/411
+location: clients/tests/test-client.py:971:test_003()/411
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17113,7 +17113,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 348
-location: clients/tests/test-client.py:962:test_003()/412
+location: clients/tests/test-client.py:974:test_003()/412
 cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -17128,7 +17128,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 358
-location: clients/tests/test-client.py:962:test_003()/413
+location: clients/tests/test-client.py:974:test_003()/413
 cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17143,7 +17143,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 217
-location: clients/tests/test-client.py:965:test_003()/414
+location: clients/tests/test-client.py:977:test_003()/414
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: C
 returncode: 10
@@ -17153,7 +17153,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 239
-location: clients/tests/test-client.py:965:test_003()/415
+location: clients/tests/test-client.py:977:test_003()/415
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -17163,7 +17163,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 581
-location: clients/tests/test-client.py:968:test_003()/416
+location: clients/tests/test-client.py:980:test_003()/416
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -17184,7 +17184,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 591
-location: clients/tests/test-client.py:968:test_003()/417
+location: clients/tests/test-client.py:980:test_003()/417
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17205,7 +17205,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2294
-location: clients/tests/test-client.py:971:test_003()/418
+location: clients/tests/test-client.py:983:test_003()/418
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
@@ -17271,7 +17271,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManag
 
 <<<
 size: 2304
-location: clients/tests/test-client.py:971:test_003()/419
+location: clients/tests/test-client.py:983:test_003()/419
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004.expected b/clients/tests/test-client.check-on-disk/test_004.expected
index 386946cd..d62778c5 100644
--- a/clients/tests/test-client.check-on-disk/test_004.expected
+++ b/clients/tests/test-client.check-on-disk/test_004.expected
@@ -1,5 +1,5 @@
 size: 252
-location: clients/tests/test-client.py:982:test_004()/1
+location: clients/tests/test-client.py:994:test_004()/1
 cmd: $NMCLI c add type wifi ifname '*' ssid foobar con-name con-xx1
 lang: C
 returncode: 0
@@ -9,7 +9,7 @@ Connection 'con-xx1' (UUID-con-xx1-REPLACED-REPLACED-REPLA) successfully added.
 
 <<<
 size: 228
-location: clients/tests/test-client.py:984:test_004()/2
+location: clients/tests/test-client.py:996:test_004()/2
 cmd: $NMCLI connection mod con-xx1 ip.gateway ''
 lang: C
 returncode: 2
@@ -19,7 +19,7 @@ Error: invalid or not allowed setting 'ip': 'ip' is ambiguous: ipv4, ipv6.
 
 <<<
 size: 317
-location: clients/tests/test-client.py:985:test_004()/3
+location: clients/tests/test-client.py:997:test_004()/3
 cmd: $NMCLI connection mod con-xx1 ipv4.gateway 172.16.0.1
 lang: pl_PL.UTF-8
 returncode: 1
@@ -29,7 +29,7 @@ Błąd: zmodyfikowanie połączenia „con-xx1” się nie powiodło: ipv4.gatew
 
 <<<
 size: 277
-location: clients/tests/test-client.py:986:test_004()/4
+location: clients/tests/test-client.py:998:test_004()/4
 cmd: $NMCLI connection mod con-xx1 ipv6.gateway ::99
 lang: C
 returncode: 1
@@ -39,7 +39,7 @@ Error: Failed to modify connection 'con-xx1': ipv6.gateway: gateway cannot be se
 
 <<<
 size: 267
-location: clients/tests/test-client.py:987:test_004()/5
+location: clients/tests/test-client.py:999:test_004()/5
 cmd: $NMCLI connection mod con-xx1 802.abc ''
 lang: C
 returncode: 2
@@ -48,18 +48,18 @@ stderr: 116 bytes
 Error: invalid or not allowed setting '802': '802' is ambiguous: 802-11-wireless, 802-11-wireless-security, 802-1x.
 
 <<<
-size: 136
-location: clients/tests/test-client.py:988:test_004()/6
+size: 137
+location: clients/tests/test-client.py:1000:test_004()/6
 cmd: $NMCLI connection mod con-xx1 802-11-wireless.band a
 lang: C
 returncode: 0
-size: 242
-location: clients/tests/test-client.py:989:test_004()/7
+size: 243
+location: clients/tests/test-client.py:1001:test_004()/7
 cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128
 lang: C
 returncode: 0
-size: 4047
-location: clients/tests/test-client.py:991:test_004()/8
+size: 4048
+location: clients/tests/test-client.py:1003:test_004()/8
 cmd: $NMCLI con s con-xx1
 lang: C
 returncode: 0
@@ -151,8 +151,8 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4075
-location: clients/tests/test-client.py:991:test_004()/9
+size: 4076
+location: clients/tests/test-client.py:1003:test_004()/9
 cmd: $NMCLI con s con-xx1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -244,8 +244,8 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 320
-location: clients/tests/test-client.py:998:test_004()/10
+size: 321
+location: clients/tests/test-client.py:1010:test_004()/10
 cmd: $NMCLI connection add type vpn con-name con-vpn-1 ifname '*' vpn-type openvpn vpn.data 'key1 = val1,   key2  = val2, key3=val3'
 lang: C
 returncode: 0
@@ -255,7 +255,7 @@ Connection 'con-vpn-1' (UUID-con-vpn-1-REPLACED-REPLACED-REP) successfully added
 
 <<<
 size: 393
-location: clients/tests/test-client.py:1001:test_004()/11
+location: clients/tests/test-client.py:1013:test_004()/11
 cmd: $NMCLI con s
 lang: C
 returncode: 0
@@ -268,7 +268,7 @@ con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      --
 
 <<<
 size: 403
-location: clients/tests/test-client.py:1001:test_004()/12
+location: clients/tests/test-client.py:1013:test_004()/12
 cmd: $NMCLI con s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -281,7 +281,7 @@ con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      --
 
 <<<
 size: 3515
-location: clients/tests/test-client.py:1003:test_004()/13
+location: clients/tests/test-client.py:1015:test_004()/13
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
@@ -363,7 +363,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3535
-location: clients/tests/test-client.py:1003:test_004()/14
+location: clients/tests/test-client.py:1015:test_004()/14
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -445,7 +445,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 240
-location: clients/tests/test-client.py:1005:test_004()/15
+location: clients/tests/test-client.py:1017:test_004()/15
 cmd: $NMCLI con up con-xx1
 lang: C
 returncode: 0
@@ -455,7 +455,7 @@ Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkMa
 
 <<<
 size: 393
-location: clients/tests/test-client.py:1007:test_004()/16
+location: clients/tests/test-client.py:1019:test_004()/16
 cmd: $NMCLI con s
 lang: C
 returncode: 0
@@ -468,7 +468,7 @@ con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       --
 
 <<<
 size: 403
-location: clients/tests/test-client.py:1007:test_004()/17
+location: clients/tests/test-client.py:1019:test_004()/17
 cmd: $NMCLI con s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -481,7 +481,7 @@ con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       --
 
 <<<
 size: 242
-location: clients/tests/test-client.py:1009:test_004()/18
+location: clients/tests/test-client.py:1021:test_004()/18
 cmd: $NMCLI con up con-vpn-1
 lang: C
 returncode: 0
@@ -491,7 +491,7 @@ Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkMa
 
 <<<
 size: 393
-location: clients/tests/test-client.py:1011:test_004()/19
+location: clients/tests/test-client.py:1023:test_004()/19
 cmd: $NMCLI con s
 lang: C
 returncode: 0
@@ -504,7 +504,7 @@ con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --
 
 <<<
 size: 403
-location: clients/tests/test-client.py:1011:test_004()/20
+location: clients/tests/test-client.py:1023:test_004()/20
 cmd: $NMCLI con s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -517,7 +517,7 @@ con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --
 
 <<<
 size: 4597
-location: clients/tests/test-client.py:1013:test_004()/21
+location: clients/tests/test-client.py:1025:test_004()/21
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
@@ -618,12 +618,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4621
-location: clients/tests/test-client.py:1013:test_004()/22
+size: 4623
+location: clients/tests/test-client.py:1025:test_004()/22
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4475 bytes
+stdout: 4477 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -714,14 +714,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          0 - nieznane
+VPN.VPN-STATE:                          0 — nieznane
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4603
-location: clients/tests/test-client.py:1024:test_004()/23
+location: clients/tests/test-client.py:1036:test_004()/23
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
@@ -822,12 +822,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4631
-location: clients/tests/test-client.py:1024:test_004()/24
+size: 4633
+location: clients/tests/test-client.py:1036:test_004()/24
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -918,14 +918,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4603
-location: clients/tests/test-client.py:1026:test_004()/25
+location: clients/tests/test-client.py:1038:test_004()/25
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
@@ -1026,12 +1026,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4631
-location: clients/tests/test-client.py:1026:test_004()/26
+size: 4633
+location: clients/tests/test-client.py:1038:test_004()/26
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1122,14 +1122,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 3522
-location: clients/tests/test-client.py:1029:test_004()/27
+location: clients/tests/test-client.py:1041:test_004()/27
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -1211,7 +1211,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3542
-location: clients/tests/test-client.py:1029:test_004()/28
+location: clients/tests/test-client.py:1041:test_004()/28
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1293,7 +1293,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 476
-location: clients/tests/test-client.py:1035:test_004()/29
+location: clients/tests/test-client.py:1047:test_004()/29
 cmd: $NMCLI -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -1308,7 +1308,7 @@ vpn.timeout:                            0
 
 <<<
 size: 487
-location: clients/tests/test-client.py:1035:test_004()/30
+location: clients/tests/test-client.py:1047:test_004()/30
 cmd: $NMCLI -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1323,7 +1323,7 @@ vpn.timeout:                            0
 
 <<<
 size: 813
-location: clients/tests/test-client.py:1038:test_004()/31
+location: clients/tests/test-client.py:1050:test_004()/31
 cmd: $NMCLI -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -1344,7 +1344,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 826
-location: clients/tests/test-client.py:1038:test_004()/32
+location: clients/tests/test-client.py:1050:test_004()/32
 cmd: $NMCLI -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1365,7 +1365,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 383
-location: clients/tests/test-client.py:1041:test_004()/33
+location: clients/tests/test-client.py:1053:test_004()/33
 cmd: $NMCLI dev s
 lang: C
 returncode: 0
@@ -1380,7 +1380,7 @@ wlan1   wifi      unavailable  --
 
 <<<
 size: 398
-location: clients/tests/test-client.py:1041:test_004()/34
+location: clients/tests/test-client.py:1053:test_004()/34
 cmd: $NMCLI dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1395,7 +1395,7 @@ wlan1   wifi      niedostępne  --
 
 <<<
 size: 1410
-location: clients/tests/test-client.py:1044:test_004()/35
+location: clients/tests/test-client.py:1056:test_004()/35
 cmd: $NMCLI -f all dev status
 lang: C
 returncode: 0
@@ -1410,7 +1410,7 @@ wlan1   wifi      unavailable  unknown           unknown           /org/freedesk
 
 <<<
 size: 1425
-location: clients/tests/test-client.py:1044:test_004()/36
+location: clients/tests/test-client.py:1056:test_004()/36
 cmd: $NMCLI -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1425,7 +1425,7 @@ wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedes
 
 <<<
 size: 8047
-location: clients/tests/test-client.py:1047:test_004()/37
+location: clients/tests/test-client.py:1059:test_004()/37
 cmd: $NMCLI dev show
 lang: C
 returncode: 0
@@ -1571,7 +1571,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 8078
-location: clients/tests/test-client.py:1047:test_004()/38
+location: clients/tests/test-client.py:1059:test_004()/38
 cmd: $NMCLI dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1716,12 +1716,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 20670
-location: clients/tests/test-client.py:1050:test_004()/39
+size: 20660
+location: clients/tests/test-client.py:1062:test_004()/39
 cmd: $NMCLI -f all dev show
 lang: C
 returncode: 0
-stdout: 20533 bytes
+stdout: 20523 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -1777,7 +1777,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -1785,7 +1785,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -2105,12 +2105,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 20820
-location: clients/tests/test-client.py:1050:test_004()/40
+size: 20810
+location: clients/tests/test-client.py:1062:test_004()/40
 cmd: $NMCLI -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 20673 bytes
+stdout: 20663 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2166,7 +2166,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -2174,7 +2174,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -2495,7 +2495,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1498
-location: clients/tests/test-client.py:1053:test_004()/41
+location: clients/tests/test-client.py:1065:test_004()/41
 cmd: $NMCLI dev show wlan0
 lang: C
 returncode: 0
@@ -2528,7 +2528,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1509
-location: clients/tests/test-client.py:1053:test_004()/42
+location: clients/tests/test-client.py:1065:test_004()/42
 cmd: $NMCLI dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2560,12 +2560,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 4857
-location: clients/tests/test-client.py:1056:test_004()/43
+size: 4847
+location: clients/tests/test-client.py:1068:test_004()/43
 cmd: $NMCLI -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4715 bytes
+stdout: 4705 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2621,7 +2621,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -2629,7 +2629,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -2660,12 +2660,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4912
-location: clients/tests/test-client.py:1056:test_004()/44
+size: 4902
+location: clients/tests/test-client.py:1068:test_004()/44
 cmd: $NMCLI -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4760 bytes
+stdout: 4750 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2721,7 +2721,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -2729,7 +2729,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -2761,7 +2761,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1960
-location: clients/tests/test-client.py:1059:test_004()/45
+location: clients/tests/test-client.py:1071:test_004()/45
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -2806,7 +2806,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 1984
-location: clients/tests/test-client.py:1059:test_004()/46
+location: clients/tests/test-client.py:1071:test_004()/46
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2851,7 +2851,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 1960
-location: clients/tests/test-client.py:1062:test_004()/47
+location: clients/tests/test-client.py:1074:test_004()/47
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -2896,7 +2896,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 1984
-location: clients/tests/test-client.py:1062:test_004()/48
+location: clients/tests/test-client.py:1074:test_004()/48
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2941,7 +2941,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 514
-location: clients/tests/test-client.py:1065:test_004()/49
+location: clients/tests/test-client.py:1077:test_004()/49
 cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -2956,7 +2956,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 524
-location: clients/tests/test-client.py:1065:test_004()/50
+location: clients/tests/test-client.py:1077:test_004()/50
 cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2971,7 +2971,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 1984
-location: clients/tests/test-client.py:1068:test_004()/51
+location: clients/tests/test-client.py:1080:test_004()/51
 cmd: $NMCLI -f ALL device wifi list
 lang: C
 returncode: 0
@@ -2979,8 +2979,8 @@ stdout: 1840 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -2989,7 +2989,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2052
-location: clients/tests/test-client.py:1068:test_004()/52
+location: clients/tests/test-client.py:1080:test_004()/52
 cmd: $NMCLI -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2997,8 +2997,8 @@ stdout: 1898 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -3007,7 +3007,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 618
-location: clients/tests/test-client.py:1070:test_004()/53
+location: clients/tests/test-client.py:1082:test_004()/53
 cmd: $NMCLI -f COMMON device wifi list
 lang: C
 returncode: 0
@@ -3015,8 +3015,8 @@ stdout: 472 bytes
 >>>
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
@@ -3025,7 +3025,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 678
-location: clients/tests/test-client.py:1070:test_004()/54
+location: clients/tests/test-client.py:1082:test_004()/54
 cmd: $NMCLI -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3033,8 +3033,8 @@ stdout: 522 bytes
 >>>
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
@@ -3043,7 +3043,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 2097
-location: clients/tests/test-client.py:1073:test_004()/55
+location: clients/tests/test-client.py:1085:test_004()/55
 cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -3051,8 +3051,8 @@ stdout: 1840 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -3061,7 +3061,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2165
-location: clients/tests/test-client.py:1073:test_004()/56
+location: clients/tests/test-client.py:1085:test_004()/56
 cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3069,8 +3069,8 @@ stdout: 1898 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -3079,7 +3079,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 737
-location: clients/tests/test-client.py:1075:test_004()/57
+location: clients/tests/test-client.py:1087:test_004()/57
 cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -3092,7 +3092,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 765
-location: clients/tests/test-client.py:1075:test_004()/58
+location: clients/tests/test-client.py:1087:test_004()/58
 cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3105,7 +3105,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 <<<
 size: 310
-location: clients/tests/test-client.py:1077:test_004()/59
+location: clients/tests/test-client.py:1089:test_004()/59
 cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -3118,7 +3118,7 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 
 <<<
 size: 336
-location: clients/tests/test-client.py:1077:test_004()/60
+location: clients/tests/test-client.py:1089:test_004()/60
 cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3131,7 +3131,7 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 
 <<<
 size: 850
-location: clients/tests/test-client.py:1080:test_004()/61
+location: clients/tests/test-client.py:1092:test_004()/61
 cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -3144,7 +3144,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 878
-location: clients/tests/test-client.py:1080:test_004()/62
+location: clients/tests/test-client.py:1092:test_004()/62
 cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3156,12 +3156,12 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 4860
-location: clients/tests/test-client.py:1082:test_004()/63
+size: 4850
+location: clients/tests/test-client.py:1094:test_004()/63
 cmd: $NMCLI -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4715 bytes
+stdout: 4705 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3217,7 +3217,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -3225,7 +3225,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -3256,12 +3256,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4915
-location: clients/tests/test-client.py:1082:test_004()/64
+size: 4905
+location: clients/tests/test-client.py:1094:test_004()/64
 cmd: $NMCLI -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4760 bytes
+stdout: 4750 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3317,7 +3317,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -3325,7 +3325,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -3357,7 +3357,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1511
-location: clients/tests/test-client.py:1084:test_004()/65
+location: clients/tests/test-client.py:1096:test_004()/65
 cmd: $NMCLI -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -3390,7 +3390,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1522
-location: clients/tests/test-client.py:1084:test_004()/66
+location: clients/tests/test-client.py:1096:test_004()/66
 cmd: $NMCLI -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3422,12 +3422,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 4998
-location: clients/tests/test-client.py:1086:test_004()/67
+size: 4988
+location: clients/tests/test-client.py:1098:test_004()/67
 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4715 bytes
+stdout: 4705 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3483,7 +3483,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -3491,7 +3491,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -3522,12 +3522,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5053
-location: clients/tests/test-client.py:1086:test_004()/68
+size: 5043
+location: clients/tests/test-client.py:1098:test_004()/68
 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4760 bytes
+stdout: 4750 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3583,7 +3583,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -3591,7 +3591,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -3623,7 +3623,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 4615
-location: clients/tests/test-client.py:1024:test_004()/69
+location: clients/tests/test-client.py:1036:test_004()/69
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -3724,12 +3724,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4643
-location: clients/tests/test-client.py:1024:test_004()/70
+size: 4645
+location: clients/tests/test-client.py:1036:test_004()/70
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -3820,14 +3820,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4615
-location: clients/tests/test-client.py:1026:test_004()/71
+location: clients/tests/test-client.py:1038:test_004()/71
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -3928,12 +3928,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4643
-location: clients/tests/test-client.py:1026:test_004()/72
+size: 4645
+location: clients/tests/test-client.py:1038:test_004()/72
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4024,14 +4024,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 3534
-location: clients/tests/test-client.py:1029:test_004()/73
+location: clients/tests/test-client.py:1041:test_004()/73
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -4113,7 +4113,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3554
-location: clients/tests/test-client.py:1029:test_004()/74
+location: clients/tests/test-client.py:1041:test_004()/74
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4195,7 +4195,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 488
-location: clients/tests/test-client.py:1035:test_004()/75
+location: clients/tests/test-client.py:1047:test_004()/75
 cmd: $NMCLI --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -4210,7 +4210,7 @@ vpn.timeout:                            0
 
 <<<
 size: 499
-location: clients/tests/test-client.py:1035:test_004()/76
+location: clients/tests/test-client.py:1047:test_004()/76
 cmd: $NMCLI --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4225,7 +4225,7 @@ vpn.timeout:                            0
 
 <<<
 size: 825
-location: clients/tests/test-client.py:1038:test_004()/77
+location: clients/tests/test-client.py:1050:test_004()/77
 cmd: $NMCLI --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -4246,7 +4246,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 838
-location: clients/tests/test-client.py:1038:test_004()/78
+location: clients/tests/test-client.py:1050:test_004()/78
 cmd: $NMCLI --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4267,7 +4267,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 555
-location: clients/tests/test-client.py:1041:test_004()/79
+location: clients/tests/test-client.py:1053:test_004()/79
 cmd: $NMCLI --color yes dev s
 lang: C
 returncode: 0
@@ -4282,7 +4282,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 570
-location: clients/tests/test-client.py:1041:test_004()/80
+location: clients/tests/test-client.py:1053:test_004()/80
 cmd: $NMCLI --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4297,7 +4297,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 1782
-location: clients/tests/test-client.py:1044:test_004()/81
+location: clients/tests/test-client.py:1056:test_004()/81
 cmd: $NMCLI --color yes -f all dev status
 lang: C
 returncode: 0
@@ -4312,7 +4312,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 1797
-location: clients/tests/test-client.py:1044:test_004()/82
+location: clients/tests/test-client.py:1056:test_004()/82
 cmd: $NMCLI --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4327,7 +4327,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 8059
-location: clients/tests/test-client.py:1047:test_004()/83
+location: clients/tests/test-client.py:1059:test_004()/83
 cmd: $NMCLI --color yes dev show
 lang: C
 returncode: 0
@@ -4473,7 +4473,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 8090
-location: clients/tests/test-client.py:1047:test_004()/84
+location: clients/tests/test-client.py:1059:test_004()/84
 cmd: $NMCLI --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4618,12 +4618,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 20970
-location: clients/tests/test-client.py:1050:test_004()/85
+size: 20960
+location: clients/tests/test-client.py:1062:test_004()/85
 cmd: $NMCLI --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 20821 bytes
+stdout: 20811 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -4679,7 +4679,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -4687,7 +4687,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -5007,12 +5007,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 21120
-location: clients/tests/test-client.py:1050:test_004()/86
+size: 21110
+location: clients/tests/test-client.py:1062:test_004()/86
 cmd: $NMCLI --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 20961 bytes
+stdout: 20951 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5068,7 +5068,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -5076,7 +5076,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -5397,7 +5397,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1510
-location: clients/tests/test-client.py:1053:test_004()/87
+location: clients/tests/test-client.py:1065:test_004()/87
 cmd: $NMCLI --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -5430,7 +5430,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1521
-location: clients/tests/test-client.py:1053:test_004()/88
+location: clients/tests/test-client.py:1065:test_004()/88
 cmd: $NMCLI --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5462,12 +5462,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5085
-location: clients/tests/test-client.py:1056:test_004()/89
+size: 5075
+location: clients/tests/test-client.py:1068:test_004()/89
 cmd: $NMCLI --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4921 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5523,7 +5523,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -5531,7 +5531,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -5562,12 +5562,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5140
-location: clients/tests/test-client.py:1056:test_004()/90
+size: 5130
+location: clients/tests/test-client.py:1068:test_004()/90
 cmd: $NMCLI --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4976 bytes
+stdout: 4966 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5623,7 +5623,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -5631,7 +5631,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -5663,7 +5663,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1972
-location: clients/tests/test-client.py:1059:test_004()/91
+location: clients/tests/test-client.py:1071:test_004()/91
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -5708,7 +5708,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 1996
-location: clients/tests/test-client.py:1059:test_004()/92
+location: clients/tests/test-client.py:1071:test_004()/92
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5753,7 +5753,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 1972
-location: clients/tests/test-client.py:1062:test_004()/93
+location: clients/tests/test-client.py:1074:test_004()/93
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -5798,7 +5798,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 1996
-location: clients/tests/test-client.py:1062:test_004()/94
+location: clients/tests/test-client.py:1074:test_004()/94
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5843,7 +5843,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 646
-location: clients/tests/test-client.py:1065:test_004()/95
+location: clients/tests/test-client.py:1077:test_004()/95
 cmd: $NMCLI --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -5858,7 +5858,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 656
-location: clients/tests/test-client.py:1065:test_004()/96
+location: clients/tests/test-client.py:1077:test_004()/96
 cmd: $NMCLI --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5873,7 +5873,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 2608
-location: clients/tests/test-client.py:1068:test_004()/97
+location: clients/tests/test-client.py:1080:test_004()/97
 cmd: $NMCLI --color yes -f ALL device wifi list
 lang: C
 returncode: 0
@@ -5881,8 +5881,8 @@ stdout: 2452 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -5891,7 +5891,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2676
-location: clients/tests/test-client.py:1068:test_004()/98
+location: clients/tests/test-client.py:1080:test_004()/98
 cmd: $NMCLI --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5899,8 +5899,8 @@ stdout: 2510 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -5909,7 +5909,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 918
-location: clients/tests/test-client.py:1070:test_004()/99
+location: clients/tests/test-client.py:1082:test_004()/99
 cmd: $NMCLI --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
@@ -5917,8 +5917,8 @@ stdout: 760 bytes
 >>>
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
@@ -5927,7 +5927,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 979
-location: clients/tests/test-client.py:1070:test_004()/100
+location: clients/tests/test-client.py:1082:test_004()/100
 cmd: $NMCLI --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5935,8 +5935,8 @@ stdout: 810 bytes
 >>>
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
@@ -5945,7 +5945,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 2722
-location: clients/tests/test-client.py:1073:test_004()/101
+location: clients/tests/test-client.py:1085:test_004()/101
 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -5953,8 +5953,8 @@ stdout: 2452 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -5963,7 +5963,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2790
-location: clients/tests/test-client.py:1073:test_004()/102
+location: clients/tests/test-client.py:1085:test_004()/102
 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5971,8 +5971,8 @@ stdout: 2510 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -5981,7 +5981,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 903
-location: clients/tests/test-client.py:1075:test_004()/103
+location: clients/tests/test-client.py:1087:test_004()/103
 cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -5994,7 +5994,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 931
-location: clients/tests/test-client.py:1075:test_004()/104
+location: clients/tests/test-client.py:1087:test_004()/104
 cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6007,7 +6007,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 <<<
 size: 395
-location: clients/tests/test-client.py:1077:test_004()/105
+location: clients/tests/test-client.py:1089:test_004()/105
 cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -6020,7 +6020,7 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 
 <<<
 size: 421
-location: clients/tests/test-client.py:1077:test_004()/106
+location: clients/tests/test-client.py:1089:test_004()/106
 cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6033,7 +6033,7 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 
 <<<
 size: 1016
-location: clients/tests/test-client.py:1080:test_004()/107
+location: clients/tests/test-client.py:1092:test_004()/107
 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -6046,7 +6046,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 1044
-location: clients/tests/test-client.py:1080:test_004()/108
+location: clients/tests/test-client.py:1092:test_004()/108
 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6058,12 +6058,12 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 5089
-location: clients/tests/test-client.py:1082:test_004()/109
+size: 5079
+location: clients/tests/test-client.py:1094:test_004()/109
 cmd: $NMCLI --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4921 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6119,7 +6119,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -6127,7 +6127,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -6158,12 +6158,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5144
-location: clients/tests/test-client.py:1082:test_004()/110
+size: 5134
+location: clients/tests/test-client.py:1094:test_004()/110
 cmd: $NMCLI --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4976 bytes
+stdout: 4966 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6219,7 +6219,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -6227,7 +6227,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -6259,7 +6259,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1524
-location: clients/tests/test-client.py:1084:test_004()/111
+location: clients/tests/test-client.py:1096:test_004()/111
 cmd: $NMCLI --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -6292,7 +6292,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1535
-location: clients/tests/test-client.py:1084:test_004()/112
+location: clients/tests/test-client.py:1096:test_004()/112
 cmd: $NMCLI --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6324,12 +6324,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5227
-location: clients/tests/test-client.py:1086:test_004()/113
+size: 5217
+location: clients/tests/test-client.py:1098:test_004()/113
 cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4921 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6385,7 +6385,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -6393,7 +6393,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -6424,12 +6424,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5282
-location: clients/tests/test-client.py:1086:test_004()/114
+size: 5272
+location: clients/tests/test-client.py:1098:test_004()/114
 cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4976 bytes
+stdout: 4966 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6485,7 +6485,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -6493,7 +6493,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -6525,7 +6525,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 5625
-location: clients/tests/test-client.py:1024:test_004()/115
+location: clients/tests/test-client.py:1036:test_004()/115
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
@@ -6639,12 +6639,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5665
-location: clients/tests/test-client.py:1024:test_004()/116
+size: 5667
+location: clients/tests/test-client.py:1036:test_004()/116
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -6747,7 +6747,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -6755,7 +6755,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 5625
-location: clients/tests/test-client.py:1026:test_004()/117
+location: clients/tests/test-client.py:1038:test_004()/117
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
@@ -6869,12 +6869,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5665
-location: clients/tests/test-client.py:1026:test_004()/118
+size: 5667
+location: clients/tests/test-client.py:1038:test_004()/118
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -6977,7 +6977,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -6985,7 +6985,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4151
-location: clients/tests/test-client.py:1029:test_004()/119
+location: clients/tests/test-client.py:1041:test_004()/119
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -7075,7 +7075,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 4176
-location: clients/tests/test-client.py:1029:test_004()/120
+location: clients/tests/test-client.py:1041:test_004()/120
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7165,7 +7165,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 785
-location: clients/tests/test-client.py:1035:test_004()/121
+location: clients/tests/test-client.py:1047:test_004()/121
 cmd: $NMCLI --pretty -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -7184,7 +7184,7 @@ vpn.timeout:                            0
 
 <<<
 size: 801
-location: clients/tests/test-client.py:1035:test_004()/122
+location: clients/tests/test-client.py:1047:test_004()/122
 cmd: $NMCLI --pretty -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7203,7 +7203,7 @@ vpn.timeout:                            0
 
 <<<
 size: 1136
-location: clients/tests/test-client.py:1038:test_004()/123
+location: clients/tests/test-client.py:1050:test_004()/123
 cmd: $NMCLI --pretty -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -7228,7 +7228,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1156
-location: clients/tests/test-client.py:1038:test_004()/124
+location: clients/tests/test-client.py:1050:test_004()/124
 cmd: $NMCLI --pretty -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7253,7 +7253,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 522
-location: clients/tests/test-client.py:1041:test_004()/125
+location: clients/tests/test-client.py:1053:test_004()/125
 cmd: $NMCLI --pretty dev s
 lang: C
 returncode: 0
@@ -7272,7 +7272,7 @@ wlan1   wifi      unavailable  --
 
 <<<
 size: 530
-location: clients/tests/test-client.py:1041:test_004()/126
+location: clients/tests/test-client.py:1053:test_004()/126
 cmd: $NMCLI --pretty dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7291,7 +7291,7 @@ wlan1   wifi      niedostępne  --
 
 <<<
 size: 1718
-location: clients/tests/test-client.py:1044:test_004()/127
+location: clients/tests/test-client.py:1056:test_004()/127
 cmd: $NMCLI --pretty -f all dev status
 lang: C
 returncode: 0
@@ -7310,7 +7310,7 @@ wlan1   wifi      unavailable  unknown           unknown           /org/freedesk
 
 <<<
 size: 1726
-location: clients/tests/test-client.py:1044:test_004()/128
+location: clients/tests/test-client.py:1056:test_004()/128
 cmd: $NMCLI --pretty -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7329,7 +7329,7 @@ wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedes
 
 <<<
 size: 12873
-location: clients/tests/test-client.py:1047:test_004()/129
+location: clients/tests/test-client.py:1059:test_004()/129
 cmd: $NMCLI --pretty dev show
 lang: C
 returncode: 0
@@ -7537,7 +7537,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 12937
-location: clients/tests/test-client.py:1047:test_004()/130
+location: clients/tests/test-client.py:1059:test_004()/130
 cmd: $NMCLI --pretty dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7744,12 +7744,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 25255
-location: clients/tests/test-client.py:1050:test_004()/131
+size: 25245
+location: clients/tests/test-client.py:1062:test_004()/131
 cmd: $NMCLI --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 25108 bytes
+stdout: 25098 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -7812,7 +7812,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -7821,7 +7821,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -8192,12 +8192,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 25438
-location: clients/tests/test-client.py:1050:test_004()/132
+size: 25428
+location: clients/tests/test-client.py:1062:test_004()/132
 cmd: $NMCLI --pretty -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25281 bytes
+stdout: 25271 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -8260,7 +8260,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -8269,7 +8269,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -8641,7 +8641,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2439
-location: clients/tests/test-client.py:1053:test_004()/133
+location: clients/tests/test-client.py:1065:test_004()/133
 cmd: $NMCLI --pretty dev show wlan0
 lang: C
 returncode: 0
@@ -8686,7 +8686,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2457
-location: clients/tests/test-client.py:1053:test_004()/134
+location: clients/tests/test-client.py:1065:test_004()/134
 cmd: $NMCLI --pretty dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8730,12 +8730,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 5958
-location: clients/tests/test-client.py:1056:test_004()/135
+size: 5948
+location: clients/tests/test-client.py:1068:test_004()/135
 cmd: $NMCLI --pretty -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5806 bytes
+stdout: 5796 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -8798,7 +8798,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -8807,7 +8807,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -8844,12 +8844,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6020
-location: clients/tests/test-client.py:1056:test_004()/136
+size: 6010
+location: clients/tests/test-client.py:1068:test_004()/136
 cmd: $NMCLI --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5858 bytes
+stdout: 5848 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -8912,7 +8912,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -8921,7 +8921,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -8959,7 +8959,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2421
-location: clients/tests/test-client.py:1059:test_004()/137
+location: clients/tests/test-client.py:1071:test_004()/137
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -9010,7 +9010,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 2452
-location: clients/tests/test-client.py:1059:test_004()/138
+location: clients/tests/test-client.py:1071:test_004()/138
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9061,7 +9061,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 2421
-location: clients/tests/test-client.py:1062:test_004()/139
+location: clients/tests/test-client.py:1074:test_004()/139
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -9112,7 +9112,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 2452
-location: clients/tests/test-client.py:1062:test_004()/140
+location: clients/tests/test-client.py:1074:test_004()/140
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9163,7 +9163,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 671
-location: clients/tests/test-client.py:1065:test_004()/141
+location: clients/tests/test-client.py:1077:test_004()/141
 cmd: $NMCLI --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -9182,7 +9182,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 674
-location: clients/tests/test-client.py:1065:test_004()/142
+location: clients/tests/test-client.py:1077:test_004()/142
 cmd: $NMCLI --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9201,7 +9201,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 3026
-location: clients/tests/test-client.py:1068:test_004()/143
+location: clients/tests/test-client.py:1080:test_004()/143
 cmd: $NMCLI --pretty -f ALL device wifi list
 lang: C
 returncode: 0
@@ -9213,8 +9213,8 @@ stdout: 2872 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -9231,7 +9231,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 3264
-location: clients/tests/test-client.py:1068:test_004()/144
+location: clients/tests/test-client.py:1080:test_004()/144
 cmd: $NMCLI --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9243,8 +9243,8 @@ stdout: 3100 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -9261,7 +9261,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 1152
-location: clients/tests/test-client.py:1070:test_004()/145
+location: clients/tests/test-client.py:1082:test_004()/145
 cmd: $NMCLI --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
@@ -9273,8 +9273,8 @@ stdout: 996 bytes
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -9291,7 +9291,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 1383
-location: clients/tests/test-client.py:1070:test_004()/146
+location: clients/tests/test-client.py:1082:test_004()/146
 cmd: $NMCLI --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9303,8 +9303,8 @@ stdout: 1216 bytes
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 --------------------------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -9321,7 +9321,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 3139
-location: clients/tests/test-client.py:1073:test_004()/147
+location: clients/tests/test-client.py:1085:test_004()/147
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -9333,8 +9333,8 @@ stdout: 2872 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -9351,7 +9351,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 3377
-location: clients/tests/test-client.py:1073:test_004()/148
+location: clients/tests/test-client.py:1085:test_004()/148
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9363,8 +9363,8 @@ stdout: 3100 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -9381,7 +9381,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 1141
-location: clients/tests/test-client.py:1075:test_004()/149
+location: clients/tests/test-client.py:1087:test_004()/149
 cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -9398,7 +9398,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 1229
-location: clients/tests/test-client.py:1075:test_004()/150
+location: clients/tests/test-client.py:1087:test_004()/150
 cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9415,7 +9415,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 <<<
 size: 499
-location: clients/tests/test-client.py:1077:test_004()/151
+location: clients/tests/test-client.py:1089:test_004()/151
 cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -9432,7 +9432,7 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 
 <<<
 size: 584
-location: clients/tests/test-client.py:1077:test_004()/152
+location: clients/tests/test-client.py:1089:test_004()/152
 cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9449,7 +9449,7 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 
 <<<
 size: 1254
-location: clients/tests/test-client.py:1080:test_004()/153
+location: clients/tests/test-client.py:1092:test_004()/153
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -9466,7 +9466,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 1342
-location: clients/tests/test-client.py:1080:test_004()/154
+location: clients/tests/test-client.py:1092:test_004()/154
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9482,12 +9482,12 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 5961
-location: clients/tests/test-client.py:1082:test_004()/155
+size: 5951
+location: clients/tests/test-client.py:1094:test_004()/155
 cmd: $NMCLI --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5806 bytes
+stdout: 5796 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -9550,7 +9550,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -9559,7 +9559,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -9596,12 +9596,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6023
-location: clients/tests/test-client.py:1082:test_004()/156
+size: 6013
+location: clients/tests/test-client.py:1094:test_004()/156
 cmd: $NMCLI --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5858 bytes
+stdout: 5848 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -9664,7 +9664,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -9673,7 +9673,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -9711,7 +9711,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2452
-location: clients/tests/test-client.py:1084:test_004()/157
+location: clients/tests/test-client.py:1096:test_004()/157
 cmd: $NMCLI --pretty -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -9756,7 +9756,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2470
-location: clients/tests/test-client.py:1084:test_004()/158
+location: clients/tests/test-client.py:1096:test_004()/158
 cmd: $NMCLI --pretty -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9800,12 +9800,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6099
-location: clients/tests/test-client.py:1086:test_004()/159
+size: 6089
+location: clients/tests/test-client.py:1098:test_004()/159
 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 5806 bytes
+stdout: 5796 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -9868,7 +9868,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -9877,7 +9877,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -9914,12 +9914,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6161
-location: clients/tests/test-client.py:1086:test_004()/160
+size: 6151
+location: clients/tests/test-client.py:1098:test_004()/160
 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5858 bytes
+stdout: 5848 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -9982,7 +9982,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -9991,7 +9991,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -10029,7 +10029,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 5637
-location: clients/tests/test-client.py:1024:test_004()/161
+location: clients/tests/test-client.py:1036:test_004()/161
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -10143,12 +10143,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5677
-location: clients/tests/test-client.py:1024:test_004()/162
+size: 5679
+location: clients/tests/test-client.py:1036:test_004()/162
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -10251,7 +10251,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -10259,7 +10259,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 5637
-location: clients/tests/test-client.py:1026:test_004()/163
+location: clients/tests/test-client.py:1038:test_004()/163
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -10373,12 +10373,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5677
-location: clients/tests/test-client.py:1026:test_004()/164
+size: 5679
+location: clients/tests/test-client.py:1038:test_004()/164
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -10481,7 +10481,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -10489,7 +10489,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4163
-location: clients/tests/test-client.py:1029:test_004()/165
+location: clients/tests/test-client.py:1041:test_004()/165
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -10579,7 +10579,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 4188
-location: clients/tests/test-client.py:1029:test_004()/166
+location: clients/tests/test-client.py:1041:test_004()/166
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10669,7 +10669,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 797
-location: clients/tests/test-client.py:1035:test_004()/167
+location: clients/tests/test-client.py:1047:test_004()/167
 cmd: $NMCLI --pretty --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -10688,7 +10688,7 @@ vpn.timeout:                            0
 
 <<<
 size: 813
-location: clients/tests/test-client.py:1035:test_004()/168
+location: clients/tests/test-client.py:1047:test_004()/168
 cmd: $NMCLI --pretty --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10707,7 +10707,7 @@ vpn.timeout:                            0
 
 <<<
 size: 1148
-location: clients/tests/test-client.py:1038:test_004()/169
+location: clients/tests/test-client.py:1050:test_004()/169
 cmd: $NMCLI --pretty --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -10732,7 +10732,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1168
-location: clients/tests/test-client.py:1038:test_004()/170
+location: clients/tests/test-client.py:1050:test_004()/170
 cmd: $NMCLI --pretty --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10757,7 +10757,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 694
-location: clients/tests/test-client.py:1041:test_004()/171
+location: clients/tests/test-client.py:1053:test_004()/171
 cmd: $NMCLI --pretty --color yes dev s
 lang: C
 returncode: 0
@@ -10776,7 +10776,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 702
-location: clients/tests/test-client.py:1041:test_004()/172
+location: clients/tests/test-client.py:1053:test_004()/172
 cmd: $NMCLI --pretty --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10795,7 +10795,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 2090
-location: clients/tests/test-client.py:1044:test_004()/173
+location: clients/tests/test-client.py:1056:test_004()/173
 cmd: $NMCLI --pretty --color yes -f all dev status
 lang: C
 returncode: 0
@@ -10814,7 +10814,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 2098
-location: clients/tests/test-client.py:1044:test_004()/174
+location: clients/tests/test-client.py:1056:test_004()/174
 cmd: $NMCLI --pretty --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10833,7 +10833,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 12885
-location: clients/tests/test-client.py:1047:test_004()/175
+location: clients/tests/test-client.py:1059:test_004()/175
 cmd: $NMCLI --pretty --color yes dev show
 lang: C
 returncode: 0
@@ -11041,7 +11041,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 12949
-location: clients/tests/test-client.py:1047:test_004()/176
+location: clients/tests/test-client.py:1059:test_004()/176
 cmd: $NMCLI --pretty --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11248,12 +11248,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 25555
-location: clients/tests/test-client.py:1050:test_004()/177
+size: 25545
+location: clients/tests/test-client.py:1062:test_004()/177
 cmd: $NMCLI --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 25396 bytes
+stdout: 25386 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -11316,7 +11316,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -11325,7 +11325,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -11696,12 +11696,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 25738
-location: clients/tests/test-client.py:1050:test_004()/178
+size: 25728
+location: clients/tests/test-client.py:1062:test_004()/178
 cmd: $NMCLI --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25569 bytes
+stdout: 25559 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -11764,7 +11764,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -11773,7 +11773,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -12145,7 +12145,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2451
-location: clients/tests/test-client.py:1053:test_004()/179
+location: clients/tests/test-client.py:1065:test_004()/179
 cmd: $NMCLI --pretty --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -12190,7 +12190,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2469
-location: clients/tests/test-client.py:1053:test_004()/180
+location: clients/tests/test-client.py:1065:test_004()/180
 cmd: $NMCLI --pretty --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12234,12 +12234,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6186
-location: clients/tests/test-client.py:1056:test_004()/181
+size: 6176
+location: clients/tests/test-client.py:1068:test_004()/181
 cmd: $NMCLI --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 6022 bytes
+stdout: 6012 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -12302,7 +12302,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -12311,7 +12311,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -12348,12 +12348,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6248
-location: clients/tests/test-client.py:1056:test_004()/182
+size: 6238
+location: clients/tests/test-client.py:1068:test_004()/182
 cmd: $NMCLI --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6074 bytes
+stdout: 6064 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -12416,7 +12416,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -12425,7 +12425,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -12463,7 +12463,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2433
-location: clients/tests/test-client.py:1059:test_004()/183
+location: clients/tests/test-client.py:1071:test_004()/183
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -12514,7 +12514,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 2464
-location: clients/tests/test-client.py:1059:test_004()/184
+location: clients/tests/test-client.py:1071:test_004()/184
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12565,7 +12565,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 2433
-location: clients/tests/test-client.py:1062:test_004()/185
+location: clients/tests/test-client.py:1074:test_004()/185
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -12616,7 +12616,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 2464
-location: clients/tests/test-client.py:1062:test_004()/186
+location: clients/tests/test-client.py:1074:test_004()/186
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12667,7 +12667,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 803
-location: clients/tests/test-client.py:1065:test_004()/187
+location: clients/tests/test-client.py:1077:test_004()/187
 cmd: $NMCLI --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -12686,7 +12686,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 806
-location: clients/tests/test-client.py:1065:test_004()/188
+location: clients/tests/test-client.py:1077:test_004()/188
 cmd: $NMCLI --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12705,7 +12705,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 3650
-location: clients/tests/test-client.py:1068:test_004()/189
+location: clients/tests/test-client.py:1080:test_004()/189
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list
 lang: C
 returncode: 0
@@ -12717,8 +12717,8 @@ stdout: 3484 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -12735,7 +12735,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 3888
-location: clients/tests/test-client.py:1068:test_004()/190
+location: clients/tests/test-client.py:1080:test_004()/190
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12747,8 +12747,8 @@ stdout: 3712 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -12765,7 +12765,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 1453
-location: clients/tests/test-client.py:1070:test_004()/191
+location: clients/tests/test-client.py:1082:test_004()/191
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
@@ -12777,8 +12777,8 @@ stdout: 1284 bytes
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -12795,7 +12795,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 1683
-location: clients/tests/test-client.py:1070:test_004()/192
+location: clients/tests/test-client.py:1082:test_004()/192
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12807,8 +12807,8 @@ stdout: 1504 bytes
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 --------------------------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -12825,7 +12825,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 3763
-location: clients/tests/test-client.py:1073:test_004()/193
+location: clients/tests/test-client.py:1085:test_004()/193
 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -12837,8 +12837,8 @@ stdout: 3484 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -12855,7 +12855,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 4001
-location: clients/tests/test-client.py:1073:test_004()/194
+location: clients/tests/test-client.py:1085:test_004()/194
 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12867,8 +12867,8 @@ stdout: 3712 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -12885,7 +12885,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 1307
-location: clients/tests/test-client.py:1075:test_004()/195
+location: clients/tests/test-client.py:1087:test_004()/195
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -12902,7 +12902,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 1394
-location: clients/tests/test-client.py:1075:test_004()/196
+location: clients/tests/test-client.py:1087:test_004()/196
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12919,7 +12919,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 <<<
 size: 583
-location: clients/tests/test-client.py:1077:test_004()/197
+location: clients/tests/test-client.py:1089:test_004()/197
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -12936,7 +12936,7 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 
 <<<
 size: 668
-location: clients/tests/test-client.py:1077:test_004()/198
+location: clients/tests/test-client.py:1089:test_004()/198
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12953,7 +12953,7 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 
 <<<
 size: 1420
-location: clients/tests/test-client.py:1080:test_004()/199
+location: clients/tests/test-client.py:1092:test_004()/199
 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -12970,7 +12970,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 1507
-location: clients/tests/test-client.py:1080:test_004()/200
+location: clients/tests/test-client.py:1092:test_004()/200
 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12986,12 +12986,12 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 6189
-location: clients/tests/test-client.py:1082:test_004()/201
+size: 6179
+location: clients/tests/test-client.py:1094:test_004()/201
 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 6022 bytes
+stdout: 6012 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -13054,7 +13054,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -13063,7 +13063,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -13100,12 +13100,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6251
-location: clients/tests/test-client.py:1082:test_004()/202
+size: 6241
+location: clients/tests/test-client.py:1094:test_004()/202
 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6074 bytes
+stdout: 6064 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -13168,7 +13168,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -13177,7 +13177,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -13215,7 +13215,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2464
-location: clients/tests/test-client.py:1084:test_004()/203
+location: clients/tests/test-client.py:1096:test_004()/203
 cmd: $NMCLI --pretty --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -13260,7 +13260,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2482
-location: clients/tests/test-client.py:1084:test_004()/204
+location: clients/tests/test-client.py:1096:test_004()/204
 cmd: $NMCLI --pretty --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13304,12 +13304,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6327
-location: clients/tests/test-client.py:1086:test_004()/205
+size: 6317
+location: clients/tests/test-client.py:1098:test_004()/205
 cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 6022 bytes
+stdout: 6012 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -13372,7 +13372,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -13381,7 +13381,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -13418,12 +13418,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6389
-location: clients/tests/test-client.py:1086:test_004()/206
+size: 6379
+location: clients/tests/test-client.py:1098:test_004()/206
 cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6074 bytes
+stdout: 6064 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -13486,7 +13486,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -13495,7 +13495,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -13533,7 +13533,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2323
-location: clients/tests/test-client.py:1024:test_004()/207
+location: clients/tests/test-client.py:1036:test_004()/207
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
@@ -13635,7 +13635,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2333
-location: clients/tests/test-client.py:1024:test_004()/208
+location: clients/tests/test-client.py:1036:test_004()/208
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13737,7 +13737,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2323
-location: clients/tests/test-client.py:1026:test_004()/209
+location: clients/tests/test-client.py:1038:test_004()/209
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
@@ -13839,7 +13839,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2333
-location: clients/tests/test-client.py:1026:test_004()/210
+location: clients/tests/test-client.py:1038:test_004()/210
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13941,7 +13941,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 1771
-location: clients/tests/test-client.py:1029:test_004()/211
+location: clients/tests/test-client.py:1041:test_004()/211
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -14023,7 +14023,7 @@ proxy.pac-script:
 
 <<<
 size: 1781
-location: clients/tests/test-client.py:1029:test_004()/212
+location: clients/tests/test-client.py:1041:test_004()/212
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14105,7 +14105,7 @@ proxy.pac-script:
 
 <<<
 size: 322
-location: clients/tests/test-client.py:1035:test_004()/213
+location: clients/tests/test-client.py:1047:test_004()/213
 cmd: $NMCLI --terse -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -14120,7 +14120,7 @@ vpn.timeout:0
 
 <<<
 size: 332
-location: clients/tests/test-client.py:1035:test_004()/214
+location: clients/tests/test-client.py:1047:test_004()/214
 cmd: $NMCLI --terse -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14135,7 +14135,7 @@ vpn.timeout:0
 
 <<<
 size: 525
-location: clients/tests/test-client.py:1038:test_004()/215
+location: clients/tests/test-client.py:1050:test_004()/215
 cmd: $NMCLI --terse -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -14156,7 +14156,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 535
-location: clients/tests/test-client.py:1038:test_004()/216
+location: clients/tests/test-client.py:1050:test_004()/216
 cmd: $NMCLI --terse -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14177,7 +14177,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 269
-location: clients/tests/test-client.py:1041:test_004()/217
+location: clients/tests/test-client.py:1053:test_004()/217
 cmd: $NMCLI --terse dev s
 lang: C
 returncode: 0
@@ -14191,7 +14191,7 @@ wlan1:wifi:unavailable:
 
 <<<
 size: 279
-location: clients/tests/test-client.py:1041:test_004()/218
+location: clients/tests/test-client.py:1053:test_004()/218
 cmd: $NMCLI --terse dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14205,7 +14205,7 @@ wlan1:wifi:unavailable:
 
 <<<
 size: 667
-location: clients/tests/test-client.py:1044:test_004()/219
+location: clients/tests/test-client.py:1056:test_004()/219
 cmd: $NMCLI --terse -f all dev status
 lang: C
 returncode: 0
@@ -14219,7 +14219,7 @@ wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 677
-location: clients/tests/test-client.py:1044:test_004()/220
+location: clients/tests/test-client.py:1056:test_004()/220
 cmd: $NMCLI --terse -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14233,7 +14233,7 @@ wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 4540
-location: clients/tests/test-client.py:1047:test_004()/221
+location: clients/tests/test-client.py:1059:test_004()/221
 cmd: $NMCLI --terse dev show
 lang: C
 returncode: 0
@@ -14379,7 +14379,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
 size: 4550
-location: clients/tests/test-client.py:1047:test_004()/222
+location: clients/tests/test-client.py:1059:test_004()/222
 cmd: $NMCLI --terse dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14524,12 +14524,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 11937
-location: clients/tests/test-client.py:1050:test_004()/223
+size: 11927
+location: clients/tests/test-client.py:1062:test_004()/223
 cmd: $NMCLI --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 11791 bytes
+stdout: 11781 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -14585,7 +14585,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -14593,7 +14593,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -14913,12 +14913,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 11983
-location: clients/tests/test-client.py:1050:test_004()/224
+size: 11973
+location: clients/tests/test-client.py:1062:test_004()/224
 cmd: $NMCLI --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 11827 bytes
+stdout: 11817 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -14974,7 +14974,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -14982,7 +14982,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -15303,7 +15303,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 882
-location: clients/tests/test-client.py:1053:test_004()/225
+location: clients/tests/test-client.py:1065:test_004()/225
 cmd: $NMCLI --terse dev show wlan0
 lang: C
 returncode: 0
@@ -15336,7 +15336,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 892
-location: clients/tests/test-client.py:1053:test_004()/226
+location: clients/tests/test-client.py:1065:test_004()/226
 cmd: $NMCLI --terse dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15368,12 +15368,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2703
-location: clients/tests/test-client.py:1056:test_004()/227
+size: 2693
+location: clients/tests/test-client.py:1068:test_004()/227
 cmd: $NMCLI --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2552 bytes
+stdout: 2542 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15429,7 +15429,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -15437,7 +15437,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -15468,12 +15468,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2740
-location: clients/tests/test-client.py:1056:test_004()/228
+size: 2730
+location: clients/tests/test-client.py:1068:test_004()/228
 cmd: $NMCLI --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2579 bytes
+stdout: 2569 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15529,7 +15529,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -15537,7 +15537,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -15569,7 +15569,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 1191
-location: clients/tests/test-client.py:1059:test_004()/229
+location: clients/tests/test-client.py:1071:test_004()/229
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -15614,7 +15614,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 1201
-location: clients/tests/test-client.py:1059:test_004()/230
+location: clients/tests/test-client.py:1071:test_004()/230
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15659,7 +15659,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 1191
-location: clients/tests/test-client.py:1062:test_004()/231
+location: clients/tests/test-client.py:1074:test_004()/231
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -15704,7 +15704,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 1201
-location: clients/tests/test-client.py:1062:test_004()/232
+location: clients/tests/test-client.py:1074:test_004()/232
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15749,7 +15749,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 428
-location: clients/tests/test-client.py:1065:test_004()/233
+location: clients/tests/test-client.py:1077:test_004()/233
 cmd: $NMCLI --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -15763,7 +15763,7 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 438
-location: clients/tests/test-client.py:1065:test_004()/234
+location: clients/tests/test-client.py:1077:test_004()/234
 cmd: $NMCLI --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15776,98 +15776,98 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 1175
-location: clients/tests/test-client.py:1068:test_004()/235
+size: 1086
+location: clients/tests/test-client.py:1080:test_004()/235
 cmd: $NMCLI --terse -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1022 bytes
+stdout: 934 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1233
-location: clients/tests/test-client.py:1068:test_004()/236
+size: 1144
+location: clients/tests/test-client.py:1080:test_004()/236
 cmd: $NMCLI --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1070 bytes
+stdout: 982 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 353
-location: clients/tests/test-client.py:1070:test_004()/237
+size: 343
+location: clients/tests/test-client.py:1082:test_004()/237
 cmd: $NMCLI --terse -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 198 bytes
+stdout: 188 bytes
 >>>
  :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+ :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+ :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 
  :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 399
-location: clients/tests/test-client.py:1070:test_004()/238
+size: 389
+location: clients/tests/test-client.py:1082:test_004()/238
 cmd: $NMCLI --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 234 bytes
+stdout: 224 bytes
 >>>
  :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+ :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+ :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 
  :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 1288
-location: clients/tests/test-client.py:1073:test_004()/239
+size: 1199
+location: clients/tests/test-client.py:1085:test_004()/239
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 1022 bytes
+stdout: 934 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1346
-location: clients/tests/test-client.py:1073:test_004()/240
+size: 1257
+location: clients/tests/test-client.py:1085:test_004()/240
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1070 bytes
+stdout: 982 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
 size: 433
-location: clients/tests/test-client.py:1075:test_004()/241
+location: clients/tests/test-client.py:1087:test_004()/241
 cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -15879,7 +15879,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54
 
 <<<
 size: 455
-location: clients/tests/test-client.py:1075:test_004()/242
+location: clients/tests/test-client.py:1087:test_004()/242
 cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15891,7 +15891,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24
 
 <<<
 size: 229
-location: clients/tests/test-client.py:1077:test_004()/243
+location: clients/tests/test-client.py:1089:test_004()/243
 cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -15903,7 +15903,7 @@ stdout: 51 bytes
 
 <<<
 size: 248
-location: clients/tests/test-client.py:1077:test_004()/244
+location: clients/tests/test-client.py:1089:test_004()/244
 cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15915,7 +15915,7 @@ stdout: 60 bytes
 
 <<<
 size: 546
-location: clients/tests/test-client.py:1080:test_004()/245
+location: clients/tests/test-client.py:1092:test_004()/245
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -15927,7 +15927,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54
 
 <<<
 size: 568
-location: clients/tests/test-client.py:1080:test_004()/246
+location: clients/tests/test-client.py:1092:test_004()/246
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15938,12 +15938,12 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24
 
 
 <<<
-size: 2706
-location: clients/tests/test-client.py:1082:test_004()/247
+size: 2696
+location: clients/tests/test-client.py:1094:test_004()/247
 cmd: $NMCLI --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2552 bytes
+stdout: 2542 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15999,7 +15999,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -16007,7 +16007,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -16038,12 +16038,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2743
-location: clients/tests/test-client.py:1082:test_004()/248
+size: 2733
+location: clients/tests/test-client.py:1094:test_004()/248
 cmd: $NMCLI --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2579 bytes
+stdout: 2569 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -16099,7 +16099,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -16107,7 +16107,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -16139,7 +16139,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 895
-location: clients/tests/test-client.py:1084:test_004()/249
+location: clients/tests/test-client.py:1096:test_004()/249
 cmd: $NMCLI --terse -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -16172,7 +16172,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 905
-location: clients/tests/test-client.py:1084:test_004()/250
+location: clients/tests/test-client.py:1096:test_004()/250
 cmd: $NMCLI --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16204,12 +16204,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2844
-location: clients/tests/test-client.py:1086:test_004()/251
+size: 2834
+location: clients/tests/test-client.py:1098:test_004()/251
 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2552 bytes
+stdout: 2542 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -16265,7 +16265,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -16273,7 +16273,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -16304,12 +16304,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2881
-location: clients/tests/test-client.py:1086:test_004()/252
+size: 2871
+location: clients/tests/test-client.py:1098:test_004()/252
 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2579 bytes
+stdout: 2569 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -16365,7 +16365,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -16373,7 +16373,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -16405,7 +16405,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 2335
-location: clients/tests/test-client.py:1024:test_004()/253
+location: clients/tests/test-client.py:1036:test_004()/253
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -16507,7 +16507,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2345
-location: clients/tests/test-client.py:1024:test_004()/254
+location: clients/tests/test-client.py:1036:test_004()/254
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16609,7 +16609,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2335
-location: clients/tests/test-client.py:1026:test_004()/255
+location: clients/tests/test-client.py:1038:test_004()/255
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -16711,7 +16711,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2345
-location: clients/tests/test-client.py:1026:test_004()/256
+location: clients/tests/test-client.py:1038:test_004()/256
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16813,7 +16813,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 1783
-location: clients/tests/test-client.py:1029:test_004()/257
+location: clients/tests/test-client.py:1041:test_004()/257
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -16895,7 +16895,7 @@ proxy.pac-script:
 
 <<<
 size: 1793
-location: clients/tests/test-client.py:1029:test_004()/258
+location: clients/tests/test-client.py:1041:test_004()/258
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16977,7 +16977,7 @@ proxy.pac-script:
 
 <<<
 size: 334
-location: clients/tests/test-client.py:1035:test_004()/259
+location: clients/tests/test-client.py:1047:test_004()/259
 cmd: $NMCLI --terse --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -16992,7 +16992,7 @@ vpn.timeout:0
 
 <<<
 size: 344
-location: clients/tests/test-client.py:1035:test_004()/260
+location: clients/tests/test-client.py:1047:test_004()/260
 cmd: $NMCLI --terse --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17007,7 +17007,7 @@ vpn.timeout:0
 
 <<<
 size: 537
-location: clients/tests/test-client.py:1038:test_004()/261
+location: clients/tests/test-client.py:1050:test_004()/261
 cmd: $NMCLI --terse --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -17028,7 +17028,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 547
-location: clients/tests/test-client.py:1038:test_004()/262
+location: clients/tests/test-client.py:1050:test_004()/262
 cmd: $NMCLI --terse --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17049,7 +17049,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 441
-location: clients/tests/test-client.py:1041:test_004()/263
+location: clients/tests/test-client.py:1053:test_004()/263
 cmd: $NMCLI --terse --color yes dev s
 lang: C
 returncode: 0
@@ -17063,7 +17063,7 @@ stdout: 295 bytes
 
 <<<
 size: 451
-location: clients/tests/test-client.py:1041:test_004()/264
+location: clients/tests/test-client.py:1053:test_004()/264
 cmd: $NMCLI --terse --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17077,7 +17077,7 @@ stdout: 295 bytes
 
 <<<
 size: 1039
-location: clients/tests/test-client.py:1044:test_004()/265
+location: clients/tests/test-client.py:1056:test_004()/265
 cmd: $NMCLI --terse --color yes -f all dev status
 lang: C
 returncode: 0
@@ -17091,7 +17091,7 @@ stdout: 881 bytes
 
 <<<
 size: 1049
-location: clients/tests/test-client.py:1044:test_004()/266
+location: clients/tests/test-client.py:1056:test_004()/266
 cmd: $NMCLI --terse --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17105,7 +17105,7 @@ stdout: 881 bytes
 
 <<<
 size: 4552
-location: clients/tests/test-client.py:1047:test_004()/267
+location: clients/tests/test-client.py:1059:test_004()/267
 cmd: $NMCLI --terse --color yes dev show
 lang: C
 returncode: 0
@@ -17251,7 +17251,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
 size: 4562
-location: clients/tests/test-client.py:1047:test_004()/268
+location: clients/tests/test-client.py:1059:test_004()/268
 cmd: $NMCLI --terse --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17396,12 +17396,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 12237
-location: clients/tests/test-client.py:1050:test_004()/269
+size: 12227
+location: clients/tests/test-client.py:1062:test_004()/269
 cmd: $NMCLI --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 12079 bytes
+stdout: 12069 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -17457,7 +17457,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -17465,7 +17465,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -17785,12 +17785,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 12283
-location: clients/tests/test-client.py:1050:test_004()/270
+size: 12273
+location: clients/tests/test-client.py:1062:test_004()/270
 cmd: $NMCLI --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 12115 bytes
+stdout: 12105 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -17846,7 +17846,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -17854,7 +17854,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -18175,7 +18175,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 894
-location: clients/tests/test-client.py:1053:test_004()/271
+location: clients/tests/test-client.py:1065:test_004()/271
 cmd: $NMCLI --terse --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -18208,7 +18208,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 904
-location: clients/tests/test-client.py:1053:test_004()/272
+location: clients/tests/test-client.py:1065:test_004()/272
 cmd: $NMCLI --terse --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -18240,12 +18240,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2931
-location: clients/tests/test-client.py:1056:test_004()/273
+size: 2921
+location: clients/tests/test-client.py:1068:test_004()/273
 cmd: $NMCLI --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2768 bytes
+stdout: 2758 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18301,7 +18301,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -18309,7 +18309,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -18340,12 +18340,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2968
-location: clients/tests/test-client.py:1056:test_004()/274
+size: 2958
+location: clients/tests/test-client.py:1068:test_004()/274
 cmd: $NMCLI --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2795 bytes
+stdout: 2785 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18401,7 +18401,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -18409,7 +18409,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -18441,7 +18441,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 1203
-location: clients/tests/test-client.py:1059:test_004()/275
+location: clients/tests/test-client.py:1071:test_004()/275
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -18486,7 +18486,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 1213
-location: clients/tests/test-client.py:1059:test_004()/276
+location: clients/tests/test-client.py:1071:test_004()/276
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -18531,7 +18531,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 1203
-location: clients/tests/test-client.py:1062:test_004()/277
+location: clients/tests/test-client.py:1074:test_004()/277
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -18576,7 +18576,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 1213
-location: clients/tests/test-client.py:1062:test_004()/278
+location: clients/tests/test-client.py:1074:test_004()/278
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -18621,7 +18621,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 560
-location: clients/tests/test-client.py:1065:test_004()/279
+location: clients/tests/test-client.py:1077:test_004()/279
 cmd: $NMCLI --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -18635,7 +18635,7 @@ stdout: 391 bytes
 
 <<<
 size: 570
-location: clients/tests/test-client.py:1065:test_004()/280
+location: clients/tests/test-client.py:1077:test_004()/280
 cmd: $NMCLI --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -18648,98 +18648,98 @@ stdout: 391 bytes
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 1799
-location: clients/tests/test-client.py:1068:test_004()/281
+size: 1711
+location: clients/tests/test-client.py:1080:test_004()/281
 cmd: $NMCLI --terse --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1634 bytes
+stdout: 1546 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1857
-location: clients/tests/test-client.py:1068:test_004()/282
+size: 1769
+location: clients/tests/test-client.py:1080:test_004()/282
 cmd: $NMCLI --terse --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1682 bytes
+stdout: 1594 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 653
-location: clients/tests/test-client.py:1070:test_004()/283
+size: 643
+location: clients/tests/test-client.py:1082:test_004()/283
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 486 bytes
+stdout: 476 bytes
 >>>
  :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+ :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+ :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 
  :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 699
-location: clients/tests/test-client.py:1070:test_004()/284
+size: 689
+location: clients/tests/test-client.py:1082:test_004()/284
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 522 bytes
+stdout: 512 bytes
 >>>
  :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+ :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+ :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 
  :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 1912
-location: clients/tests/test-client.py:1073:test_004()/285
+size: 1824
+location: clients/tests/test-client.py:1085:test_004()/285
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 1634 bytes
+stdout: 1546 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1970
-location: clients/tests/test-client.py:1073:test_004()/286
+size: 1882
+location: clients/tests/test-client.py:1085:test_004()/286
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1682 bytes
+stdout: 1594 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
 size: 598
-location: clients/tests/test-client.py:1075:test_004()/287
+location: clients/tests/test-client.py:1087:test_004()/287
 cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -18751,7 +18751,7 @@ stdout: 410 bytes
 
 <<<
 size: 620
-location: clients/tests/test-client.py:1075:test_004()/288
+location: clients/tests/test-client.py:1087:test_004()/288
 cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -18763,7 +18763,7 @@ stdout: 422 bytes
 
 <<<
 size: 314
-location: clients/tests/test-client.py:1077:test_004()/289
+location: clients/tests/test-client.py:1089:test_004()/289
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -18775,7 +18775,7 @@ stdout: 123 bytes
 
 <<<
 size: 333
-location: clients/tests/test-client.py:1077:test_004()/290
+location: clients/tests/test-client.py:1089:test_004()/290
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -18787,7 +18787,7 @@ stdout: 132 bytes
 
 <<<
 size: 711
-location: clients/tests/test-client.py:1080:test_004()/291
+location: clients/tests/test-client.py:1092:test_004()/291
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -18799,7 +18799,7 @@ stdout: 410 bytes
 
 <<<
 size: 733
-location: clients/tests/test-client.py:1080:test_004()/292
+location: clients/tests/test-client.py:1092:test_004()/292
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -18810,12 +18810,12 @@ stdout: 422 bytes
 
 
 <<<
-size: 2934
-location: clients/tests/test-client.py:1082:test_004()/293
+size: 2924
+location: clients/tests/test-client.py:1094:test_004()/293
 cmd: $NMCLI --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2768 bytes
+stdout: 2758 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18871,7 +18871,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -18879,7 +18879,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -18910,12 +18910,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2971
-location: clients/tests/test-client.py:1082:test_004()/294
+size: 2961
+location: clients/tests/test-client.py:1094:test_004()/294
 cmd: $NMCLI --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2795 bytes
+stdout: 2785 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18971,7 +18971,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -18979,7 +18979,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -19011,7 +19011,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 907
-location: clients/tests/test-client.py:1084:test_004()/295
+location: clients/tests/test-client.py:1096:test_004()/295
 cmd: $NMCLI --terse --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -19044,7 +19044,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 917
-location: clients/tests/test-client.py:1084:test_004()/296
+location: clients/tests/test-client.py:1096:test_004()/296
 cmd: $NMCLI --terse --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19076,12 +19076,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3072
-location: clients/tests/test-client.py:1086:test_004()/297
+size: 3062
+location: clients/tests/test-client.py:1098:test_004()/297
 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2768 bytes
+stdout: 2758 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -19137,7 +19137,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -19145,7 +19145,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -19176,12 +19176,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3109
-location: clients/tests/test-client.py:1086:test_004()/298
+size: 3099
+location: clients/tests/test-client.py:1098:test_004()/298
 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2795 bytes
+stdout: 2785 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -19237,7 +19237,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -19245,7 +19245,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -19277,7 +19277,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 2978
-location: clients/tests/test-client.py:1024:test_004()/299
+location: clients/tests/test-client.py:1036:test_004()/299
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
@@ -19305,12 +19305,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2999
-location: clients/tests/test-client.py:1024:test_004()/300
+size: 3001
+location: clients/tests/test-client.py:1036:test_004()/300
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2837 bytes
+stdout: 2839 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr        
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default) 
@@ -19331,11 +19331,11 @@ GROUP    NAME       UUID                                  DEVICES  STATE       D
 GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 2978
-location: clients/tests/test-client.py:1026:test_004()/301
+location: clients/tests/test-client.py:1038:test_004()/301
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
@@ -19363,12 +19363,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2999
-location: clients/tests/test-client.py:1026:test_004()/302
+size: 3001
+location: clients/tests/test-client.py:1038:test_004()/302
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2837 bytes
+stdout: 2839 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr        
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default) 
@@ -19389,11 +19389,11 @@ GROUP    NAME       UUID                                  DEVICES  STATE       D
 GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 2246
-location: clients/tests/test-client.py:1029:test_004()/303
+location: clients/tests/test-client.py:1041:test_004()/303
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -19417,7 +19417,7 @@ proxy  none    no            --       --
 
 <<<
 size: 2258
-location: clients/tests/test-client.py:1029:test_004()/304
+location: clients/tests/test-client.py:1041:test_004()/304
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19441,7 +19441,7 @@ proxy  none    nie           --       --
 
 <<<
 size: 412
-location: clients/tests/test-client.py:1035:test_004()/305
+location: clients/tests/test-client.py:1047:test_004()/305
 cmd: $NMCLI --mode tabular -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -19452,7 +19452,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 422
-location: clients/tests/test-client.py:1035:test_004()/306
+location: clients/tests/test-client.py:1047:test_004()/306
 cmd: $NMCLI --mode tabular -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19463,7 +19463,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 644
-location: clients/tests/test-client.py:1038:test_004()/307
+location: clients/tests/test-client.py:1050:test_004()/307
 cmd: $NMCLI --mode tabular -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -19474,7 +19474,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no
 
 <<<
 size: 656
-location: clients/tests/test-client.py:1038:test_004()/308
+location: clients/tests/test-client.py:1050:test_004()/308
 cmd: $NMCLI --mode tabular -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19485,7 +19485,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 <<<
 size: 399
-location: clients/tests/test-client.py:1041:test_004()/309
+location: clients/tests/test-client.py:1053:test_004()/309
 cmd: $NMCLI --mode tabular dev s
 lang: C
 returncode: 0
@@ -19500,7 +19500,7 @@ wlan1   wifi      unavailable  --
 
 <<<
 size: 414
-location: clients/tests/test-client.py:1041:test_004()/310
+location: clients/tests/test-client.py:1053:test_004()/310
 cmd: $NMCLI --mode tabular dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19515,7 +19515,7 @@ wlan1   wifi      niedostępne  --
 
 <<<
 size: 1426
-location: clients/tests/test-client.py:1044:test_004()/311
+location: clients/tests/test-client.py:1056:test_004()/311
 cmd: $NMCLI --mode tabular -f all dev status
 lang: C
 returncode: 0
@@ -19530,7 +19530,7 @@ wlan1   wifi      unavailable  unknown           unknown           /org/freedesk
 
 <<<
 size: 1441
-location: clients/tests/test-client.py:1044:test_004()/312
+location: clients/tests/test-client.py:1056:test_004()/312
 cmd: $NMCLI --mode tabular -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19545,7 +19545,7 @@ wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedes
 
 <<<
 size: 6361
-location: clients/tests/test-client.py:1047:test_004()/313
+location: clients/tests/test-client.py:1059:test_004()/313
 cmd: $NMCLI --mode tabular dev show
 lang: C
 returncode: 0
@@ -19694,7 +19694,7 @@ IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0
 
 <<<
 size: 6388
-location: clients/tests/test-client.py:1047:test_004()/314
+location: clients/tests/test-client.py:1059:test_004()/314
 cmd: $NMCLI --mode tabular dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19843,7 +19843,7 @@ IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0
 
 <<<
 size: 14861
-location: clients/tests/test-client.py:1050:test_004()/315
+location: clients/tests/test-client.py:1062:test_004()/315
 cmd: $NMCLI --mode tabular -f all dev show
 lang: C
 returncode: 0
@@ -19860,8 +19860,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -19981,7 +19981,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 15020
-location: clients/tests/test-client.py:1050:test_004()/316
+location: clients/tests/test-client.py:1062:test_004()/316
 cmd: $NMCLI --mode tabular -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19998,8 +19998,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20119,7 +20119,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1130
-location: clients/tests/test-client.py:1053:test_004()/317
+location: clients/tests/test-client.py:1065:test_004()/317
 cmd: $NMCLI --mode tabular dev show wlan0
 lang: C
 returncode: 0
@@ -20154,7 +20154,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1141
-location: clients/tests/test-client.py:1053:test_004()/318
+location: clients/tests/test-client.py:1065:test_004()/318
 cmd: $NMCLI --mode tabular dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20189,7 +20189,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 3012
-location: clients/tests/test-client.py:1056:test_004()/319
+location: clients/tests/test-client.py:1068:test_004()/319
 cmd: $NMCLI --mode tabular -f all dev show wlan0
 lang: C
 returncode: 0
@@ -20206,8 +20206,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20226,7 +20226,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 3075
-location: clients/tests/test-client.py:1056:test_004()/320
+location: clients/tests/test-client.py:1068:test_004()/320
 cmd: $NMCLI --mode tabular -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20243,8 +20243,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20263,7 +20263,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1251
-location: clients/tests/test-client.py:1059:test_004()/321
+location: clients/tests/test-client.py:1071:test_004()/321
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -20280,7 +20280,7 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 <<<
 size: 1278
-location: clients/tests/test-client.py:1059:test_004()/322
+location: clients/tests/test-client.py:1071:test_004()/322
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20297,7 +20297,7 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 <<<
 size: 1251
-location: clients/tests/test-client.py:1062:test_004()/323
+location: clients/tests/test-client.py:1074:test_004()/323
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -20314,7 +20314,7 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 <<<
 size: 1278
-location: clients/tests/test-client.py:1062:test_004()/324
+location: clients/tests/test-client.py:1074:test_004()/324
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20331,7 +20331,7 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 <<<
 size: 530
-location: clients/tests/test-client.py:1065:test_004()/325
+location: clients/tests/test-client.py:1077:test_004()/325
 cmd: $NMCLI --mode tabular -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -20346,7 +20346,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 540
-location: clients/tests/test-client.py:1065:test_004()/326
+location: clients/tests/test-client.py:1077:test_004()/326
 cmd: $NMCLI --mode tabular -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20361,7 +20361,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 2000
-location: clients/tests/test-client.py:1068:test_004()/327
+location: clients/tests/test-client.py:1080:test_004()/327
 cmd: $NMCLI --mode tabular -f ALL device wifi list
 lang: C
 returncode: 0
@@ -20369,8 +20369,8 @@ stdout: 1840 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -20379,7 +20379,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2068
-location: clients/tests/test-client.py:1068:test_004()/328
+location: clients/tests/test-client.py:1080:test_004()/328
 cmd: $NMCLI --mode tabular -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20387,8 +20387,8 @@ stdout: 1898 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -20397,7 +20397,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 634
-location: clients/tests/test-client.py:1070:test_004()/329
+location: clients/tests/test-client.py:1082:test_004()/329
 cmd: $NMCLI --mode tabular -f COMMON device wifi list
 lang: C
 returncode: 0
@@ -20405,8 +20405,8 @@ stdout: 472 bytes
 >>>
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
@@ -20415,7 +20415,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 694
-location: clients/tests/test-client.py:1070:test_004()/330
+location: clients/tests/test-client.py:1082:test_004()/330
 cmd: $NMCLI --mode tabular -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20423,8 +20423,8 @@ stdout: 522 bytes
 >>>
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
@@ -20433,7 +20433,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 2113
-location: clients/tests/test-client.py:1073:test_004()/331
+location: clients/tests/test-client.py:1085:test_004()/331
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -20441,8 +20441,8 @@ stdout: 1840 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -20451,7 +20451,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2181
-location: clients/tests/test-client.py:1073:test_004()/332
+location: clients/tests/test-client.py:1085:test_004()/332
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20459,8 +20459,8 @@ stdout: 1898 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -20469,7 +20469,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 753
-location: clients/tests/test-client.py:1075:test_004()/333
+location: clients/tests/test-client.py:1087:test_004()/333
 cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -20482,7 +20482,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 781
-location: clients/tests/test-client.py:1075:test_004()/334
+location: clients/tests/test-client.py:1087:test_004()/334
 cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20495,7 +20495,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 <<<
 size: 326
-location: clients/tests/test-client.py:1077:test_004()/335
+location: clients/tests/test-client.py:1089:test_004()/335
 cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -20508,7 +20508,7 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 
 <<<
 size: 352
-location: clients/tests/test-client.py:1077:test_004()/336
+location: clients/tests/test-client.py:1089:test_004()/336
 cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20521,7 +20521,7 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 
 <<<
 size: 866
-location: clients/tests/test-client.py:1080:test_004()/337
+location: clients/tests/test-client.py:1092:test_004()/337
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -20534,7 +20534,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 894
-location: clients/tests/test-client.py:1080:test_004()/338
+location: clients/tests/test-client.py:1092:test_004()/338
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20547,7 +20547,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 <<<
 size: 3015
-location: clients/tests/test-client.py:1082:test_004()/339
+location: clients/tests/test-client.py:1094:test_004()/339
 cmd: $NMCLI --mode tabular -f ALL device show wlan0
 lang: C
 returncode: 0
@@ -20564,8 +20564,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20584,7 +20584,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 3078
-location: clients/tests/test-client.py:1082:test_004()/340
+location: clients/tests/test-client.py:1094:test_004()/340
 cmd: $NMCLI --mode tabular -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20601,8 +20601,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20621,7 +20621,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1143
-location: clients/tests/test-client.py:1084:test_004()/341
+location: clients/tests/test-client.py:1096:test_004()/341
 cmd: $NMCLI --mode tabular -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -20656,7 +20656,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1154
-location: clients/tests/test-client.py:1084:test_004()/342
+location: clients/tests/test-client.py:1096:test_004()/342
 cmd: $NMCLI --mode tabular -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20691,7 +20691,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 3153
-location: clients/tests/test-client.py:1086:test_004()/343
+location: clients/tests/test-client.py:1098:test_004()/343
 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
@@ -20708,8 +20708,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20728,7 +20728,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 3216
-location: clients/tests/test-client.py:1086:test_004()/344
+location: clients/tests/test-client.py:1098:test_004()/344
 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20745,8 +20745,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20765,7 +20765,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 2990
-location: clients/tests/test-client.py:1024:test_004()/345
+location: clients/tests/test-client.py:1036:test_004()/345
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -20793,12 +20793,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3011
-location: clients/tests/test-client.py:1024:test_004()/346
+size: 3013
+location: clients/tests/test-client.py:1036:test_004()/346
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2837 bytes
+stdout: 2839 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr        
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default) 
@@ -20819,11 +20819,11 @@ GROUP    NAME       UUID                                  DEVICES  STATE       D
 GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 2990
-location: clients/tests/test-client.py:1026:test_004()/347
+location: clients/tests/test-client.py:1038:test_004()/347
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -20851,12 +20851,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3011
-location: clients/tests/test-client.py:1026:test_004()/348
+size: 3013
+location: clients/tests/test-client.py:1038:test_004()/348
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2837 bytes
+stdout: 2839 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr        
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default) 
@@ -20877,11 +20877,11 @@ GROUP    NAME       UUID                                  DEVICES  STATE       D
 GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 2258
-location: clients/tests/test-client.py:1029:test_004()/349
+location: clients/tests/test-client.py:1041:test_004()/349
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -20905,7 +20905,7 @@ proxy  none    no            --       --
 
 <<<
 size: 2270
-location: clients/tests/test-client.py:1029:test_004()/350
+location: clients/tests/test-client.py:1041:test_004()/350
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20929,7 +20929,7 @@ proxy  none    nie           --       --
 
 <<<
 size: 424
-location: clients/tests/test-client.py:1035:test_004()/351
+location: clients/tests/test-client.py:1047:test_004()/351
 cmd: $NMCLI --mode tabular --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -20940,7 +20940,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 434
-location: clients/tests/test-client.py:1035:test_004()/352
+location: clients/tests/test-client.py:1047:test_004()/352
 cmd: $NMCLI --mode tabular --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20951,7 +20951,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 656
-location: clients/tests/test-client.py:1038:test_004()/353
+location: clients/tests/test-client.py:1050:test_004()/353
 cmd: $NMCLI --mode tabular --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -20962,7 +20962,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no
 
 <<<
 size: 668
-location: clients/tests/test-client.py:1038:test_004()/354
+location: clients/tests/test-client.py:1050:test_004()/354
 cmd: $NMCLI --mode tabular --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20973,7 +20973,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 <<<
 size: 571
-location: clients/tests/test-client.py:1041:test_004()/355
+location: clients/tests/test-client.py:1053:test_004()/355
 cmd: $NMCLI --mode tabular --color yes dev s
 lang: C
 returncode: 0
@@ -20988,7 +20988,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 586
-location: clients/tests/test-client.py:1041:test_004()/356
+location: clients/tests/test-client.py:1053:test_004()/356
 cmd: $NMCLI --mode tabular --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21003,7 +21003,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 1798
-location: clients/tests/test-client.py:1044:test_004()/357
+location: clients/tests/test-client.py:1056:test_004()/357
 cmd: $NMCLI --mode tabular --color yes -f all dev status
 lang: C
 returncode: 0
@@ -21018,7 +21018,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 1813
-location: clients/tests/test-client.py:1044:test_004()/358
+location: clients/tests/test-client.py:1056:test_004()/358
 cmd: $NMCLI --mode tabular --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21033,7 +21033,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 6373
-location: clients/tests/test-client.py:1047:test_004()/359
+location: clients/tests/test-client.py:1059:test_004()/359
 cmd: $NMCLI --mode tabular --color yes dev show
 lang: C
 returncode: 0
@@ -21182,7 +21182,7 @@ IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0
 
 <<<
 size: 6400
-location: clients/tests/test-client.py:1047:test_004()/360
+location: clients/tests/test-client.py:1059:test_004()/360
 cmd: $NMCLI --mode tabular --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21331,7 +21331,7 @@ IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0
 
 <<<
 size: 15197
-location: clients/tests/test-client.py:1050:test_004()/361
+location: clients/tests/test-client.py:1062:test_004()/361
 cmd: $NMCLI --mode tabular --color yes -f all dev show
 lang: C
 returncode: 0
@@ -21348,8 +21348,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21469,7 +21469,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 15356
-location: clients/tests/test-client.py:1050:test_004()/362
+location: clients/tests/test-client.py:1062:test_004()/362
 cmd: $NMCLI --mode tabular --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21486,8 +21486,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21607,7 +21607,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1142
-location: clients/tests/test-client.py:1053:test_004()/363
+location: clients/tests/test-client.py:1065:test_004()/363
 cmd: $NMCLI --mode tabular --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -21642,7 +21642,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1153
-location: clients/tests/test-client.py:1053:test_004()/364
+location: clients/tests/test-client.py:1065:test_004()/364
 cmd: $NMCLI --mode tabular --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21677,7 +21677,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 3267
-location: clients/tests/test-client.py:1056:test_004()/365
+location: clients/tests/test-client.py:1068:test_004()/365
 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0
 lang: C
 returncode: 0
@@ -21694,8 +21694,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21714,7 +21714,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 3330
-location: clients/tests/test-client.py:1056:test_004()/366
+location: clients/tests/test-client.py:1068:test_004()/366
 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21731,8 +21731,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21751,7 +21751,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1263
-location: clients/tests/test-client.py:1059:test_004()/367
+location: clients/tests/test-client.py:1071:test_004()/367
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -21768,7 +21768,7 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 <<<
 size: 1290
-location: clients/tests/test-client.py:1059:test_004()/368
+location: clients/tests/test-client.py:1071:test_004()/368
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21785,7 +21785,7 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 <<<
 size: 1263
-location: clients/tests/test-client.py:1062:test_004()/369
+location: clients/tests/test-client.py:1074:test_004()/369
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -21802,7 +21802,7 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 <<<
 size: 1290
-location: clients/tests/test-client.py:1062:test_004()/370
+location: clients/tests/test-client.py:1074:test_004()/370
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21819,7 +21819,7 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 <<<
 size: 662
-location: clients/tests/test-client.py:1065:test_004()/371
+location: clients/tests/test-client.py:1077:test_004()/371
 cmd: $NMCLI --mode tabular --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -21834,7 +21834,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 672
-location: clients/tests/test-client.py:1065:test_004()/372
+location: clients/tests/test-client.py:1077:test_004()/372
 cmd: $NMCLI --mode tabular --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21849,7 +21849,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 2624
-location: clients/tests/test-client.py:1068:test_004()/373
+location: clients/tests/test-client.py:1080:test_004()/373
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list
 lang: C
 returncode: 0
@@ -21857,8 +21857,8 @@ stdout: 2452 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -21867,7 +21867,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2692
-location: clients/tests/test-client.py:1068:test_004()/374
+location: clients/tests/test-client.py:1080:test_004()/374
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21875,8 +21875,8 @@ stdout: 2510 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -21885,7 +21885,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 934
-location: clients/tests/test-client.py:1070:test_004()/375
+location: clients/tests/test-client.py:1082:test_004()/375
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
@@ -21893,8 +21893,8 @@ stdout: 760 bytes
 >>>
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
@@ -21903,7 +21903,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 994
-location: clients/tests/test-client.py:1070:test_004()/376
+location: clients/tests/test-client.py:1082:test_004()/376
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21911,8 +21911,8 @@ stdout: 810 bytes
 >>>
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
@@ -21921,7 +21921,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 2737
-location: clients/tests/test-client.py:1073:test_004()/377
+location: clients/tests/test-client.py:1085:test_004()/377
 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -21929,8 +21929,8 @@ stdout: 2452 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -21939,7 +21939,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2805
-location: clients/tests/test-client.py:1073:test_004()/378
+location: clients/tests/test-client.py:1085:test_004()/378
 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21947,8 +21947,8 @@ stdout: 2510 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -21957,7 +21957,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 918
-location: clients/tests/test-client.py:1075:test_004()/379
+location: clients/tests/test-client.py:1087:test_004()/379
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -21970,7 +21970,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 946
-location: clients/tests/test-client.py:1075:test_004()/380
+location: clients/tests/test-client.py:1087:test_004()/380
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21983,7 +21983,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 <<<
 size: 410
-location: clients/tests/test-client.py:1077:test_004()/381
+location: clients/tests/test-client.py:1089:test_004()/381
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -21996,7 +21996,7 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 
 <<<
 size: 436
-location: clients/tests/test-client.py:1077:test_004()/382
+location: clients/tests/test-client.py:1089:test_004()/382
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22009,7 +22009,7 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 
 <<<
 size: 1031
-location: clients/tests/test-client.py:1080:test_004()/383
+location: clients/tests/test-client.py:1092:test_004()/383
 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -22022,7 +22022,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 1059
-location: clients/tests/test-client.py:1080:test_004()/384
+location: clients/tests/test-client.py:1092:test_004()/384
 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22035,7 +22035,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 <<<
 size: 3270
-location: clients/tests/test-client.py:1082:test_004()/385
+location: clients/tests/test-client.py:1094:test_004()/385
 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
@@ -22052,8 +22052,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -22072,7 +22072,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 3333
-location: clients/tests/test-client.py:1082:test_004()/386
+location: clients/tests/test-client.py:1094:test_004()/386
 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22089,8 +22089,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -22109,7 +22109,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1155
-location: clients/tests/test-client.py:1084:test_004()/387
+location: clients/tests/test-client.py:1096:test_004()/387
 cmd: $NMCLI --mode tabular --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -22144,7 +22144,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1166
-location: clients/tests/test-client.py:1084:test_004()/388
+location: clients/tests/test-client.py:1096:test_004()/388
 cmd: $NMCLI --mode tabular --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22179,7 +22179,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 3408
-location: clients/tests/test-client.py:1086:test_004()/389
+location: clients/tests/test-client.py:1098:test_004()/389
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
@@ -22196,8 +22196,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -22216,7 +22216,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 3471
-location: clients/tests/test-client.py:1086:test_004()/390
+location: clients/tests/test-client.py:1098:test_004()/390
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22233,8 +22233,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -22253,7 +22253,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 4742
-location: clients/tests/test-client.py:1024:test_004()/391
+location: clients/tests/test-client.py:1036:test_004()/391
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
@@ -22294,12 +22294,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4796
-location: clients/tests/test-client.py:1024:test_004()/392
+size: 4798
+location: clients/tests/test-client.py:1036:test_004()/392
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4625 bytes
+stdout: 4627 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -22333,11 +22333,11 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 4742
-location: clients/tests/test-client.py:1026:test_004()/393
+location: clients/tests/test-client.py:1038:test_004()/393
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
@@ -22378,12 +22378,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4796
-location: clients/tests/test-client.py:1026:test_004()/394
+size: 4798
+location: clients/tests/test-client.py:1038:test_004()/394
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4625 bytes
+stdout: 4627 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -22417,11 +22417,11 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 3428
-location: clients/tests/test-client.py:1029:test_004()/395
+location: clients/tests/test-client.py:1041:test_004()/395
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -22453,7 +22453,7 @@ proxy  none    no            --       --
 
 <<<
 size: 3451
-location: clients/tests/test-client.py:1029:test_004()/396
+location: clients/tests/test-client.py:1041:test_004()/396
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22485,7 +22485,7 @@ proxy  none    nie           --       --
 
 <<<
 size: 676
-location: clients/tests/test-client.py:1035:test_004()/397
+location: clients/tests/test-client.py:1047:test_004()/397
 cmd: $NMCLI --mode tabular --pretty -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -22500,7 +22500,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 696
-location: clients/tests/test-client.py:1035:test_004()/398
+location: clients/tests/test-client.py:1047:test_004()/398
 cmd: $NMCLI --mode tabular --pretty -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22515,7 +22515,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 1106
-location: clients/tests/test-client.py:1038:test_004()/399
+location: clients/tests/test-client.py:1050:test_004()/399
 cmd: $NMCLI --mode tabular --pretty -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -22530,7 +22530,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no
 
 <<<
 size: 1138
-location: clients/tests/test-client.py:1038:test_004()/400
+location: clients/tests/test-client.py:1050:test_004()/400
 cmd: $NMCLI --mode tabular --pretty -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22545,7 +22545,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 <<<
 size: 537
-location: clients/tests/test-client.py:1041:test_004()/401
+location: clients/tests/test-client.py:1053:test_004()/401
 cmd: $NMCLI --mode tabular --pretty dev s
 lang: C
 returncode: 0
@@ -22564,7 +22564,7 @@ wlan1   wifi      unavailable  --
 
 <<<
 size: 545
-location: clients/tests/test-client.py:1041:test_004()/402
+location: clients/tests/test-client.py:1053:test_004()/402
 cmd: $NMCLI --mode tabular --pretty dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22583,7 +22583,7 @@ wlan1   wifi      niedostępne  --
 
 <<<
 size: 1733
-location: clients/tests/test-client.py:1044:test_004()/403
+location: clients/tests/test-client.py:1056:test_004()/403
 cmd: $NMCLI --mode tabular --pretty -f all dev status
 lang: C
 returncode: 0
@@ -22602,7 +22602,7 @@ wlan1   wifi      unavailable  unknown           unknown           /org/freedesk
 
 <<<
 size: 1741
-location: clients/tests/test-client.py:1044:test_004()/404
+location: clients/tests/test-client.py:1056:test_004()/404
 cmd: $NMCLI --mode tabular --pretty -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22621,7 +22621,7 @@ wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedes
 
 <<<
 size: 9891
-location: clients/tests/test-client.py:1047:test_004()/405
+location: clients/tests/test-client.py:1059:test_004()/405
 cmd: $NMCLI --mode tabular --pretty dev show
 lang: C
 returncode: 0
@@ -22832,7 +22832,7 @@ IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0
 
 <<<
 size: 10067
-location: clients/tests/test-client.py:1047:test_004()/406
+location: clients/tests/test-client.py:1059:test_004()/406
 cmd: $NMCLI --mode tabular --pretty dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23043,7 +23043,7 @@ IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0
 
 <<<
 size: 22590
-location: clients/tests/test-client.py:1050:test_004()/407
+location: clients/tests/test-client.py:1062:test_004()/407
 cmd: $NMCLI --mode tabular --pretty -f all dev show
 lang: C
 returncode: 0
@@ -23067,8 +23067,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23239,7 +23239,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 22951
-location: clients/tests/test-client.py:1050:test_004()/408
+location: clients/tests/test-client.py:1062:test_004()/408
 cmd: $NMCLI --mode tabular --pretty -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23263,8 +23263,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23435,7 +23435,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1714
-location: clients/tests/test-client.py:1053:test_004()/409
+location: clients/tests/test-client.py:1065:test_004()/409
 cmd: $NMCLI --mode tabular --pretty dev show wlan0
 lang: C
 returncode: 0
@@ -23482,7 +23482,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1754
-location: clients/tests/test-client.py:1053:test_004()/410
+location: clients/tests/test-client.py:1065:test_004()/410
 cmd: $NMCLI --mode tabular --pretty dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23529,7 +23529,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 4456
-location: clients/tests/test-client.py:1056:test_004()/411
+location: clients/tests/test-client.py:1068:test_004()/411
 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0
 lang: C
 returncode: 0
@@ -23553,8 +23553,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23578,7 +23578,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 4564
-location: clients/tests/test-client.py:1056:test_004()/412
+location: clients/tests/test-client.py:1068:test_004()/412
 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23602,8 +23602,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23627,7 +23627,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1870
-location: clients/tests/test-client.py:1059:test_004()/413
+location: clients/tests/test-client.py:1071:test_004()/413
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -23650,7 +23650,7 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 <<<
 size: 1934
-location: clients/tests/test-client.py:1059:test_004()/414
+location: clients/tests/test-client.py:1071:test_004()/414
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23673,7 +23673,7 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 <<<
 size: 1870
-location: clients/tests/test-client.py:1062:test_004()/415
+location: clients/tests/test-client.py:1074:test_004()/415
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -23696,7 +23696,7 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 <<<
 size: 1934
-location: clients/tests/test-client.py:1062:test_004()/416
+location: clients/tests/test-client.py:1074:test_004()/416
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23719,7 +23719,7 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 <<<
 size: 686
-location: clients/tests/test-client.py:1065:test_004()/417
+location: clients/tests/test-client.py:1077:test_004()/417
 cmd: $NMCLI --mode tabular --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -23738,7 +23738,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 689
-location: clients/tests/test-client.py:1065:test_004()/418
+location: clients/tests/test-client.py:1077:test_004()/418
 cmd: $NMCLI --mode tabular --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23757,7 +23757,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 3041
-location: clients/tests/test-client.py:1068:test_004()/419
+location: clients/tests/test-client.py:1080:test_004()/419
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
 lang: C
 returncode: 0
@@ -23769,8 +23769,8 @@ stdout: 2872 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -23787,7 +23787,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 3279
-location: clients/tests/test-client.py:1068:test_004()/420
+location: clients/tests/test-client.py:1080:test_004()/420
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23799,8 +23799,8 @@ stdout: 3100 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -23817,7 +23817,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 1167
-location: clients/tests/test-client.py:1070:test_004()/421
+location: clients/tests/test-client.py:1082:test_004()/421
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
@@ -23829,8 +23829,8 @@ stdout: 996 bytes
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -23847,7 +23847,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 1398
-location: clients/tests/test-client.py:1070:test_004()/422
+location: clients/tests/test-client.py:1082:test_004()/422
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23859,8 +23859,8 @@ stdout: 1216 bytes
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 --------------------------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -23877,7 +23877,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 3154
-location: clients/tests/test-client.py:1073:test_004()/423
+location: clients/tests/test-client.py:1085:test_004()/423
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -23889,8 +23889,8 @@ stdout: 2872 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -23907,7 +23907,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 3392
-location: clients/tests/test-client.py:1073:test_004()/424
+location: clients/tests/test-client.py:1085:test_004()/424
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23919,8 +23919,8 @@ stdout: 3100 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -23937,7 +23937,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 1156
-location: clients/tests/test-client.py:1075:test_004()/425
+location: clients/tests/test-client.py:1087:test_004()/425
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -23954,7 +23954,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 1244
-location: clients/tests/test-client.py:1075:test_004()/426
+location: clients/tests/test-client.py:1087:test_004()/426
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23971,7 +23971,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 <<<
 size: 514
-location: clients/tests/test-client.py:1077:test_004()/427
+location: clients/tests/test-client.py:1089:test_004()/427
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -23988,7 +23988,7 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 
 <<<
 size: 599
-location: clients/tests/test-client.py:1077:test_004()/428
+location: clients/tests/test-client.py:1089:test_004()/428
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24005,7 +24005,7 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 
 <<<
 size: 1269
-location: clients/tests/test-client.py:1080:test_004()/429
+location: clients/tests/test-client.py:1092:test_004()/429
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -24022,7 +24022,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 1357
-location: clients/tests/test-client.py:1080:test_004()/430
+location: clients/tests/test-client.py:1092:test_004()/430
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24039,7 +24039,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 <<<
 size: 4459
-location: clients/tests/test-client.py:1082:test_004()/431
+location: clients/tests/test-client.py:1094:test_004()/431
 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
@@ -24063,8 +24063,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24088,7 +24088,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 4567
-location: clients/tests/test-client.py:1082:test_004()/432
+location: clients/tests/test-client.py:1094:test_004()/432
 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24112,8 +24112,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24137,7 +24137,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1727
-location: clients/tests/test-client.py:1084:test_004()/433
+location: clients/tests/test-client.py:1096:test_004()/433
 cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -24184,7 +24184,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1767
-location: clients/tests/test-client.py:1084:test_004()/434
+location: clients/tests/test-client.py:1096:test_004()/434
 cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24231,7 +24231,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 4597
-location: clients/tests/test-client.py:1086:test_004()/435
+location: clients/tests/test-client.py:1098:test_004()/435
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
@@ -24255,8 +24255,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24280,7 +24280,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 4705
-location: clients/tests/test-client.py:1086:test_004()/436
+location: clients/tests/test-client.py:1098:test_004()/436
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24304,8 +24304,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24329,7 +24329,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 4754
-location: clients/tests/test-client.py:1024:test_004()/437
+location: clients/tests/test-client.py:1036:test_004()/437
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -24370,12 +24370,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4808
-location: clients/tests/test-client.py:1024:test_004()/438
+size: 4810
+location: clients/tests/test-client.py:1036:test_004()/438
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4625 bytes
+stdout: 4627 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -24409,11 +24409,11 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 4754
-location: clients/tests/test-client.py:1026:test_004()/439
+location: clients/tests/test-client.py:1038:test_004()/439
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -24454,12 +24454,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4808
-location: clients/tests/test-client.py:1026:test_004()/440
+size: 4810
+location: clients/tests/test-client.py:1038:test_004()/440
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4625 bytes
+stdout: 4627 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -24493,11 +24493,11 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 3440
-location: clients/tests/test-client.py:1029:test_004()/441
+location: clients/tests/test-client.py:1041:test_004()/441
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -24529,7 +24529,7 @@ proxy  none    no            --       --
 
 <<<
 size: 3463
-location: clients/tests/test-client.py:1029:test_004()/442
+location: clients/tests/test-client.py:1041:test_004()/442
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24561,7 +24561,7 @@ proxy  none    nie           --       --
 
 <<<
 size: 688
-location: clients/tests/test-client.py:1035:test_004()/443
+location: clients/tests/test-client.py:1047:test_004()/443
 cmd: $NMCLI --mode tabular --pretty --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -24576,7 +24576,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 708
-location: clients/tests/test-client.py:1035:test_004()/444
+location: clients/tests/test-client.py:1047:test_004()/444
 cmd: $NMCLI --mode tabular --pretty --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24591,7 +24591,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 1118
-location: clients/tests/test-client.py:1038:test_004()/445
+location: clients/tests/test-client.py:1050:test_004()/445
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -24606,7 +24606,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no
 
 <<<
 size: 1150
-location: clients/tests/test-client.py:1038:test_004()/446
+location: clients/tests/test-client.py:1050:test_004()/446
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24621,7 +24621,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 <<<
 size: 709
-location: clients/tests/test-client.py:1041:test_004()/447
+location: clients/tests/test-client.py:1053:test_004()/447
 cmd: $NMCLI --mode tabular --pretty --color yes dev s
 lang: C
 returncode: 0
@@ -24640,7 +24640,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 717
-location: clients/tests/test-client.py:1041:test_004()/448
+location: clients/tests/test-client.py:1053:test_004()/448
 cmd: $NMCLI --mode tabular --pretty --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24659,7 +24659,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 2105
-location: clients/tests/test-client.py:1044:test_004()/449
+location: clients/tests/test-client.py:1056:test_004()/449
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev status
 lang: C
 returncode: 0
@@ -24678,7 +24678,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 2113
-location: clients/tests/test-client.py:1044:test_004()/450
+location: clients/tests/test-client.py:1056:test_004()/450
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24697,7 +24697,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 9903
-location: clients/tests/test-client.py:1047:test_004()/451
+location: clients/tests/test-client.py:1059:test_004()/451
 cmd: $NMCLI --mode tabular --pretty --color yes dev show
 lang: C
 returncode: 0
@@ -24908,7 +24908,7 @@ IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0
 
 <<<
 size: 10079
-location: clients/tests/test-client.py:1047:test_004()/452
+location: clients/tests/test-client.py:1059:test_004()/452
 cmd: $NMCLI --mode tabular --pretty --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25119,7 +25119,7 @@ IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0
 
 <<<
 size: 22926
-location: clients/tests/test-client.py:1050:test_004()/453
+location: clients/tests/test-client.py:1062:test_004()/453
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show
 lang: C
 returncode: 0
@@ -25143,8 +25143,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -25315,7 +25315,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 23287
-location: clients/tests/test-client.py:1050:test_004()/454
+location: clients/tests/test-client.py:1062:test_004()/454
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25339,8 +25339,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -25511,7 +25511,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1726
-location: clients/tests/test-client.py:1053:test_004()/455
+location: clients/tests/test-client.py:1065:test_004()/455
 cmd: $NMCLI --mode tabular --pretty --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -25558,7 +25558,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1766
-location: clients/tests/test-client.py:1053:test_004()/456
+location: clients/tests/test-client.py:1065:test_004()/456
 cmd: $NMCLI --mode tabular --pretty --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25605,7 +25605,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 4711
-location: clients/tests/test-client.py:1056:test_004()/457
+location: clients/tests/test-client.py:1068:test_004()/457
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
@@ -25629,8 +25629,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -25654,7 +25654,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 4819
-location: clients/tests/test-client.py:1056:test_004()/458
+location: clients/tests/test-client.py:1068:test_004()/458
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25678,8 +25678,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -25703,7 +25703,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1882
-location: clients/tests/test-client.py:1059:test_004()/459
+location: clients/tests/test-client.py:1071:test_004()/459
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -25726,7 +25726,7 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 <<<
 size: 1946
-location: clients/tests/test-client.py:1059:test_004()/460
+location: clients/tests/test-client.py:1071:test_004()/460
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25749,7 +25749,7 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 <<<
 size: 1882
-location: clients/tests/test-client.py:1062:test_004()/461
+location: clients/tests/test-client.py:1074:test_004()/461
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -25772,7 +25772,7 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 <<<
 size: 1946
-location: clients/tests/test-client.py:1062:test_004()/462
+location: clients/tests/test-client.py:1074:test_004()/462
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25795,7 +25795,7 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 <<<
 size: 818
-location: clients/tests/test-client.py:1065:test_004()/463
+location: clients/tests/test-client.py:1077:test_004()/463
 cmd: $NMCLI --mode tabular --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -25814,7 +25814,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 821
-location: clients/tests/test-client.py:1065:test_004()/464
+location: clients/tests/test-client.py:1077:test_004()/464
 cmd: $NMCLI --mode tabular --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25833,7 +25833,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 3665
-location: clients/tests/test-client.py:1068:test_004()/465
+location: clients/tests/test-client.py:1080:test_004()/465
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list
 lang: C
 returncode: 0
@@ -25845,8 +25845,8 @@ stdout: 3484 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -25863,7 +25863,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 3903
-location: clients/tests/test-client.py:1068:test_004()/466
+location: clients/tests/test-client.py:1080:test_004()/466
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25875,8 +25875,8 @@ stdout: 3712 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -25893,7 +25893,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 1468
-location: clients/tests/test-client.py:1070:test_004()/467
+location: clients/tests/test-client.py:1082:test_004()/467
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
@@ -25905,8 +25905,8 @@ stdout: 1284 bytes
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -25923,7 +25923,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 1698
-location: clients/tests/test-client.py:1070:test_004()/468
+location: clients/tests/test-client.py:1082:test_004()/468
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25935,8 +25935,8 @@ stdout: 1504 bytes
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 --------------------------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -25953,7 +25953,7 @@ IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY
 
 <<<
 size: 3778
-location: clients/tests/test-client.py:1073:test_004()/469
+location: clients/tests/test-client.py:1085:test_004()/469
 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -25965,8 +25965,8 @@ stdout: 3484 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -25983,7 +25983,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 4016
-location: clients/tests/test-client.py:1073:test_004()/470
+location: clients/tests/test-client.py:1085:test_004()/470
 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25995,8 +25995,8 @@ stdout: 3712 bytes
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -26013,7 +26013,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 1322
-location: clients/tests/test-client.py:1075:test_004()/471
+location: clients/tests/test-client.py:1087:test_004()/471
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -26030,7 +26030,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 1409
-location: clients/tests/test-client.py:1075:test_004()/472
+location: clients/tests/test-client.py:1087:test_004()/472
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26047,7 +26047,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 <<<
 size: 598
-location: clients/tests/test-client.py:1077:test_004()/473
+location: clients/tests/test-client.py:1089:test_004()/473
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -26064,7 +26064,7 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 
 <<<
 size: 683
-location: clients/tests/test-client.py:1077:test_004()/474
+location: clients/tests/test-client.py:1089:test_004()/474
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26081,7 +26081,7 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 
 <<<
 size: 1435
-location: clients/tests/test-client.py:1080:test_004()/475
+location: clients/tests/test-client.py:1092:test_004()/475
 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -26098,7 +26098,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 1522
-location: clients/tests/test-client.py:1080:test_004()/476
+location: clients/tests/test-client.py:1092:test_004()/476
 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26115,7 +26115,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 <<<
 size: 4714
-location: clients/tests/test-client.py:1082:test_004()/477
+location: clients/tests/test-client.py:1094:test_004()/477
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
@@ -26139,8 +26139,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26164,7 +26164,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 4822
-location: clients/tests/test-client.py:1082:test_004()/478
+location: clients/tests/test-client.py:1094:test_004()/478
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26188,8 +26188,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26213,7 +26213,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1739
-location: clients/tests/test-client.py:1084:test_004()/479
+location: clients/tests/test-client.py:1096:test_004()/479
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -26260,7 +26260,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1779
-location: clients/tests/test-client.py:1084:test_004()/480
+location: clients/tests/test-client.py:1096:test_004()/480
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26307,7 +26307,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 4852
-location: clients/tests/test-client.py:1086:test_004()/481
+location: clients/tests/test-client.py:1098:test_004()/481
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
@@ -26331,8 +26331,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26356,7 +26356,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 4960
-location: clients/tests/test-client.py:1086:test_004()/482
+location: clients/tests/test-client.py:1098:test_004()/482
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26380,8 +26380,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26405,7 +26405,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 791
-location: clients/tests/test-client.py:1024:test_004()/483
+location: clients/tests/test-client.py:1036:test_004()/483
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
@@ -26421,7 +26421,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 801
-location: clients/tests/test-client.py:1024:test_004()/484
+location: clients/tests/test-client.py:1036:test_004()/484
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26437,7 +26437,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 791
-location: clients/tests/test-client.py:1026:test_004()/485
+location: clients/tests/test-client.py:1038:test_004()/485
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
@@ -26453,7 +26453,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 801
-location: clients/tests/test-client.py:1026:test_004()/486
+location: clients/tests/test-client.py:1038:test_004()/486
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26469,7 +26469,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 504
-location: clients/tests/test-client.py:1029:test_004()/487
+location: clients/tests/test-client.py:1041:test_004()/487
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -26483,7 +26483,7 @@ proxy:none:no::
 
 <<<
 size: 514
-location: clients/tests/test-client.py:1029:test_004()/488
+location: clients/tests/test-client.py:1041:test_004()/488
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26497,7 +26497,7 @@ proxy:none:no::
 
 <<<
 size: 261
-location: clients/tests/test-client.py:1035:test_004()/489
+location: clients/tests/test-client.py:1047:test_004()/489
 cmd: $NMCLI --mode tabular --terse -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -26507,7 +26507,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val
 
 <<<
 size: 271
-location: clients/tests/test-client.py:1035:test_004()/490
+location: clients/tests/test-client.py:1047:test_004()/490
 cmd: $NMCLI --mode tabular --terse -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26517,7 +26517,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val
 
 <<<
 size: 359
-location: clients/tests/test-client.py:1038:test_004()/491
+location: clients/tests/test-client.py:1050:test_004()/491
 cmd: $NMCLI --mode tabular --terse -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -26527,7 +26527,7 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye
 
 <<<
 size: 369
-location: clients/tests/test-client.py:1038:test_004()/492
+location: clients/tests/test-client.py:1050:test_004()/492
 cmd: $NMCLI --mode tabular --terse -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26537,7 +26537,7 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye
 
 <<<
 size: 284
-location: clients/tests/test-client.py:1041:test_004()/493
+location: clients/tests/test-client.py:1053:test_004()/493
 cmd: $NMCLI --mode tabular --terse dev s
 lang: C
 returncode: 0
@@ -26551,7 +26551,7 @@ wlan1:wifi:unavailable:
 
 <<<
 size: 294
-location: clients/tests/test-client.py:1041:test_004()/494
+location: clients/tests/test-client.py:1053:test_004()/494
 cmd: $NMCLI --mode tabular --terse dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26565,7 +26565,7 @@ wlan1:wifi:unavailable:
 
 <<<
 size: 682
-location: clients/tests/test-client.py:1044:test_004()/495
+location: clients/tests/test-client.py:1056:test_004()/495
 cmd: $NMCLI --mode tabular --terse -f all dev status
 lang: C
 returncode: 0
@@ -26579,7 +26579,7 @@ wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 692
-location: clients/tests/test-client.py:1044:test_004()/496
+location: clients/tests/test-client.py:1056:test_004()/496
 cmd: $NMCLI --mode tabular --terse -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26593,7 +26593,7 @@ wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 3096
-location: clients/tests/test-client.py:1047:test_004()/497
+location: clients/tests/test-client.py:1059:test_004()/497
 cmd: $NMCLI --mode tabular --terse dev show
 lang: C
 returncode: 0
@@ -26653,7 +26653,7 @@ IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0
 
 <<<
 size: 3106
-location: clients/tests/test-client.py:1047:test_004()/498
+location: clients/tests/test-client.py:1059:test_004()/498
 cmd: $NMCLI --mode tabular --terse dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26712,19 +26712,19 @@ IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y
 
 <<<
-size: 6325
-location: clients/tests/test-client.py:1050:test_004()/499
+size: 6315
+location: clients/tests/test-client.py:1062:test_004()/499
 cmd: $NMCLI --mode tabular --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 6165 bytes
+stdout: 6155 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -26769,19 +26769,19 @@ DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 6371
-location: clients/tests/test-client.py:1050:test_004()/500
+size: 6361
+location: clients/tests/test-client.py:1062:test_004()/500
 cmd: $NMCLI --mode tabular --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6201 bytes
+stdout: 6191 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -26827,7 +26827,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 604
-location: clients/tests/test-client.py:1053:test_004()/501
+location: clients/tests/test-client.py:1065:test_004()/501
 cmd: $NMCLI --mode tabular --terse dev show wlan0
 lang: C
 returncode: 0
@@ -26845,7 +26845,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 
 <<<
 size: 614
-location: clients/tests/test-client.py:1053:test_004()/502
+location: clients/tests/test-client.py:1065:test_004()/502
 cmd: $NMCLI --mode tabular --terse dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26862,19 +26862,19 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
 <<<
-size: 1365
-location: clients/tests/test-client.py:1056:test_004()/503
+size: 1355
+location: clients/tests/test-client.py:1068:test_004()/503
 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 1199 bytes
+stdout: 1189 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -26882,19 +26882,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1402
-location: clients/tests/test-client.py:1056:test_004()/504
+size: 1392
+location: clients/tests/test-client.py:1068:test_004()/504
 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1226 bytes
+stdout: 1216 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -26903,7 +26903,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 565
-location: clients/tests/test-client.py:1059:test_004()/505
+location: clients/tests/test-client.py:1071:test_004()/505
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -26915,7 +26915,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
 size: 575
-location: clients/tests/test-client.py:1059:test_004()/506
+location: clients/tests/test-client.py:1071:test_004()/506
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26927,7 +26927,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
 size: 565
-location: clients/tests/test-client.py:1062:test_004()/507
+location: clients/tests/test-client.py:1074:test_004()/507
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -26939,7 +26939,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
 size: 575
-location: clients/tests/test-client.py:1062:test_004()/508
+location: clients/tests/test-client.py:1074:test_004()/508
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26951,7 +26951,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
 size: 443
-location: clients/tests/test-client.py:1065:test_004()/509
+location: clients/tests/test-client.py:1077:test_004()/509
 cmd: $NMCLI --mode tabular --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -26965,7 +26965,7 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 453
-location: clients/tests/test-client.py:1065:test_004()/510
+location: clients/tests/test-client.py:1077:test_004()/510
 cmd: $NMCLI --mode tabular --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26978,98 +26978,98 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 1190
-location: clients/tests/test-client.py:1068:test_004()/511
+size: 1101
+location: clients/tests/test-client.py:1080:test_004()/511
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1022 bytes
+stdout: 934 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1248
-location: clients/tests/test-client.py:1068:test_004()/512
+size: 1159
+location: clients/tests/test-client.py:1080:test_004()/512
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1070 bytes
+stdout: 982 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 368
-location: clients/tests/test-client.py:1070:test_004()/513
+size: 358
+location: clients/tests/test-client.py:1082:test_004()/513
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 198 bytes
+stdout: 188 bytes
 >>>
  :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+ :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+ :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 
  :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 414
-location: clients/tests/test-client.py:1070:test_004()/514
+size: 404
+location: clients/tests/test-client.py:1082:test_004()/514
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 234 bytes
+stdout: 224 bytes
 >>>
  :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+ :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+ :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 
  :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 1303
-location: clients/tests/test-client.py:1073:test_004()/515
+size: 1214
+location: clients/tests/test-client.py:1085:test_004()/515
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 1022 bytes
+stdout: 934 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1361
-location: clients/tests/test-client.py:1073:test_004()/516
+size: 1272
+location: clients/tests/test-client.py:1085:test_004()/516
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1070 bytes
+stdout: 982 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
 size: 448
-location: clients/tests/test-client.py:1075:test_004()/517
+location: clients/tests/test-client.py:1087:test_004()/517
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -27081,7 +27081,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54
 
 <<<
 size: 470
-location: clients/tests/test-client.py:1075:test_004()/518
+location: clients/tests/test-client.py:1087:test_004()/518
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27093,7 +27093,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24
 
 <<<
 size: 244
-location: clients/tests/test-client.py:1077:test_004()/519
+location: clients/tests/test-client.py:1089:test_004()/519
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -27105,7 +27105,7 @@ stdout: 51 bytes
 
 <<<
 size: 263
-location: clients/tests/test-client.py:1077:test_004()/520
+location: clients/tests/test-client.py:1089:test_004()/520
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27117,7 +27117,7 @@ stdout: 60 bytes
 
 <<<
 size: 561
-location: clients/tests/test-client.py:1080:test_004()/521
+location: clients/tests/test-client.py:1092:test_004()/521
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -27129,7 +27129,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54
 
 <<<
 size: 583
-location: clients/tests/test-client.py:1080:test_004()/522
+location: clients/tests/test-client.py:1092:test_004()/522
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27140,19 +27140,19 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24
 
 
 <<<
-size: 1368
-location: clients/tests/test-client.py:1082:test_004()/523
+size: 1358
+location: clients/tests/test-client.py:1094:test_004()/523
 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 1199 bytes
+stdout: 1189 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27160,19 +27160,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1405
-location: clients/tests/test-client.py:1082:test_004()/524
+size: 1395
+location: clients/tests/test-client.py:1094:test_004()/524
 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1226 bytes
+stdout: 1216 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27181,7 +27181,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 617
-location: clients/tests/test-client.py:1084:test_004()/525
+location: clients/tests/test-client.py:1096:test_004()/525
 cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -27199,7 +27199,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 
 <<<
 size: 627
-location: clients/tests/test-client.py:1084:test_004()/526
+location: clients/tests/test-client.py:1096:test_004()/526
 cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27216,19 +27216,19 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
 <<<
-size: 1506
-location: clients/tests/test-client.py:1086:test_004()/527
+size: 1496
+location: clients/tests/test-client.py:1098:test_004()/527
 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 1199 bytes
+stdout: 1189 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27236,19 +27236,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1543
-location: clients/tests/test-client.py:1086:test_004()/528
+size: 1533
+location: clients/tests/test-client.py:1098:test_004()/528
 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1226 bytes
+stdout: 1216 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27257,7 +27257,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 803
-location: clients/tests/test-client.py:1024:test_004()/529
+location: clients/tests/test-client.py:1036:test_004()/529
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -27273,7 +27273,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 813
-location: clients/tests/test-client.py:1024:test_004()/530
+location: clients/tests/test-client.py:1036:test_004()/530
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27289,7 +27289,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 803
-location: clients/tests/test-client.py:1026:test_004()/531
+location: clients/tests/test-client.py:1038:test_004()/531
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -27305,7 +27305,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 813
-location: clients/tests/test-client.py:1026:test_004()/532
+location: clients/tests/test-client.py:1038:test_004()/532
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27321,7 +27321,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 516
-location: clients/tests/test-client.py:1029:test_004()/533
+location: clients/tests/test-client.py:1041:test_004()/533
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -27335,7 +27335,7 @@ proxy:none:no::
 
 <<<
 size: 526
-location: clients/tests/test-client.py:1029:test_004()/534
+location: clients/tests/test-client.py:1041:test_004()/534
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27349,7 +27349,7 @@ proxy:none:no::
 
 <<<
 size: 273
-location: clients/tests/test-client.py:1035:test_004()/535
+location: clients/tests/test-client.py:1047:test_004()/535
 cmd: $NMCLI --mode tabular --terse --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -27359,7 +27359,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val
 
 <<<
 size: 283
-location: clients/tests/test-client.py:1035:test_004()/536
+location: clients/tests/test-client.py:1047:test_004()/536
 cmd: $NMCLI --mode tabular --terse --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27369,7 +27369,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val
 
 <<<
 size: 371
-location: clients/tests/test-client.py:1038:test_004()/537
+location: clients/tests/test-client.py:1050:test_004()/537
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -27379,7 +27379,7 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye
 
 <<<
 size: 381
-location: clients/tests/test-client.py:1038:test_004()/538
+location: clients/tests/test-client.py:1050:test_004()/538
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27389,7 +27389,7 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye
 
 <<<
 size: 456
-location: clients/tests/test-client.py:1041:test_004()/539
+location: clients/tests/test-client.py:1053:test_004()/539
 cmd: $NMCLI --mode tabular --terse --color yes dev s
 lang: C
 returncode: 0
@@ -27403,7 +27403,7 @@ stdout: 295 bytes
 
 <<<
 size: 466
-location: clients/tests/test-client.py:1041:test_004()/540
+location: clients/tests/test-client.py:1053:test_004()/540
 cmd: $NMCLI --mode tabular --terse --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27417,7 +27417,7 @@ stdout: 295 bytes
 
 <<<
 size: 1054
-location: clients/tests/test-client.py:1044:test_004()/541
+location: clients/tests/test-client.py:1056:test_004()/541
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev status
 lang: C
 returncode: 0
@@ -27431,7 +27431,7 @@ stdout: 881 bytes
 
 <<<
 size: 1064
-location: clients/tests/test-client.py:1044:test_004()/542
+location: clients/tests/test-client.py:1056:test_004()/542
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27445,7 +27445,7 @@ stdout: 881 bytes
 
 <<<
 size: 3108
-location: clients/tests/test-client.py:1047:test_004()/543
+location: clients/tests/test-client.py:1059:test_004()/543
 cmd: $NMCLI --mode tabular --terse --color yes dev show
 lang: C
 returncode: 0
@@ -27505,7 +27505,7 @@ IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0
 
 <<<
 size: 3118
-location: clients/tests/test-client.py:1047:test_004()/544
+location: clients/tests/test-client.py:1059:test_004()/544
 cmd: $NMCLI --mode tabular --terse --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27564,19 +27564,19 @@ IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y
 
 <<<
-size: 6661
-location: clients/tests/test-client.py:1050:test_004()/545
+size: 6651
+location: clients/tests/test-client.py:1062:test_004()/545
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 6489 bytes
+stdout: 6479 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27621,19 +27621,19 @@ DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 6707
-location: clients/tests/test-client.py:1050:test_004()/546
+size: 6697
+location: clients/tests/test-client.py:1062:test_004()/546
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6525 bytes
+stdout: 6515 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27679,7 +27679,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 616
-location: clients/tests/test-client.py:1053:test_004()/547
+location: clients/tests/test-client.py:1065:test_004()/547
 cmd: $NMCLI --mode tabular --terse --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -27697,7 +27697,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 
 <<<
 size: 626
-location: clients/tests/test-client.py:1053:test_004()/548
+location: clients/tests/test-client.py:1065:test_004()/548
 cmd: $NMCLI --mode tabular --terse --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27714,19 +27714,19 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
 <<<
-size: 1620
-location: clients/tests/test-client.py:1056:test_004()/549
+size: 1610
+location: clients/tests/test-client.py:1068:test_004()/549
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 1442 bytes
+stdout: 1432 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27734,19 +27734,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1657
-location: clients/tests/test-client.py:1056:test_004()/550
+size: 1647
+location: clients/tests/test-client.py:1068:test_004()/550
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1469 bytes
+stdout: 1459 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27755,7 +27755,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 577
-location: clients/tests/test-client.py:1059:test_004()/551
+location: clients/tests/test-client.py:1071:test_004()/551
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -27767,7 +27767,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
 size: 587
-location: clients/tests/test-client.py:1059:test_004()/552
+location: clients/tests/test-client.py:1071:test_004()/552
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27779,7 +27779,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
 size: 577
-location: clients/tests/test-client.py:1062:test_004()/553
+location: clients/tests/test-client.py:1074:test_004()/553
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -27791,7 +27791,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
 size: 587
-location: clients/tests/test-client.py:1062:test_004()/554
+location: clients/tests/test-client.py:1074:test_004()/554
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27803,7 +27803,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
 size: 575
-location: clients/tests/test-client.py:1065:test_004()/555
+location: clients/tests/test-client.py:1077:test_004()/555
 cmd: $NMCLI --mode tabular --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -27817,7 +27817,7 @@ stdout: 391 bytes
 
 <<<
 size: 585
-location: clients/tests/test-client.py:1065:test_004()/556
+location: clients/tests/test-client.py:1077:test_004()/556
 cmd: $NMCLI --mode tabular --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27830,98 +27830,98 @@ stdout: 391 bytes
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 1814
-location: clients/tests/test-client.py:1068:test_004()/557
+size: 1726
+location: clients/tests/test-client.py:1080:test_004()/557
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1634 bytes
+stdout: 1546 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1872
-location: clients/tests/test-client.py:1068:test_004()/558
+size: 1784
+location: clients/tests/test-client.py:1080:test_004()/558
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1682 bytes
+stdout: 1594 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 668
-location: clients/tests/test-client.py:1070:test_004()/559
+size: 658
+location: clients/tests/test-client.py:1082:test_004()/559
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 486 bytes
+stdout: 476 bytes
 >>>
  :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+ :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+ :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 
  :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 714
-location: clients/tests/test-client.py:1070:test_004()/560
+size: 704
+location: clients/tests/test-client.py:1082:test_004()/560
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 522 bytes
+stdout: 512 bytes
 >>>
  :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+ :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+ :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 
  :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 1927
-location: clients/tests/test-client.py:1073:test_004()/561
+size: 1839
+location: clients/tests/test-client.py:1085:test_004()/561
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 1634 bytes
+stdout: 1546 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1985
-location: clients/tests/test-client.py:1073:test_004()/562
+size: 1897
+location: clients/tests/test-client.py:1085:test_004()/562
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1682 bytes
+stdout: 1594 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
 size: 613
-location: clients/tests/test-client.py:1075:test_004()/563
+location: clients/tests/test-client.py:1087:test_004()/563
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -27933,7 +27933,7 @@ stdout: 410 bytes
 
 <<<
 size: 635
-location: clients/tests/test-client.py:1075:test_004()/564
+location: clients/tests/test-client.py:1087:test_004()/564
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27945,7 +27945,7 @@ stdout: 422 bytes
 
 <<<
 size: 329
-location: clients/tests/test-client.py:1077:test_004()/565
+location: clients/tests/test-client.py:1089:test_004()/565
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -27957,7 +27957,7 @@ stdout: 123 bytes
 
 <<<
 size: 348
-location: clients/tests/test-client.py:1077:test_004()/566
+location: clients/tests/test-client.py:1089:test_004()/566
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27969,7 +27969,7 @@ stdout: 132 bytes
 
 <<<
 size: 726
-location: clients/tests/test-client.py:1080:test_004()/567
+location: clients/tests/test-client.py:1092:test_004()/567
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -27981,7 +27981,7 @@ stdout: 410 bytes
 
 <<<
 size: 748
-location: clients/tests/test-client.py:1080:test_004()/568
+location: clients/tests/test-client.py:1092:test_004()/568
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27992,19 +27992,19 @@ stdout: 422 bytes
 
 
 <<<
-size: 1623
-location: clients/tests/test-client.py:1082:test_004()/569
+size: 1613
+location: clients/tests/test-client.py:1094:test_004()/569
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 1442 bytes
+stdout: 1432 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -28012,19 +28012,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1660
-location: clients/tests/test-client.py:1082:test_004()/570
+size: 1650
+location: clients/tests/test-client.py:1094:test_004()/570
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1469 bytes
+stdout: 1459 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -28033,7 +28033,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 629
-location: clients/tests/test-client.py:1084:test_004()/571
+location: clients/tests/test-client.py:1096:test_004()/571
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -28051,7 +28051,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 
 <<<
 size: 639
-location: clients/tests/test-client.py:1084:test_004()/572
+location: clients/tests/test-client.py:1096:test_004()/572
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28068,19 +28068,19 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
 <<<
-size: 1761
-location: clients/tests/test-client.py:1086:test_004()/573
+size: 1751
+location: clients/tests/test-client.py:1098:test_004()/573
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 1442 bytes
+stdout: 1432 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -28088,19 +28088,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1798
-location: clients/tests/test-client.py:1086:test_004()/574
+size: 1788
+location: clients/tests/test-client.py:1098:test_004()/574
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1469 bytes
+stdout: 1459 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -28109,7 +28109,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 4621
-location: clients/tests/test-client.py:1024:test_004()/575
+location: clients/tests/test-client.py:1036:test_004()/575
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
@@ -28210,12 +28210,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4649
-location: clients/tests/test-client.py:1024:test_004()/576
+size: 4651
+location: clients/tests/test-client.py:1036:test_004()/576
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -28306,14 +28306,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4621
-location: clients/tests/test-client.py:1026:test_004()/577
+location: clients/tests/test-client.py:1038:test_004()/577
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
@@ -28414,12 +28414,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4649
-location: clients/tests/test-client.py:1026:test_004()/578
+size: 4651
+location: clients/tests/test-client.py:1038:test_004()/578
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -28510,14 +28510,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 3540
-location: clients/tests/test-client.py:1029:test_004()/579
+location: clients/tests/test-client.py:1041:test_004()/579
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -28599,7 +28599,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3560
-location: clients/tests/test-client.py:1029:test_004()/580
+location: clients/tests/test-client.py:1041:test_004()/580
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28681,7 +28681,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 494
-location: clients/tests/test-client.py:1035:test_004()/581
+location: clients/tests/test-client.py:1047:test_004()/581
 cmd: $NMCLI --mode multiline -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -28696,7 +28696,7 @@ vpn.timeout:                            0
 
 <<<
 size: 505
-location: clients/tests/test-client.py:1035:test_004()/582
+location: clients/tests/test-client.py:1047:test_004()/582
 cmd: $NMCLI --mode multiline -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28711,7 +28711,7 @@ vpn.timeout:                            0
 
 <<<
 size: 831
-location: clients/tests/test-client.py:1038:test_004()/583
+location: clients/tests/test-client.py:1050:test_004()/583
 cmd: $NMCLI --mode multiline -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -28732,7 +28732,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 844
-location: clients/tests/test-client.py:1038:test_004()/584
+location: clients/tests/test-client.py:1050:test_004()/584
 cmd: $NMCLI --mode multiline -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28753,7 +28753,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1086
-location: clients/tests/test-client.py:1041:test_004()/585
+location: clients/tests/test-client.py:1053:test_004()/585
 cmd: $NMCLI --mode multiline dev s
 lang: C
 returncode: 0
@@ -28782,7 +28782,7 @@ CONNECTION:                             --
 
 <<<
 size: 1101
-location: clients/tests/test-client.py:1041:test_004()/586
+location: clients/tests/test-client.py:1053:test_004()/586
 cmd: $NMCLI --mode multiline dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28811,7 +28811,7 @@ CONNECTION:                             --
 
 <<<
 size: 2501
-location: clients/tests/test-client.py:1044:test_004()/587
+location: clients/tests/test-client.py:1056:test_004()/587
 cmd: $NMCLI --mode multiline -f all dev status
 lang: C
 returncode: 0
@@ -28865,7 +28865,7 @@ CON-PATH:                               --
 
 <<<
 size: 2526
-location: clients/tests/test-client.py:1044:test_004()/588
+location: clients/tests/test-client.py:1056:test_004()/588
 cmd: $NMCLI --mode multiline -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28919,7 +28919,7 @@ CON-PATH:                               --
 
 <<<
 size: 8065
-location: clients/tests/test-client.py:1047:test_004()/589
+location: clients/tests/test-client.py:1059:test_004()/589
 cmd: $NMCLI --mode multiline dev show
 lang: C
 returncode: 0
@@ -29065,7 +29065,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 8096
-location: clients/tests/test-client.py:1047:test_004()/590
+location: clients/tests/test-client.py:1059:test_004()/590
 cmd: $NMCLI --mode multiline dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -29210,12 +29210,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 20688
-location: clients/tests/test-client.py:1050:test_004()/591
+size: 20678
+location: clients/tests/test-client.py:1062:test_004()/591
 cmd: $NMCLI --mode multiline -f all dev show
 lang: C
 returncode: 0
-stdout: 20533 bytes
+stdout: 20523 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -29271,7 +29271,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -29279,7 +29279,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -29599,12 +29599,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 20838
-location: clients/tests/test-client.py:1050:test_004()/592
+size: 20828
+location: clients/tests/test-client.py:1062:test_004()/592
 cmd: $NMCLI --mode multiline -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 20673 bytes
+stdout: 20663 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -29660,7 +29660,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -29668,7 +29668,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -29989,7 +29989,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1516
-location: clients/tests/test-client.py:1053:test_004()/593
+location: clients/tests/test-client.py:1065:test_004()/593
 cmd: $NMCLI --mode multiline dev show wlan0
 lang: C
 returncode: 0
@@ -30022,7 +30022,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1527
-location: clients/tests/test-client.py:1053:test_004()/594
+location: clients/tests/test-client.py:1065:test_004()/594
 cmd: $NMCLI --mode multiline dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -30054,12 +30054,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 4875
-location: clients/tests/test-client.py:1056:test_004()/595
+size: 4865
+location: clients/tests/test-client.py:1068:test_004()/595
 cmd: $NMCLI --mode multiline -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4715 bytes
+stdout: 4705 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -30115,7 +30115,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -30123,7 +30123,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -30154,12 +30154,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4930
-location: clients/tests/test-client.py:1056:test_004()/596
+size: 4920
+location: clients/tests/test-client.py:1068:test_004()/596
 cmd: $NMCLI --mode multiline -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4760 bytes
+stdout: 4750 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -30215,7 +30215,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -30223,7 +30223,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -30255,7 +30255,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1978
-location: clients/tests/test-client.py:1059:test_004()/597
+location: clients/tests/test-client.py:1071:test_004()/597
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -30300,7 +30300,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 2002
-location: clients/tests/test-client.py:1059:test_004()/598
+location: clients/tests/test-client.py:1071:test_004()/598
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -30345,7 +30345,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 1978
-location: clients/tests/test-client.py:1062:test_004()/599
+location: clients/tests/test-client.py:1074:test_004()/599
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -30390,7 +30390,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 2002
-location: clients/tests/test-client.py:1062:test_004()/600
+location: clients/tests/test-client.py:1074:test_004()/600
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -30435,7 +30435,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 1037
-location: clients/tests/test-client.py:1065:test_004()/601
+location: clients/tests/test-client.py:1077:test_004()/601
 cmd: $NMCLI --mode multiline -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -30459,7 +30459,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/
 
 <<<
 size: 1047
-location: clients/tests/test-client.py:1065:test_004()/602
+location: clients/tests/test-client.py:1077:test_004()/602
 cmd: $NMCLI --mode multiline -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -30482,12 +30482,12 @@ TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 3884
-location: clients/tests/test-client.py:1068:test_004()/603
+size: 3796
+location: clients/tests/test-client.py:1080:test_004()/603
 cmd: $NMCLI --mode multiline -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 3722 bytes
+stdout: 3634 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -30516,9 +30516,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -30533,9 +30533,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -30561,12 +30561,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 3942
-location: clients/tests/test-client.py:1068:test_004()/604
+size: 3854
+location: clients/tests/test-client.py:1080:test_004()/604
 cmd: $NMCLI --mode multiline -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3770 bytes
+stdout: 3682 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -30595,9 +30595,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -30612,9 +30612,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -30640,12 +30640,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 1643
-location: clients/tests/test-client.py:1070:test_004()/605
+size: 1633
+location: clients/tests/test-client.py:1082:test_004()/605
 cmd: $NMCLI --mode multiline -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 1478 bytes
+stdout: 1468 bytes
 >>>
 IN-USE:                                  
 SSID:                                   wlan0-ap-2
@@ -30662,7 +30662,7 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
 MODE:                                   Infra
@@ -30670,7 +30670,7 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 
 IN-USE:                                  
 SSID:                                   wlan1-ap-4
@@ -30683,12 +30683,12 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 1689
-location: clients/tests/test-client.py:1070:test_004()/606
+size: 1679
+location: clients/tests/test-client.py:1082:test_004()/606
 cmd: $NMCLI --mode multiline -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1514 bytes
+stdout: 1504 bytes
 >>>
 IN-USE:                                  
 SSID:                                   wlan0-ap-2
@@ -30705,7 +30705,7 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
 MODE:                                   Infrastruktura
@@ -30713,7 +30713,7 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 
 IN-USE:                                  
 SSID:                                   wlan1-ap-4
@@ -30726,12 +30726,12 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 3997
-location: clients/tests/test-client.py:1073:test_004()/607
+size: 3909
+location: clients/tests/test-client.py:1085:test_004()/607
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 3722 bytes
+stdout: 3634 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -30760,9 +30760,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -30777,9 +30777,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -30805,12 +30805,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 4055
-location: clients/tests/test-client.py:1073:test_004()/608
+size: 3967
+location: clients/tests/test-client.py:1085:test_004()/608
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3770 bytes
+stdout: 3682 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -30839,9 +30839,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -30856,9 +30856,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -30885,7 +30885,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 1117
-location: clients/tests/test-client.py:1075:test_004()/609
+location: clients/tests/test-client.py:1087:test_004()/609
 cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -30913,7 +30913,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 1139
-location: clients/tests/test-client.py:1075:test_004()/610
+location: clients/tests/test-client.py:1087:test_004()/610
 cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -30941,7 +30941,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 559
-location: clients/tests/test-client.py:1077:test_004()/611
+location: clients/tests/test-client.py:1089:test_004()/611
 cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -30960,7 +30960,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 578
-location: clients/tests/test-client.py:1077:test_004()/612
+location: clients/tests/test-client.py:1089:test_004()/612
 cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -30979,7 +30979,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 1230
-location: clients/tests/test-client.py:1080:test_004()/613
+location: clients/tests/test-client.py:1092:test_004()/613
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -31007,7 +31007,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 1252
-location: clients/tests/test-client.py:1080:test_004()/614
+location: clients/tests/test-client.py:1092:test_004()/614
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -31034,12 +31034,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 4878
-location: clients/tests/test-client.py:1082:test_004()/615
+size: 4868
+location: clients/tests/test-client.py:1094:test_004()/615
 cmd: $NMCLI --mode multiline -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4715 bytes
+stdout: 4705 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -31095,7 +31095,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -31103,7 +31103,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -31134,12 +31134,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4933
-location: clients/tests/test-client.py:1082:test_004()/616
+size: 4923
+location: clients/tests/test-client.py:1094:test_004()/616
 cmd: $NMCLI --mode multiline -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4760 bytes
+stdout: 4750 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -31195,7 +31195,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -31203,7 +31203,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -31235,7 +31235,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1529
-location: clients/tests/test-client.py:1084:test_004()/617
+location: clients/tests/test-client.py:1096:test_004()/617
 cmd: $NMCLI --mode multiline -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -31268,7 +31268,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1540
-location: clients/tests/test-client.py:1084:test_004()/618
+location: clients/tests/test-client.py:1096:test_004()/618
 cmd: $NMCLI --mode multiline -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -31300,12 +31300,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5016
-location: clients/tests/test-client.py:1086:test_004()/619
+size: 5006
+location: clients/tests/test-client.py:1098:test_004()/619
 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4715 bytes
+stdout: 4705 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -31361,7 +31361,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -31369,7 +31369,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -31400,12 +31400,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5071
-location: clients/tests/test-client.py:1086:test_004()/620
+size: 5061
+location: clients/tests/test-client.py:1098:test_004()/620
 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4760 bytes
+stdout: 4750 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -31461,7 +31461,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -31469,7 +31469,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -31501,7 +31501,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 4633
-location: clients/tests/test-client.py:1024:test_004()/621
+location: clients/tests/test-client.py:1036:test_004()/621
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -31602,12 +31602,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4661
-location: clients/tests/test-client.py:1024:test_004()/622
+size: 4663
+location: clients/tests/test-client.py:1036:test_004()/622
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31698,14 +31698,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4633
-location: clients/tests/test-client.py:1026:test_004()/623
+location: clients/tests/test-client.py:1038:test_004()/623
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -31806,12 +31806,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4661
-location: clients/tests/test-client.py:1026:test_004()/624
+size: 4663
+location: clients/tests/test-client.py:1038:test_004()/624
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31902,14 +31902,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 3552
-location: clients/tests/test-client.py:1029:test_004()/625
+location: clients/tests/test-client.py:1041:test_004()/625
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -31991,7 +31991,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3572
-location: clients/tests/test-client.py:1029:test_004()/626
+location: clients/tests/test-client.py:1041:test_004()/626
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -32073,7 +32073,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 506
-location: clients/tests/test-client.py:1035:test_004()/627
+location: clients/tests/test-client.py:1047:test_004()/627
 cmd: $NMCLI --mode multiline --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -32088,7 +32088,7 @@ vpn.timeout:                            0
 
 <<<
 size: 517
-location: clients/tests/test-client.py:1035:test_004()/628
+location: clients/tests/test-client.py:1047:test_004()/628
 cmd: $NMCLI --mode multiline --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -32103,7 +32103,7 @@ vpn.timeout:                            0
 
 <<<
 size: 843
-location: clients/tests/test-client.py:1038:test_004()/629
+location: clients/tests/test-client.py:1050:test_004()/629
 cmd: $NMCLI --mode multiline --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -32124,7 +32124,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 856
-location: clients/tests/test-client.py:1038:test_004()/630
+location: clients/tests/test-client.py:1050:test_004()/630
 cmd: $NMCLI --mode multiline --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -32145,7 +32145,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1259
-location: clients/tests/test-client.py:1041:test_004()/631
+location: clients/tests/test-client.py:1053:test_004()/631
 cmd: $NMCLI --mode multiline --color yes dev s
 lang: C
 returncode: 0
@@ -32174,7 +32174,7 @@ CONNECTION:                             --
 
 <<<
 size: 1274
-location: clients/tests/test-client.py:1041:test_004()/632
+location: clients/tests/test-client.py:1053:test_004()/632
 cmd: $NMCLI --mode multiline --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -32203,7 +32203,7 @@ CONNECTION:                             --
 
 <<<
 size: 2873
-location: clients/tests/test-client.py:1044:test_004()/633
+location: clients/tests/test-client.py:1056:test_004()/633
 cmd: $NMCLI --mode multiline --color yes -f all dev status
 lang: C
 returncode: 0
@@ -32257,7 +32257,7 @@ CON-PATH:                               --
 
 <<<
 size: 2898
-location: clients/tests/test-client.py:1044:test_004()/634
+location: clients/tests/test-client.py:1056:test_004()/634
 cmd: $NMCLI --mode multiline --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -32311,7 +32311,7 @@ CON-PATH:                               --
 
 <<<
 size: 8077
-location: clients/tests/test-client.py:1047:test_004()/635
+location: clients/tests/test-client.py:1059:test_004()/635
 cmd: $NMCLI --mode multiline --color yes dev show
 lang: C
 returncode: 0
@@ -32457,7 +32457,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 8108
-location: clients/tests/test-client.py:1047:test_004()/636
+location: clients/tests/test-client.py:1059:test_004()/636
 cmd: $NMCLI --mode multiline --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -32602,12 +32602,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 20988
-location: clients/tests/test-client.py:1050:test_004()/637
+size: 20978
+location: clients/tests/test-client.py:1062:test_004()/637
 cmd: $NMCLI --mode multiline --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 20821 bytes
+stdout: 20811 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -32663,7 +32663,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -32671,7 +32671,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -32991,12 +32991,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 21138
-location: clients/tests/test-client.py:1050:test_004()/638
+size: 21128
+location: clients/tests/test-client.py:1062:test_004()/638
 cmd: $NMCLI --mode multiline --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 20961 bytes
+stdout: 20951 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -33052,7 +33052,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -33060,7 +33060,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -33381,7 +33381,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1528
-location: clients/tests/test-client.py:1053:test_004()/639
+location: clients/tests/test-client.py:1065:test_004()/639
 cmd: $NMCLI --mode multiline --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -33414,7 +33414,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1539
-location: clients/tests/test-client.py:1053:test_004()/640
+location: clients/tests/test-client.py:1065:test_004()/640
 cmd: $NMCLI --mode multiline --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -33446,12 +33446,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5103
-location: clients/tests/test-client.py:1056:test_004()/641
+size: 5093
+location: clients/tests/test-client.py:1068:test_004()/641
 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4921 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -33507,7 +33507,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -33515,7 +33515,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -33546,12 +33546,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5158
-location: clients/tests/test-client.py:1056:test_004()/642
+size: 5148
+location: clients/tests/test-client.py:1068:test_004()/642
 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4976 bytes
+stdout: 4966 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -33607,7 +33607,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -33615,7 +33615,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -33647,7 +33647,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1990
-location: clients/tests/test-client.py:1059:test_004()/643
+location: clients/tests/test-client.py:1071:test_004()/643
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -33692,7 +33692,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 2014
-location: clients/tests/test-client.py:1059:test_004()/644
+location: clients/tests/test-client.py:1071:test_004()/644
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -33737,7 +33737,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 1990
-location: clients/tests/test-client.py:1062:test_004()/645
+location: clients/tests/test-client.py:1074:test_004()/645
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -33782,7 +33782,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 2014
-location: clients/tests/test-client.py:1062:test_004()/646
+location: clients/tests/test-client.py:1074:test_004()/646
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -33827,7 +33827,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 1169
-location: clients/tests/test-client.py:1065:test_004()/647
+location: clients/tests/test-client.py:1077:test_004()/647
 cmd: $NMCLI --mode multiline --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -33851,7 +33851,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devi
 
 <<<
 size: 1179
-location: clients/tests/test-client.py:1065:test_004()/648
+location: clients/tests/test-client.py:1077:test_004()/648
 cmd: $NMCLI --mode multiline --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -33874,12 +33874,12 @@ TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 4508
-location: clients/tests/test-client.py:1068:test_004()/649
+size: 4420
+location: clients/tests/test-client.py:1080:test_004()/649
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 4334 bytes
+stdout: 4246 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -33908,9 +33908,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -33925,9 +33925,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -33953,12 +33953,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 4566
-location: clients/tests/test-client.py:1068:test_004()/650
+size: 4478
+location: clients/tests/test-client.py:1080:test_004()/650
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4382 bytes
+stdout: 4294 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -33987,9 +33987,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -34004,9 +34004,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -34032,12 +34032,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 1943
-location: clients/tests/test-client.py:1070:test_004()/651
+size: 1933
+location: clients/tests/test-client.py:1082:test_004()/651
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 1766 bytes
+stdout: 1756 bytes
 >>>
 IN-USE:                                  
 SSID:                                   wlan0-ap-2
@@ -34054,7 +34054,7 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
 MODE:                                   Infra
@@ -34062,7 +34062,7 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 
 IN-USE:                                  
 SSID:                                   wlan1-ap-4
@@ -34075,12 +34075,12 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 1989
-location: clients/tests/test-client.py:1070:test_004()/652
+size: 1979
+location: clients/tests/test-client.py:1082:test_004()/652
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1802 bytes
+stdout: 1792 bytes
 >>>
 IN-USE:                                  
 SSID:                                   wlan0-ap-2
@@ -34097,7 +34097,7 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
 MODE:                                   Infrastruktura
@@ -34105,7 +34105,7 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 
 IN-USE:                                  
 SSID:                                   wlan1-ap-4
@@ -34118,12 +34118,12 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 4621
-location: clients/tests/test-client.py:1073:test_004()/653
+size: 4533
+location: clients/tests/test-client.py:1085:test_004()/653
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 4334 bytes
+stdout: 4246 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -34152,9 +34152,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -34169,9 +34169,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -34197,12 +34197,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 4679
-location: clients/tests/test-client.py:1073:test_004()/654
+size: 4591
+location: clients/tests/test-client.py:1085:test_004()/654
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4382 bytes
+stdout: 4294 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -34231,9 +34231,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -34248,9 +34248,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -34277,7 +34277,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 1283
-location: clients/tests/test-client.py:1075:test_004()/655
+location: clients/tests/test-client.py:1087:test_004()/655
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -34305,7 +34305,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 1305
-location: clients/tests/test-client.py:1075:test_004()/656
+location: clients/tests/test-client.py:1087:test_004()/656
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -34333,7 +34333,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 643
-location: clients/tests/test-client.py:1077:test_004()/657
+location: clients/tests/test-client.py:1089:test_004()/657
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -34352,7 +34352,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 662
-location: clients/tests/test-client.py:1077:test_004()/658
+location: clients/tests/test-client.py:1089:test_004()/658
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -34371,7 +34371,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 1396
-location: clients/tests/test-client.py:1080:test_004()/659
+location: clients/tests/test-client.py:1092:test_004()/659
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -34399,7 +34399,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 1418
-location: clients/tests/test-client.py:1080:test_004()/660
+location: clients/tests/test-client.py:1092:test_004()/660
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -34426,12 +34426,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 5106
-location: clients/tests/test-client.py:1082:test_004()/661
+size: 5096
+location: clients/tests/test-client.py:1094:test_004()/661
 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4921 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34487,7 +34487,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -34495,7 +34495,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -34526,12 +34526,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5161
-location: clients/tests/test-client.py:1082:test_004()/662
+size: 5151
+location: clients/tests/test-client.py:1094:test_004()/662
 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4976 bytes
+stdout: 4966 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34587,7 +34587,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -34595,7 +34595,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -34627,7 +34627,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1541
-location: clients/tests/test-client.py:1084:test_004()/663
+location: clients/tests/test-client.py:1096:test_004()/663
 cmd: $NMCLI --mode multiline --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -34660,7 +34660,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1552
-location: clients/tests/test-client.py:1084:test_004()/664
+location: clients/tests/test-client.py:1096:test_004()/664
 cmd: $NMCLI --mode multiline --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -34692,12 +34692,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5244
-location: clients/tests/test-client.py:1086:test_004()/665
+size: 5234
+location: clients/tests/test-client.py:1098:test_004()/665
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4921 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34753,7 +34753,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -34761,7 +34761,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -34792,12 +34792,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5299
-location: clients/tests/test-client.py:1086:test_004()/666
+size: 5289
+location: clients/tests/test-client.py:1098:test_004()/666
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4976 bytes
+stdout: 4966 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34853,7 +34853,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -34861,7 +34861,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -34893,7 +34893,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 5642
-location: clients/tests/test-client.py:1024:test_004()/667
+location: clients/tests/test-client.py:1036:test_004()/667
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
@@ -35007,12 +35007,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5682
-location: clients/tests/test-client.py:1024:test_004()/668
+size: 5684
+location: clients/tests/test-client.py:1036:test_004()/668
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -35115,7 +35115,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -35123,7 +35123,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 5642
-location: clients/tests/test-client.py:1026:test_004()/669
+location: clients/tests/test-client.py:1038:test_004()/669
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
@@ -35237,12 +35237,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5682
-location: clients/tests/test-client.py:1026:test_004()/670
+size: 5684
+location: clients/tests/test-client.py:1038:test_004()/670
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -35345,7 +35345,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -35353,7 +35353,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4168
-location: clients/tests/test-client.py:1029:test_004()/671
+location: clients/tests/test-client.py:1041:test_004()/671
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -35443,7 +35443,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 4193
-location: clients/tests/test-client.py:1029:test_004()/672
+location: clients/tests/test-client.py:1041:test_004()/672
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35533,7 +35533,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 802
-location: clients/tests/test-client.py:1035:test_004()/673
+location: clients/tests/test-client.py:1047:test_004()/673
 cmd: $NMCLI --mode multiline --pretty -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -35552,7 +35552,7 @@ vpn.timeout:                            0
 
 <<<
 size: 818
-location: clients/tests/test-client.py:1035:test_004()/674
+location: clients/tests/test-client.py:1047:test_004()/674
 cmd: $NMCLI --mode multiline --pretty -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35571,7 +35571,7 @@ vpn.timeout:                            0
 
 <<<
 size: 1153
-location: clients/tests/test-client.py:1038:test_004()/675
+location: clients/tests/test-client.py:1050:test_004()/675
 cmd: $NMCLI --mode multiline --pretty -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -35596,7 +35596,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1173
-location: clients/tests/test-client.py:1038:test_004()/676
+location: clients/tests/test-client.py:1050:test_004()/676
 cmd: $NMCLI --mode multiline --pretty -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35621,7 +35621,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1705
-location: clients/tests/test-client.py:1041:test_004()/677
+location: clients/tests/test-client.py:1053:test_004()/677
 cmd: $NMCLI --mode multiline --pretty dev s
 lang: C
 returncode: 0
@@ -35658,7 +35658,7 @@ CONNECTION:                             --
 
 <<<
 size: 1720
-location: clients/tests/test-client.py:1041:test_004()/678
+location: clients/tests/test-client.py:1053:test_004()/678
 cmd: $NMCLI --mode multiline --pretty dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35695,7 +35695,7 @@ CONNECTION:                             --
 
 <<<
 size: 3119
-location: clients/tests/test-client.py:1044:test_004()/679
+location: clients/tests/test-client.py:1056:test_004()/679
 cmd: $NMCLI --mode multiline --pretty -f all dev status
 lang: C
 returncode: 0
@@ -35757,7 +35757,7 @@ CON-PATH:                               --
 
 <<<
 size: 3144
-location: clients/tests/test-client.py:1044:test_004()/680
+location: clients/tests/test-client.py:1056:test_004()/680
 cmd: $NMCLI --mode multiline --pretty -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35819,7 +35819,7 @@ CON-PATH:                               --
 
 <<<
 size: 12890
-location: clients/tests/test-client.py:1047:test_004()/681
+location: clients/tests/test-client.py:1059:test_004()/681
 cmd: $NMCLI --mode multiline --pretty dev show
 lang: C
 returncode: 0
@@ -36027,7 +36027,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 12954
-location: clients/tests/test-client.py:1047:test_004()/682
+location: clients/tests/test-client.py:1059:test_004()/682
 cmd: $NMCLI --mode multiline --pretty dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -36234,12 +36234,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 25272
-location: clients/tests/test-client.py:1050:test_004()/683
+size: 25262
+location: clients/tests/test-client.py:1062:test_004()/683
 cmd: $NMCLI --mode multiline --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 25108 bytes
+stdout: 25098 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -36302,7 +36302,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -36311,7 +36311,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -36682,12 +36682,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 25455
-location: clients/tests/test-client.py:1050:test_004()/684
+size: 25445
+location: clients/tests/test-client.py:1062:test_004()/684
 cmd: $NMCLI --mode multiline --pretty -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25281 bytes
+stdout: 25271 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -36750,7 +36750,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -36759,7 +36759,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -37131,7 +37131,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2456
-location: clients/tests/test-client.py:1053:test_004()/685
+location: clients/tests/test-client.py:1065:test_004()/685
 cmd: $NMCLI --mode multiline --pretty dev show wlan0
 lang: C
 returncode: 0
@@ -37176,7 +37176,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2474
-location: clients/tests/test-client.py:1053:test_004()/686
+location: clients/tests/test-client.py:1065:test_004()/686
 cmd: $NMCLI --mode multiline --pretty dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -37220,12 +37220,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 5975
-location: clients/tests/test-client.py:1056:test_004()/687
+size: 5965
+location: clients/tests/test-client.py:1068:test_004()/687
 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5806 bytes
+stdout: 5796 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -37288,7 +37288,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -37297,7 +37297,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -37334,12 +37334,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6037
-location: clients/tests/test-client.py:1056:test_004()/688
+size: 6027
+location: clients/tests/test-client.py:1068:test_004()/688
 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5858 bytes
+stdout: 5848 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -37402,7 +37402,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -37411,7 +37411,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -37449,7 +37449,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2438
-location: clients/tests/test-client.py:1059:test_004()/689
+location: clients/tests/test-client.py:1071:test_004()/689
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -37500,7 +37500,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 2469
-location: clients/tests/test-client.py:1059:test_004()/690
+location: clients/tests/test-client.py:1071:test_004()/690
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -37551,7 +37551,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 2438
-location: clients/tests/test-client.py:1062:test_004()/691
+location: clients/tests/test-client.py:1074:test_004()/691
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -37602,7 +37602,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 2469
-location: clients/tests/test-client.py:1062:test_004()/692
+location: clients/tests/test-client.py:1074:test_004()/692
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -37653,7 +37653,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 1656
-location: clients/tests/test-client.py:1065:test_004()/693
+location: clients/tests/test-client.py:1077:test_004()/693
 cmd: $NMCLI --mode multiline --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -37685,7 +37685,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/
 
 <<<
 size: 1666
-location: clients/tests/test-client.py:1065:test_004()/694
+location: clients/tests/test-client.py:1077:test_004()/694
 cmd: $NMCLI --mode multiline --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -37716,12 +37716,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/
 -------------------------------------------------------------------------------
 
 <<<
-size: 4849
-location: clients/tests/test-client.py:1068:test_004()/695
+size: 4761
+location: clients/tests/test-client.py:1080:test_004()/695
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 4678 bytes
+stdout: 4590 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -37754,9 +37754,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -37772,9 +37772,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -37808,12 +37808,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 ===============================================================================
 
 <<<
-size: 4925
-location: clients/tests/test-client.py:1068:test_004()/696
+size: 4837
+location: clients/tests/test-client.py:1080:test_004()/696
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4744 bytes
+stdout: 4656 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -37846,9 +37846,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -37864,9 +37864,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -37900,12 +37900,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 ===============================================================================
 
 <<<
-size: 2608
-location: clients/tests/test-client.py:1070:test_004()/697
+size: 2598
+location: clients/tests/test-client.py:1082:test_004()/697
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 2434 bytes
+stdout: 2424 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -37926,7 +37926,7 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 -------------------------------------------------------------------------------
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
@@ -37935,7 +37935,7 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 -------------------------------------------------------------------------------
 
 ===============================================================================
@@ -37956,12 +37956,12 @@ SECURITY:                               WPA1 WPA2
 ===============================================================================
 
 <<<
-size: 2672
-location: clients/tests/test-client.py:1070:test_004()/698
+size: 2662
+location: clients/tests/test-client.py:1082:test_004()/698
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2488 bytes
+stdout: 2478 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -37982,7 +37982,7 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 -------------------------------------------------------------------------------
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
@@ -37991,7 +37991,7 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 -------------------------------------------------------------------------------
 
 ===============================================================================
@@ -38012,12 +38012,12 @@ SECURITY:                               WPA1 WPA2
 ===============================================================================
 
 <<<
-size: 4962
-location: clients/tests/test-client.py:1073:test_004()/699
+size: 4874
+location: clients/tests/test-client.py:1085:test_004()/699
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 4678 bytes
+stdout: 4590 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -38050,9 +38050,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -38068,9 +38068,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -38104,12 +38104,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 ===============================================================================
 
 <<<
-size: 5038
-location: clients/tests/test-client.py:1073:test_004()/700
+size: 4950
+location: clients/tests/test-client.py:1085:test_004()/700
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4744 bytes
+stdout: 4656 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -38142,9 +38142,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -38160,9 +38160,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -38197,7 +38197,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 1419
-location: clients/tests/test-client.py:1075:test_004()/701
+location: clients/tests/test-client.py:1087:test_004()/701
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -38229,7 +38229,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 1447
-location: clients/tests/test-client.py:1075:test_004()/702
+location: clients/tests/test-client.py:1087:test_004()/702
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -38261,7 +38261,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 860
-location: clients/tests/test-client.py:1077:test_004()/703
+location: clients/tests/test-client.py:1089:test_004()/703
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -38284,7 +38284,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 885
-location: clients/tests/test-client.py:1077:test_004()/704
+location: clients/tests/test-client.py:1089:test_004()/704
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -38307,7 +38307,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 1532
-location: clients/tests/test-client.py:1080:test_004()/705
+location: clients/tests/test-client.py:1092:test_004()/705
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -38339,7 +38339,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 1560
-location: clients/tests/test-client.py:1080:test_004()/706
+location: clients/tests/test-client.py:1092:test_004()/706
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -38370,12 +38370,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 5978
-location: clients/tests/test-client.py:1082:test_004()/707
+size: 5968
+location: clients/tests/test-client.py:1094:test_004()/707
 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5806 bytes
+stdout: 5796 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -38438,7 +38438,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -38447,7 +38447,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -38484,12 +38484,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6040
-location: clients/tests/test-client.py:1082:test_004()/708
+size: 6030
+location: clients/tests/test-client.py:1094:test_004()/708
 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5858 bytes
+stdout: 5848 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -38552,7 +38552,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -38561,7 +38561,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -38599,7 +38599,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2469
-location: clients/tests/test-client.py:1084:test_004()/709
+location: clients/tests/test-client.py:1096:test_004()/709
 cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -38644,7 +38644,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2487
-location: clients/tests/test-client.py:1084:test_004()/710
+location: clients/tests/test-client.py:1096:test_004()/710
 cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -38688,12 +38688,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6116
-location: clients/tests/test-client.py:1086:test_004()/711
+size: 6106
+location: clients/tests/test-client.py:1098:test_004()/711
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 5806 bytes
+stdout: 5796 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -38756,7 +38756,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -38765,7 +38765,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -38802,12 +38802,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6178
-location: clients/tests/test-client.py:1086:test_004()/712
+size: 6168
+location: clients/tests/test-client.py:1098:test_004()/712
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5858 bytes
+stdout: 5848 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -38870,7 +38870,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -38879,7 +38879,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -38917,7 +38917,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 5654
-location: clients/tests/test-client.py:1024:test_004()/713
+location: clients/tests/test-client.py:1036:test_004()/713
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -39031,12 +39031,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5694
-location: clients/tests/test-client.py:1024:test_004()/714
+size: 5696
+location: clients/tests/test-client.py:1036:test_004()/714
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -39139,7 +39139,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -39147,7 +39147,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 5654
-location: clients/tests/test-client.py:1026:test_004()/715
+location: clients/tests/test-client.py:1038:test_004()/715
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -39261,12 +39261,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5694
-location: clients/tests/test-client.py:1026:test_004()/716
+size: 5696
+location: clients/tests/test-client.py:1038:test_004()/716
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -39369,7 +39369,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -39377,7 +39377,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4180
-location: clients/tests/test-client.py:1029:test_004()/717
+location: clients/tests/test-client.py:1041:test_004()/717
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -39467,7 +39467,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 4205
-location: clients/tests/test-client.py:1029:test_004()/718
+location: clients/tests/test-client.py:1041:test_004()/718
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -39557,7 +39557,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 814
-location: clients/tests/test-client.py:1035:test_004()/719
+location: clients/tests/test-client.py:1047:test_004()/719
 cmd: $NMCLI --mode multiline --pretty --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -39576,7 +39576,7 @@ vpn.timeout:                            0
 
 <<<
 size: 830
-location: clients/tests/test-client.py:1035:test_004()/720
+location: clients/tests/test-client.py:1047:test_004()/720
 cmd: $NMCLI --mode multiline --pretty --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -39595,7 +39595,7 @@ vpn.timeout:                            0
 
 <<<
 size: 1165
-location: clients/tests/test-client.py:1038:test_004()/721
+location: clients/tests/test-client.py:1050:test_004()/721
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -39620,7 +39620,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1185
-location: clients/tests/test-client.py:1038:test_004()/722
+location: clients/tests/test-client.py:1050:test_004()/722
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -39645,7 +39645,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1877
-location: clients/tests/test-client.py:1041:test_004()/723
+location: clients/tests/test-client.py:1053:test_004()/723
 cmd: $NMCLI --mode multiline --pretty --color yes dev s
 lang: C
 returncode: 0
@@ -39682,7 +39682,7 @@ CONNECTION:                             --
 
 <<<
 size: 1892
-location: clients/tests/test-client.py:1041:test_004()/724
+location: clients/tests/test-client.py:1053:test_004()/724
 cmd: $NMCLI --mode multiline --pretty --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -39719,7 +39719,7 @@ CONNECTION:                             --
 
 <<<
 size: 3491
-location: clients/tests/test-client.py:1044:test_004()/725
+location: clients/tests/test-client.py:1056:test_004()/725
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev status
 lang: C
 returncode: 0
@@ -39781,7 +39781,7 @@ CON-PATH:                               --
 
 <<<
 size: 3516
-location: clients/tests/test-client.py:1044:test_004()/726
+location: clients/tests/test-client.py:1056:test_004()/726
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -39843,7 +39843,7 @@ CON-PATH:                               --
 
 <<<
 size: 12902
-location: clients/tests/test-client.py:1047:test_004()/727
+location: clients/tests/test-client.py:1059:test_004()/727
 cmd: $NMCLI --mode multiline --pretty --color yes dev show
 lang: C
 returncode: 0
@@ -40051,7 +40051,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 12966
-location: clients/tests/test-client.py:1047:test_004()/728
+location: clients/tests/test-client.py:1059:test_004()/728
 cmd: $NMCLI --mode multiline --pretty --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -40258,12 +40258,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 25572
-location: clients/tests/test-client.py:1050:test_004()/729
+size: 25562
+location: clients/tests/test-client.py:1062:test_004()/729
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 25396 bytes
+stdout: 25386 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -40326,7 +40326,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -40335,7 +40335,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -40706,12 +40706,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 25755
-location: clients/tests/test-client.py:1050:test_004()/730
+size: 25745
+location: clients/tests/test-client.py:1062:test_004()/730
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25569 bytes
+stdout: 25559 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -40774,7 +40774,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -40783,7 +40783,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -41155,7 +41155,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2468
-location: clients/tests/test-client.py:1053:test_004()/731
+location: clients/tests/test-client.py:1065:test_004()/731
 cmd: $NMCLI --mode multiline --pretty --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -41200,7 +41200,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2486
-location: clients/tests/test-client.py:1053:test_004()/732
+location: clients/tests/test-client.py:1065:test_004()/732
 cmd: $NMCLI --mode multiline --pretty --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -41244,12 +41244,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6203
-location: clients/tests/test-client.py:1056:test_004()/733
+size: 6193
+location: clients/tests/test-client.py:1068:test_004()/733
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 6022 bytes
+stdout: 6012 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -41312,7 +41312,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -41321,7 +41321,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -41358,12 +41358,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6265
-location: clients/tests/test-client.py:1056:test_004()/734
+size: 6255
+location: clients/tests/test-client.py:1068:test_004()/734
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6074 bytes
+stdout: 6064 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -41426,7 +41426,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -41435,7 +41435,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -41473,7 +41473,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2450
-location: clients/tests/test-client.py:1059:test_004()/735
+location: clients/tests/test-client.py:1071:test_004()/735
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -41524,7 +41524,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 2481
-location: clients/tests/test-client.py:1059:test_004()/736
+location: clients/tests/test-client.py:1071:test_004()/736
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -41575,7 +41575,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 2450
-location: clients/tests/test-client.py:1062:test_004()/737
+location: clients/tests/test-client.py:1074:test_004()/737
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -41626,7 +41626,7 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
 size: 2481
-location: clients/tests/test-client.py:1062:test_004()/738
+location: clients/tests/test-client.py:1074:test_004()/738
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -41677,7 +41677,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 1788
-location: clients/tests/test-client.py:1065:test_004()/739
+location: clients/tests/test-client.py:1077:test_004()/739
 cmd: $NMCLI --mode multiline --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -41709,7 +41709,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devi
 
 <<<
 size: 1798
-location: clients/tests/test-client.py:1065:test_004()/740
+location: clients/tests/test-client.py:1077:test_004()/740
 cmd: $NMCLI --mode multiline --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -41740,12 +41740,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devi
 -------------------------------------------------------------------------------
 
 <<<
-size: 5473
-location: clients/tests/test-client.py:1068:test_004()/741
+size: 5385
+location: clients/tests/test-client.py:1080:test_004()/741
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 5290 bytes
+stdout: 5202 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -41778,9 +41778,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -41796,9 +41796,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -41832,12 +41832,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 ===============================================================================
 
 <<<
-size: 5549
-location: clients/tests/test-client.py:1068:test_004()/742
+size: 5461
+location: clients/tests/test-client.py:1080:test_004()/742
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5356 bytes
+stdout: 5268 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -41870,9 +41870,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -41888,9 +41888,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -41924,12 +41924,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 ===============================================================================
 
 <<<
-size: 2908
-location: clients/tests/test-client.py:1070:test_004()/743
+size: 2898
+location: clients/tests/test-client.py:1082:test_004()/743
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 2722 bytes
+stdout: 2712 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -41950,7 +41950,7 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 -------------------------------------------------------------------------------
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
@@ -41959,7 +41959,7 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 -------------------------------------------------------------------------------
 
 ===============================================================================
@@ -41980,12 +41980,12 @@ SECURITY:                               WPA1 WPA2
 ===============================================================================
 
 <<<
-size: 2972
-location: clients/tests/test-client.py:1070:test_004()/744
+size: 2962
+location: clients/tests/test-client.py:1082:test_004()/744
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2776 bytes
+stdout: 2766 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -42006,7 +42006,7 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 -------------------------------------------------------------------------------
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
@@ -42015,7 +42015,7 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 -------------------------------------------------------------------------------
 
 ===============================================================================
@@ -42036,12 +42036,12 @@ SECURITY:                               WPA1 WPA2
 ===============================================================================
 
 <<<
-size: 5586
-location: clients/tests/test-client.py:1073:test_004()/745
+size: 5498
+location: clients/tests/test-client.py:1085:test_004()/745
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 5290 bytes
+stdout: 5202 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -42074,9 +42074,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -42092,9 +42092,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -42128,12 +42128,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 ===============================================================================
 
 <<<
-size: 5662
-location: clients/tests/test-client.py:1073:test_004()/746
+size: 5574
+location: clients/tests/test-client.py:1085:test_004()/746
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5356 bytes
+stdout: 5268 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -42166,9 +42166,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -42184,9 +42184,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -42221,7 +42221,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 1584
-location: clients/tests/test-client.py:1075:test_004()/747
+location: clients/tests/test-client.py:1087:test_004()/747
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -42253,7 +42253,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 1612
-location: clients/tests/test-client.py:1075:test_004()/748
+location: clients/tests/test-client.py:1087:test_004()/748
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -42285,7 +42285,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 944
-location: clients/tests/test-client.py:1077:test_004()/749
+location: clients/tests/test-client.py:1089:test_004()/749
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -42308,7 +42308,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 969
-location: clients/tests/test-client.py:1077:test_004()/750
+location: clients/tests/test-client.py:1089:test_004()/750
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -42331,7 +42331,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 1697
-location: clients/tests/test-client.py:1080:test_004()/751
+location: clients/tests/test-client.py:1092:test_004()/751
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -42363,7 +42363,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 1725
-location: clients/tests/test-client.py:1080:test_004()/752
+location: clients/tests/test-client.py:1092:test_004()/752
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -42394,12 +42394,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 6206
-location: clients/tests/test-client.py:1082:test_004()/753
+size: 6196
+location: clients/tests/test-client.py:1094:test_004()/753
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 6022 bytes
+stdout: 6012 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -42462,7 +42462,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -42471,7 +42471,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -42508,12 +42508,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6268
-location: clients/tests/test-client.py:1082:test_004()/754
+size: 6258
+location: clients/tests/test-client.py:1094:test_004()/754
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6074 bytes
+stdout: 6064 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -42576,7 +42576,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -42585,7 +42585,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -42623,7 +42623,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2481
-location: clients/tests/test-client.py:1084:test_004()/755
+location: clients/tests/test-client.py:1096:test_004()/755
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -42668,7 +42668,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2499
-location: clients/tests/test-client.py:1084:test_004()/756
+location: clients/tests/test-client.py:1096:test_004()/756
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -42712,12 +42712,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6344
-location: clients/tests/test-client.py:1086:test_004()/757
+size: 6334
+location: clients/tests/test-client.py:1098:test_004()/757
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 6022 bytes
+stdout: 6012 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -42780,7 +42780,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -42789,7 +42789,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -42826,12 +42826,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6406
-location: clients/tests/test-client.py:1086:test_004()/758
+size: 6396
+location: clients/tests/test-client.py:1098:test_004()/758
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6074 bytes
+stdout: 6064 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -42894,7 +42894,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -42903,7 +42903,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -42941,7 +42941,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2340
-location: clients/tests/test-client.py:1024:test_004()/759
+location: clients/tests/test-client.py:1036:test_004()/759
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
@@ -43043,7 +43043,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2350
-location: clients/tests/test-client.py:1024:test_004()/760
+location: clients/tests/test-client.py:1036:test_004()/760
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -43145,7 +43145,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2340
-location: clients/tests/test-client.py:1026:test_004()/761
+location: clients/tests/test-client.py:1038:test_004()/761
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
@@ -43247,7 +43247,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2350
-location: clients/tests/test-client.py:1026:test_004()/762
+location: clients/tests/test-client.py:1038:test_004()/762
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -43349,7 +43349,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 1788
-location: clients/tests/test-client.py:1029:test_004()/763
+location: clients/tests/test-client.py:1041:test_004()/763
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -43431,7 +43431,7 @@ proxy.pac-script:
 
 <<<
 size: 1798
-location: clients/tests/test-client.py:1029:test_004()/764
+location: clients/tests/test-client.py:1041:test_004()/764
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -43513,7 +43513,7 @@ proxy.pac-script:
 
 <<<
 size: 339
-location: clients/tests/test-client.py:1035:test_004()/765
+location: clients/tests/test-client.py:1047:test_004()/765
 cmd: $NMCLI --mode multiline --terse -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -43528,7 +43528,7 @@ vpn.timeout:0
 
 <<<
 size: 349
-location: clients/tests/test-client.py:1035:test_004()/766
+location: clients/tests/test-client.py:1047:test_004()/766
 cmd: $NMCLI --mode multiline --terse -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -43543,7 +43543,7 @@ vpn.timeout:0
 
 <<<
 size: 542
-location: clients/tests/test-client.py:1038:test_004()/767
+location: clients/tests/test-client.py:1050:test_004()/767
 cmd: $NMCLI --mode multiline --terse -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -43564,7 +43564,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 552
-location: clients/tests/test-client.py:1038:test_004()/768
+location: clients/tests/test-client.py:1050:test_004()/768
 cmd: $NMCLI --mode multiline --terse -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -43585,7 +43585,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 431
-location: clients/tests/test-client.py:1041:test_004()/769
+location: clients/tests/test-client.py:1053:test_004()/769
 cmd: $NMCLI --mode multiline --terse dev s
 lang: C
 returncode: 0
@@ -43614,7 +43614,7 @@ CONNECTION:
 
 <<<
 size: 441
-location: clients/tests/test-client.py:1041:test_004()/770
+location: clients/tests/test-client.py:1053:test_004()/770
 cmd: $NMCLI --mode multiline --terse dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -43643,7 +43643,7 @@ CONNECTION:
 
 <<<
 size: 1139
-location: clients/tests/test-client.py:1044:test_004()/771
+location: clients/tests/test-client.py:1056:test_004()/771
 cmd: $NMCLI --mode multiline --terse -f all dev status
 lang: C
 returncode: 0
@@ -43697,7 +43697,7 @@ CON-PATH:
 
 <<<
 size: 1149
-location: clients/tests/test-client.py:1044:test_004()/772
+location: clients/tests/test-client.py:1056:test_004()/772
 cmd: $NMCLI --mode multiline --terse -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -43751,7 +43751,7 @@ CON-PATH:
 
 <<<
 size: 4557
-location: clients/tests/test-client.py:1047:test_004()/773
+location: clients/tests/test-client.py:1059:test_004()/773
 cmd: $NMCLI --mode multiline --terse dev show
 lang: C
 returncode: 0
@@ -43897,7 +43897,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
 size: 4567
-location: clients/tests/test-client.py:1047:test_004()/774
+location: clients/tests/test-client.py:1059:test_004()/774
 cmd: $NMCLI --mode multiline --terse dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -44042,12 +44042,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 11954
-location: clients/tests/test-client.py:1050:test_004()/775
+size: 11944
+location: clients/tests/test-client.py:1062:test_004()/775
 cmd: $NMCLI --mode multiline --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 11791 bytes
+stdout: 11781 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -44103,7 +44103,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -44111,7 +44111,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -44431,12 +44431,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 12000
-location: clients/tests/test-client.py:1050:test_004()/776
+size: 11990
+location: clients/tests/test-client.py:1062:test_004()/776
 cmd: $NMCLI --mode multiline --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 11827 bytes
+stdout: 11817 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -44492,7 +44492,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -44500,7 +44500,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -44821,7 +44821,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 899
-location: clients/tests/test-client.py:1053:test_004()/777
+location: clients/tests/test-client.py:1065:test_004()/777
 cmd: $NMCLI --mode multiline --terse dev show wlan0
 lang: C
 returncode: 0
@@ -44854,7 +44854,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 909
-location: clients/tests/test-client.py:1053:test_004()/778
+location: clients/tests/test-client.py:1065:test_004()/778
 cmd: $NMCLI --mode multiline --terse dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -44886,12 +44886,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2720
-location: clients/tests/test-client.py:1056:test_004()/779
+size: 2710
+location: clients/tests/test-client.py:1068:test_004()/779
 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2552 bytes
+stdout: 2542 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -44947,7 +44947,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -44955,7 +44955,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -44986,12 +44986,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2757
-location: clients/tests/test-client.py:1056:test_004()/780
+size: 2747
+location: clients/tests/test-client.py:1068:test_004()/780
 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2579 bytes
+stdout: 2569 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -45047,7 +45047,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -45055,7 +45055,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -45087,7 +45087,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 1208
-location: clients/tests/test-client.py:1059:test_004()/781
+location: clients/tests/test-client.py:1071:test_004()/781
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -45132,7 +45132,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 1218
-location: clients/tests/test-client.py:1059:test_004()/782
+location: clients/tests/test-client.py:1071:test_004()/782
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -45177,7 +45177,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 1208
-location: clients/tests/test-client.py:1062:test_004()/783
+location: clients/tests/test-client.py:1074:test_004()/783
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -45222,7 +45222,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 1218
-location: clients/tests/test-client.py:1062:test_004()/784
+location: clients/tests/test-client.py:1074:test_004()/784
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -45267,7 +45267,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 555
-location: clients/tests/test-client.py:1065:test_004()/785
+location: clients/tests/test-client.py:1077:test_004()/785
 cmd: $NMCLI --mode multiline --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -45291,7 +45291,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 565
-location: clients/tests/test-client.py:1065:test_004()/786
+location: clients/tests/test-client.py:1077:test_004()/786
 cmd: $NMCLI --mode multiline --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -45314,12 +45314,12 @@ TYPE:wifi
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 1640
-location: clients/tests/test-client.py:1068:test_004()/787
+size: 1552
+location: clients/tests/test-client.py:1080:test_004()/787
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1470 bytes
+stdout: 1382 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -45348,9 +45348,9 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(none)
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
@@ -45365,9 +45365,9 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(none)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
@@ -45393,12 +45393,12 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1698
-location: clients/tests/test-client.py:1068:test_004()/788
+size: 1610
+location: clients/tests/test-client.py:1080:test_004()/788
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1518 bytes
+stdout: 1430 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -45427,9 +45427,9 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(brak)
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
@@ -45444,9 +45444,9 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(brak)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
@@ -45472,12 +45472,12 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 562
-location: clients/tests/test-client.py:1070:test_004()/789
+size: 552
+location: clients/tests/test-client.py:1082:test_004()/789
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 390 bytes
+stdout: 380 bytes
 >>>
 IN-USE: 
 SSID:wlan0-ap-2
@@ -45494,7 +45494,7 @@ CHAN:1
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 IN-USE: 
 SSID:wlan0-ap-3
 MODE:Infra
@@ -45502,7 +45502,7 @@ CHAN:1
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
+SECURITY:WPA3
 
 IN-USE: 
 SSID:wlan1-ap-4
@@ -45515,12 +45515,12 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 608
-location: clients/tests/test-client.py:1070:test_004()/790
+size: 598
+location: clients/tests/test-client.py:1082:test_004()/790
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 426 bytes
+stdout: 416 bytes
 >>>
 IN-USE: 
 SSID:wlan0-ap-2
@@ -45537,7 +45537,7 @@ CHAN:1
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 IN-USE: 
 SSID:wlan0-ap-3
 MODE:Infrastruktura
@@ -45545,7 +45545,7 @@ CHAN:1
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
+SECURITY:WPA3
 
 IN-USE: 
 SSID:wlan1-ap-4
@@ -45558,12 +45558,12 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 1753
-location: clients/tests/test-client.py:1073:test_004()/791
+size: 1665
+location: clients/tests/test-client.py:1085:test_004()/791
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 1470 bytes
+stdout: 1382 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -45592,9 +45592,9 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(none)
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
@@ -45609,9 +45609,9 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(none)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
@@ -45637,12 +45637,12 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1811
-location: clients/tests/test-client.py:1073:test_004()/792
+size: 1723
+location: clients/tests/test-client.py:1085:test_004()/792
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1518 bytes
+stdout: 1430 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -45671,9 +45671,9 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(brak)
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
@@ -45688,9 +45688,9 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(brak)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
@@ -45717,7 +45717,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 <<<
 size: 562
-location: clients/tests/test-client.py:1075:test_004()/793
+location: clients/tests/test-client.py:1087:test_004()/793
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -45745,7 +45745,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 <<<
 size: 584
-location: clients/tests/test-client.py:1075:test_004()/794
+location: clients/tests/test-client.py:1087:test_004()/794
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -45773,7 +45773,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 <<<
 size: 294
-location: clients/tests/test-client.py:1077:test_004()/795
+location: clients/tests/test-client.py:1089:test_004()/795
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -45792,7 +45792,7 @@ SECURITY:WPA1 WPA2
 
 <<<
 size: 314
-location: clients/tests/test-client.py:1077:test_004()/796
+location: clients/tests/test-client.py:1089:test_004()/796
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -45811,7 +45811,7 @@ SECURITY:WPA1 WPA2
 
 <<<
 size: 675
-location: clients/tests/test-client.py:1080:test_004()/797
+location: clients/tests/test-client.py:1092:test_004()/797
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -45839,7 +45839,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 <<<
 size: 697
-location: clients/tests/test-client.py:1080:test_004()/798
+location: clients/tests/test-client.py:1092:test_004()/798
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -45866,12 +45866,12 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 2723
-location: clients/tests/test-client.py:1082:test_004()/799
+size: 2713
+location: clients/tests/test-client.py:1094:test_004()/799
 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2552 bytes
+stdout: 2542 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -45927,7 +45927,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -45935,7 +45935,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -45966,12 +45966,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2760
-location: clients/tests/test-client.py:1082:test_004()/800
+size: 2750
+location: clients/tests/test-client.py:1094:test_004()/800
 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2579 bytes
+stdout: 2569 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -46027,7 +46027,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -46035,7 +46035,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -46067,7 +46067,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 912
-location: clients/tests/test-client.py:1084:test_004()/801
+location: clients/tests/test-client.py:1096:test_004()/801
 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -46100,7 +46100,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 922
-location: clients/tests/test-client.py:1084:test_004()/802
+location: clients/tests/test-client.py:1096:test_004()/802
 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46132,12 +46132,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2861
-location: clients/tests/test-client.py:1086:test_004()/803
+size: 2851
+location: clients/tests/test-client.py:1098:test_004()/803
 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2552 bytes
+stdout: 2542 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -46193,7 +46193,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -46201,7 +46201,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -46232,12 +46232,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2898
-location: clients/tests/test-client.py:1086:test_004()/804
+size: 2888
+location: clients/tests/test-client.py:1098:test_004()/804
 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2579 bytes
+stdout: 2569 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -46293,7 +46293,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -46301,7 +46301,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -46333,7 +46333,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 2352
-location: clients/tests/test-client.py:1024:test_004()/805
+location: clients/tests/test-client.py:1036:test_004()/805
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -46435,7 +46435,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2362
-location: clients/tests/test-client.py:1024:test_004()/806
+location: clients/tests/test-client.py:1036:test_004()/806
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46537,7 +46537,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2352
-location: clients/tests/test-client.py:1026:test_004()/807
+location: clients/tests/test-client.py:1038:test_004()/807
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -46639,7 +46639,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2362
-location: clients/tests/test-client.py:1026:test_004()/808
+location: clients/tests/test-client.py:1038:test_004()/808
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46741,7 +46741,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 1800
-location: clients/tests/test-client.py:1029:test_004()/809
+location: clients/tests/test-client.py:1041:test_004()/809
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -46823,7 +46823,7 @@ proxy.pac-script:
 
 <<<
 size: 1810
-location: clients/tests/test-client.py:1029:test_004()/810
+location: clients/tests/test-client.py:1041:test_004()/810
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46905,7 +46905,7 @@ proxy.pac-script:
 
 <<<
 size: 351
-location: clients/tests/test-client.py:1035:test_004()/811
+location: clients/tests/test-client.py:1047:test_004()/811
 cmd: $NMCLI --mode multiline --terse --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -46920,7 +46920,7 @@ vpn.timeout:0
 
 <<<
 size: 361
-location: clients/tests/test-client.py:1035:test_004()/812
+location: clients/tests/test-client.py:1047:test_004()/812
 cmd: $NMCLI --mode multiline --terse --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46935,7 +46935,7 @@ vpn.timeout:0
 
 <<<
 size: 554
-location: clients/tests/test-client.py:1038:test_004()/813
+location: clients/tests/test-client.py:1050:test_004()/813
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -46956,7 +46956,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 564
-location: clients/tests/test-client.py:1038:test_004()/814
+location: clients/tests/test-client.py:1050:test_004()/814
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46977,7 +46977,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 603
-location: clients/tests/test-client.py:1041:test_004()/815
+location: clients/tests/test-client.py:1053:test_004()/815
 cmd: $NMCLI --mode multiline --terse --color yes dev s
 lang: C
 returncode: 0
@@ -47006,7 +47006,7 @@ CONNECTION:
 
 <<<
 size: 613
-location: clients/tests/test-client.py:1041:test_004()/816
+location: clients/tests/test-client.py:1053:test_004()/816
 cmd: $NMCLI --mode multiline --terse --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -47035,7 +47035,7 @@ CONNECTION:
 
 <<<
 size: 1512
-location: clients/tests/test-client.py:1044:test_004()/817
+location: clients/tests/test-client.py:1056:test_004()/817
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev status
 lang: C
 returncode: 0
@@ -47089,7 +47089,7 @@ CON-PATH:
 
 <<<
 size: 1522
-location: clients/tests/test-client.py:1044:test_004()/818
+location: clients/tests/test-client.py:1056:test_004()/818
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -47143,7 +47143,7 @@ CON-PATH:
 
 <<<
 size: 4569
-location: clients/tests/test-client.py:1047:test_004()/819
+location: clients/tests/test-client.py:1059:test_004()/819
 cmd: $NMCLI --mode multiline --terse --color yes dev show
 lang: C
 returncode: 0
@@ -47289,7 +47289,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
 size: 4579
-location: clients/tests/test-client.py:1047:test_004()/820
+location: clients/tests/test-client.py:1059:test_004()/820
 cmd: $NMCLI --mode multiline --terse --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -47434,12 +47434,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 12254
-location: clients/tests/test-client.py:1050:test_004()/821
+size: 12244
+location: clients/tests/test-client.py:1062:test_004()/821
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 12079 bytes
+stdout: 12069 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -47495,7 +47495,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -47503,7 +47503,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -47823,12 +47823,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 12300
-location: clients/tests/test-client.py:1050:test_004()/822
+size: 12290
+location: clients/tests/test-client.py:1062:test_004()/822
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 12115 bytes
+stdout: 12105 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -47884,7 +47884,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -47892,7 +47892,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -48213,7 +48213,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 911
-location: clients/tests/test-client.py:1053:test_004()/823
+location: clients/tests/test-client.py:1065:test_004()/823
 cmd: $NMCLI --mode multiline --terse --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -48246,7 +48246,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 921
-location: clients/tests/test-client.py:1053:test_004()/824
+location: clients/tests/test-client.py:1065:test_004()/824
 cmd: $NMCLI --mode multiline --terse --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -48278,12 +48278,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2948
-location: clients/tests/test-client.py:1056:test_004()/825
+size: 2938
+location: clients/tests/test-client.py:1068:test_004()/825
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2768 bytes
+stdout: 2758 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -48339,7 +48339,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -48347,7 +48347,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -48378,12 +48378,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2985
-location: clients/tests/test-client.py:1056:test_004()/826
+size: 2975
+location: clients/tests/test-client.py:1068:test_004()/826
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2795 bytes
+stdout: 2785 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -48439,7 +48439,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -48447,7 +48447,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -48479,7 +48479,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 1220
-location: clients/tests/test-client.py:1059:test_004()/827
+location: clients/tests/test-client.py:1071:test_004()/827
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -48524,7 +48524,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 1230
-location: clients/tests/test-client.py:1059:test_004()/828
+location: clients/tests/test-client.py:1071:test_004()/828
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -48569,7 +48569,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 1220
-location: clients/tests/test-client.py:1062:test_004()/829
+location: clients/tests/test-client.py:1074:test_004()/829
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
@@ -48614,7 +48614,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 1230
-location: clients/tests/test-client.py:1062:test_004()/830
+location: clients/tests/test-client.py:1074:test_004()/830
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -48659,7 +48659,7 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 687
-location: clients/tests/test-client.py:1065:test_004()/831
+location: clients/tests/test-client.py:1077:test_004()/831
 cmd: $NMCLI --mode multiline --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -48683,7 +48683,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 697
-location: clients/tests/test-client.py:1065:test_004()/832
+location: clients/tests/test-client.py:1077:test_004()/832
 cmd: $NMCLI --mode multiline --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -48706,12 +48706,12 @@ TYPE:wifi
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 2264
-location: clients/tests/test-client.py:1068:test_004()/833
+size: 2176
+location: clients/tests/test-client.py:1080:test_004()/833
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 2082 bytes
+stdout: 1994 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -48740,9 +48740,9 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(none)
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
@@ -48757,9 +48757,9 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(none)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
@@ -48785,12 +48785,12 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 2322
-location: clients/tests/test-client.py:1068:test_004()/834
+size: 2234
+location: clients/tests/test-client.py:1080:test_004()/834
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2130 bytes
+stdout: 2042 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -48819,9 +48819,9 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(brak)
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
@@ -48836,9 +48836,9 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(brak)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
@@ -48864,12 +48864,12 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 862
-location: clients/tests/test-client.py:1070:test_004()/835
+size: 852
+location: clients/tests/test-client.py:1082:test_004()/835
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 678 bytes
+stdout: 668 bytes
 >>>
 IN-USE: 
 SSID:wlan0-ap-2
@@ -48886,7 +48886,7 @@ CHAN:1
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 IN-USE: 
 SSID:wlan0-ap-3
 MODE:Infra
@@ -48894,7 +48894,7 @@ CHAN:1
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
+SECURITY:WPA3
 
 IN-USE: 
 SSID:wlan1-ap-4
@@ -48907,12 +48907,12 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 908
-location: clients/tests/test-client.py:1070:test_004()/836
+size: 898
+location: clients/tests/test-client.py:1082:test_004()/836
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 714 bytes
+stdout: 704 bytes
 >>>
 IN-USE: 
 SSID:wlan0-ap-2
@@ -48929,7 +48929,7 @@ CHAN:1
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 IN-USE: 
 SSID:wlan0-ap-3
 MODE:Infrastruktura
@@ -48937,7 +48937,7 @@ CHAN:1
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
+SECURITY:WPA3
 
 IN-USE: 
 SSID:wlan1-ap-4
@@ -48950,12 +48950,12 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 2377
-location: clients/tests/test-client.py:1073:test_004()/837
+size: 2289
+location: clients/tests/test-client.py:1085:test_004()/837
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 2082 bytes
+stdout: 1994 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -48984,9 +48984,9 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(none)
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
@@ -49001,9 +49001,9 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(none)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
@@ -49029,12 +49029,12 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 2435
-location: clients/tests/test-client.py:1073:test_004()/838
+size: 2347
+location: clients/tests/test-client.py:1085:test_004()/838
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2130 bytes
+stdout: 2042 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -49063,9 +49063,9 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(brak)
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
@@ -49080,9 +49080,9 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(brak)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
@@ -49109,7 +49109,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 <<<
 size: 727
-location: clients/tests/test-client.py:1075:test_004()/839
+location: clients/tests/test-client.py:1087:test_004()/839
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -49137,7 +49137,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 <<<
 size: 749
-location: clients/tests/test-client.py:1075:test_004()/840
+location: clients/tests/test-client.py:1087:test_004()/840
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -49165,7 +49165,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 <<<
 size: 379
-location: clients/tests/test-client.py:1077:test_004()/841
+location: clients/tests/test-client.py:1089:test_004()/841
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -49184,7 +49184,7 @@ SECURITY:WPA1 WPA2
 
 <<<
 size: 398
-location: clients/tests/test-client.py:1077:test_004()/842
+location: clients/tests/test-client.py:1089:test_004()/842
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -49203,7 +49203,7 @@ SECURITY:WPA1 WPA2
 
 <<<
 size: 840
-location: clients/tests/test-client.py:1080:test_004()/843
+location: clients/tests/test-client.py:1092:test_004()/843
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -49231,7 +49231,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 <<<
 size: 862
-location: clients/tests/test-client.py:1080:test_004()/844
+location: clients/tests/test-client.py:1092:test_004()/844
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -49258,12 +49258,12 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 2951
-location: clients/tests/test-client.py:1082:test_004()/845
+size: 2941
+location: clients/tests/test-client.py:1094:test_004()/845
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2768 bytes
+stdout: 2758 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -49319,7 +49319,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -49327,7 +49327,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -49358,12 +49358,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2988
-location: clients/tests/test-client.py:1082:test_004()/846
+size: 2978
+location: clients/tests/test-client.py:1094:test_004()/846
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2795 bytes
+stdout: 2785 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -49419,7 +49419,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -49427,7 +49427,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -49459,7 +49459,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 924
-location: clients/tests/test-client.py:1084:test_004()/847
+location: clients/tests/test-client.py:1096:test_004()/847
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -49492,7 +49492,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 934
-location: clients/tests/test-client.py:1084:test_004()/848
+location: clients/tests/test-client.py:1096:test_004()/848
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -49524,12 +49524,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3089
-location: clients/tests/test-client.py:1086:test_004()/849
+size: 3079
+location: clients/tests/test-client.py:1098:test_004()/849
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2768 bytes
+stdout: 2758 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -49585,7 +49585,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -49593,7 +49593,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -49624,12 +49624,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3126
-location: clients/tests/test-client.py:1086:test_004()/850
+size: 3116
+location: clients/tests/test-client.py:1098:test_004()/850
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2795 bytes
+stdout: 2785 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -49685,7 +49685,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -49693,7 +49693,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py
index fee874ba..c7d5c958 100755
--- a/clients/tests/test-client.py
+++ b/clients/tests/test-client.py
@@ -807,11 +807,23 @@ class TestNmcli(NmTestBase):
                            iface = 'wlan1')
 
         self.srv.op_AddObj('WifiAp',
-                           device = 'wlan0')
+                           device = 'wlan0',
+                           rsnf = 0x0)
+
         self.srv.op_AddObj('WifiAp',
                            device = 'wlan0')
+
+        NM_AP_FLAGS = getattr(NM, '80211ApSecurityFlags')
+        rsnf = 0x0
+        rsnf = rsnf | NM_AP_FLAGS.PAIR_TKIP
+        rsnf = rsnf | NM_AP_FLAGS.PAIR_CCMP
+        rsnf = rsnf | NM_AP_FLAGS.GROUP_TKIP
+        rsnf = rsnf | NM_AP_FLAGS.GROUP_CCMP
+        rsnf = rsnf | NM_AP_FLAGS.KEY_MGMT_SAE
         self.srv.op_AddObj('WifiAp',
-                           device = 'wlan0')
+                           device = 'wlan0',
+                           wpaf = 0x0,
+                           rsnf = rsnf)
 
         self.srv.op_AddObj('WifiAp',
                            device = 'wlan1')
diff --git a/clients/tui/newt/nmt-newt-button-box.c b/clients/tui/newt/nmt-newt-button-box.c
index 5341c76a..02d8f5cb 100644
--- a/clients/tui/newt/nmt-newt-button-box.c
+++ b/clients/tui/newt/nmt-newt-button-box.c
@@ -31,9 +31,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-button-box.h"
+
 #include "nmt-newt-button.h"
 
 G_DEFINE_TYPE (NmtNewtButtonBox, nmt_newt_button_box, NMT_TYPE_NEWT_CONTAINER)
diff --git a/clients/tui/newt/nmt-newt-container.c b/clients/tui/newt/nmt-newt-container.c
index 927f187e..40259025 100644
--- a/clients/tui/newt/nmt-newt-container.c
+++ b/clients/tui/newt/nmt-newt-container.c
@@ -28,9 +28,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-container.h"
+
 #include "nmt-newt-component.h"
 
 G_DEFINE_ABSTRACT_TYPE (NmtNewtContainer, nmt_newt_container, NMT_TYPE_NEWT_WIDGET)
diff --git a/clients/tui/newt/nmt-newt-entry-numeric.c b/clients/tui/newt/nmt-newt-entry-numeric.c
index a52fe868..92855fcb 100644
--- a/clients/tui/newt/nmt-newt-entry-numeric.c
+++ b/clients/tui/newt/nmt-newt-entry-numeric.c
@@ -127,8 +127,8 @@ newt_entry_numeric_validate (NmtNewtEntry *entry,
 	if (!*text)
 		return priv->optional ? TRUE : FALSE;
 
-	val = _nm_utils_ascii_str_to_int64 (text, 10, priv->min, priv->max, 0);
-	return val != 0 || errno == 0;
+	val = _nm_utils_ascii_str_to_int64 (text, 10, priv->min, priv->max, G_MAXINT64);
+	return val != G_MAXINT64 || errno == 0;
 }
 
 static void
diff --git a/clients/tui/newt/nmt-newt-entry.c b/clients/tui/newt/nmt-newt-entry.c
index 2715a738..90c2e467 100644
--- a/clients/tui/newt/nmt-newt-entry.c
+++ b/clients/tui/newt/nmt-newt-entry.c
@@ -28,8 +28,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-entry.h"
 #include "nmt-newt-form.h"
 #include "nmt-newt-hacks.h"
diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c
index ccf447ea..cd87a216 100644
--- a/clients/tui/newt/nmt-newt-form.c
+++ b/clients/tui/newt/nmt-newt-form.c
@@ -27,7 +27,6 @@
 #include "nm-default.h"
 
 #include <fcntl.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "nmt-newt-form.h"
diff --git a/clients/tui/newt/nmt-newt-grid.c b/clients/tui/newt/nmt-newt-grid.c
index 4333e0dc..e6c487f5 100644
--- a/clients/tui/newt/nmt-newt-grid.c
+++ b/clients/tui/newt/nmt-newt-grid.c
@@ -42,8 +42,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-grid.h"
 
 G_DEFINE_TYPE (NmtNewtGrid, nmt_newt_grid, NMT_TYPE_NEWT_CONTAINER)
diff --git a/clients/tui/newt/nmt-newt-label.c b/clients/tui/newt/nmt-newt-label.c
index f9aed8a3..63bd28da 100644
--- a/clients/tui/newt/nmt-newt-label.c
+++ b/clients/tui/newt/nmt-newt-label.c
@@ -27,9 +27,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-label.h"
+
 #include "nmt-newt-utils.h"
 
 G_DEFINE_TYPE (NmtNewtLabel, nmt_newt_label, NMT_TYPE_NEWT_COMPONENT)
diff --git a/clients/tui/newt/nmt-newt-section.c b/clients/tui/newt/nmt-newt-section.c
index 34073454..9b7e44e4 100644
--- a/clients/tui/newt/nmt-newt-section.c
+++ b/clients/tui/newt/nmt-newt-section.c
@@ -37,9 +37,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-section.h"
+
 #include "nmt-newt-grid.h"
 #include "nmt-newt-label.h"
 #include "nmt-newt-utils.h"
diff --git a/clients/tui/newt/nmt-newt-stack.c b/clients/tui/newt/nmt-newt-stack.c
index 3abf00b1..da4beb8b 100644
--- a/clients/tui/newt/nmt-newt-stack.c
+++ b/clients/tui/newt/nmt-newt-stack.c
@@ -31,8 +31,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-stack.h"
 
 G_DEFINE_TYPE (NmtNewtStack, nmt_newt_stack, NMT_TYPE_NEWT_CONTAINER)
diff --git a/clients/tui/newt/nmt-newt-textbox.c b/clients/tui/newt/nmt-newt-textbox.c
index 73794f5e..0850e60c 100644
--- a/clients/tui/newt/nmt-newt-textbox.c
+++ b/clients/tui/newt/nmt-newt-textbox.c
@@ -26,9 +26,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-textbox.h"
+
 #include "nmt-newt-utils.h"
 
 G_DEFINE_TYPE (NmtNewtTextbox, nmt_newt_textbox, NMT_TYPE_NEWT_COMPONENT)
diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c
index e8866500..475faf7e 100644
--- a/clients/tui/newt/nmt-newt-utils.c
+++ b/clients/tui/newt/nmt-newt-utils.c
@@ -23,7 +23,6 @@
 
 #include "nm-default.h"
 
-#include <errno.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <sys/wait.h>
diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c
index 16ea60d3..df6387c3 100644
--- a/clients/tui/nm-editor-bindings.c
+++ b/clients/tui/nm-editor-bindings.c
@@ -27,12 +27,11 @@
 
 #include "nm-default.h"
 
+#include "nm-editor-bindings.h"
+
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <stdlib.h>
-#include <string.h>
-
-#include "nm-editor-bindings.h"
 
 static void
 value_transform_string_int (const GValue *src_value,
diff --git a/clients/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c
index 53990d6a..ae1a6b2f 100644
--- a/clients/tui/nmt-address-list.c
+++ b/clients/tui/nmt-address-list.c
@@ -30,12 +30,12 @@
 
 #include "nm-default.h"
 
+#include "nmt-address-list.h"
+
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <stdlib.h>
-#include <string.h>
 
-#include "nmt-address-list.h"
 #include "nmt-ip-entry.h"
 
 G_DEFINE_TYPE (NmtAddressList, nmt_address_list, NMT_TYPE_WIDGET_LIST)
diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
index a4d63e4f..43fbbc16 100644
--- a/clients/tui/nmt-device-entry.c
+++ b/clients/tui/nmt-device-entry.c
@@ -36,12 +36,12 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nmt-device-entry.h"
+
 #include <sys/socket.h>
 #include <linux/if_arp.h>
 
 #include "nmtui.h"
-#include "nmt-device-entry.h"
 
 G_DEFINE_TYPE (NmtDeviceEntry, nmt_device_entry, NMT_TYPE_EDITOR_GRID)
 
diff --git a/clients/tui/nmt-editor-grid.c b/clients/tui/nmt-editor-grid.c
index bc8a7843..bb3e78b8 100644
--- a/clients/tui/nmt-editor-grid.c
+++ b/clients/tui/nmt-editor-grid.c
@@ -39,8 +39,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-editor-grid.h"
 
 G_DEFINE_TYPE (NmtEditorGrid, nmt_editor_grid, NMT_TYPE_NEWT_CONTAINER)
diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c
index 23c2ab1c..70c8c307 100644
--- a/clients/tui/nmt-mac-entry.c
+++ b/clients/tui/nmt-mac-entry.c
@@ -30,8 +30,6 @@
 
 #include "nmt-mac-entry.h"
 
-#include <string.h>
-
 #include "nm-common-macros.h"
 
 G_DEFINE_TYPE (NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY)
diff --git a/clients/tui/nmt-utils.c b/clients/tui/nmt-utils.c
index 7cd71be2..96b97158 100644
--- a/clients/tui/nmt-utils.c
+++ b/clients/tui/nmt-utils.c
@@ -23,8 +23,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-utils.h"
 
 /**
diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c
index 2fd5af02..ad35f3de 100644
--- a/clients/tui/nmt-widget-list.c
+++ b/clients/tui/nmt-widget-list.c
@@ -32,12 +32,12 @@
 
 #include "nm-default.h"
 
+#include "nmt-widget-list.h"
+
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <stdlib.h>
-#include <string.h>
 
-#include "nmt-widget-list.h"
 #include "nmt-newt.h"
 
 G_DEFINE_TYPE (NmtWidgetList, nmt_widget_list, NMT_TYPE_NEWT_GRID)
diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c
index 6f29e13e..e43c22e4 100644
--- a/clients/tui/nmtui-connect.c
+++ b/clients/tui/nmtui-connect.c
@@ -240,7 +240,7 @@ activate_connection (NMConnection *connection,
                      NMObject     *specific_object)
 {
 	NmtNewtForm *form;
-	gs_unref_object NMSecretAgentOld *agent = NULL;
+	gs_unref_object NMSecretAgentSimple *agent = NULL;
 	NmtNewtWidget *label;
 	NmtSyncOp op;
 	const char *specific_object_path;
@@ -257,7 +257,7 @@ activate_connection (NMConnection *connection,
 	agent = nm_secret_agent_simple_new ("nmtui");
 	if (agent) {
 		if (connection) {
-			nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (agent),
+			nm_secret_agent_simple_enable (agent,
 			                               nm_object_get_path (NM_OBJECT (connection)));
 		}
 		g_signal_connect (agent,
@@ -303,7 +303,7 @@ activate_connection (NMConnection *connection,
 	if (agent && !connection) {
 		connection = NM_CONNECTION (nm_active_connection_get_connection (ac));
 		if (connection) {
-			nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (agent),
+			nm_secret_agent_simple_enable (agent,
 			                               nm_object_get_path (NM_OBJECT (connection)));
 		}
 	}
@@ -341,7 +341,7 @@ activate_connection (NMConnection *connection,
 	g_object_unref (form);
 
 	if (agent)
-		nm_secret_agent_old_unregister (agent, NULL, NULL);
+		nm_secret_agent_old_unregister (NM_SECRET_AGENT_OLD (agent), NULL, NULL);
 }
 
 static void
diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c
index 97c528e7..aacc07cb 100644
--- a/clients/tui/nmtui.c
+++ b/clients/tui/nmtui.c
@@ -26,14 +26,14 @@
 
 #include "nm-default.h"
 
+#include "nmtui.h"
+
 #include <locale.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "nmt-newt.h"
 #include "nm-editor-bindings.h"
 
-#include "nmtui.h"
 #include "nmtui-edit.h"
 #include "nmtui-connect.h"
 #include "nmtui-hostname.h"