New upstream version 1.35.91 upstream/1.35.91

9 files changed, 538 insertions, 523 deletions

diff --git a/src/core/supplicant/nm-supplicant-config.c b/src/core/supplicant/nm-supplicant-config.c
index c486ba1d..96c23579 100644
--- a/src/core/supplicant/nm-supplicant-config.c
+++ b/src/core/supplicant/nm-supplicant-config.c
@@ -20,7 +20,7 @@
 #include "nm-setting-ip4-config.h"
 
 typedef struct {
-    char *         value;
+    char          *value;
     guint32        len;
     NMSupplOptType type;
 } ConfigOption;
@@ -28,8 +28,8 @@ typedef struct {
 /*****************************************************************************/
 
 typedef struct {
-    GHashTable *   config;
-    GHashTable *   blobs;
+    GHashTable    *config;
+    GHashTable    *blobs;
     NMSupplCapMask capabilities;
     guint32        ap_scan;
     bool           fast_required : 1;
@@ -63,7 +63,7 @@ NMSupplicantConfig *
 nm_supplicant_config_new(NMSupplCapMask capabilities)
 {
     NMSupplicantConfigPrivate *priv;
-    NMSupplicantConfig *       self;
+    NMSupplicantConfig        *self;
 
     self = g_object_new(NM_TYPE_SUPPLICANT_CONFIG, NULL);
     priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE(self);
@@ -96,16 +96,16 @@ nm_supplicant_config_init(NMSupplicantConfig *self)
 
 static gboolean
 nm_supplicant_config_add_option_with_type(NMSupplicantConfig *self,
-                                          const char *        key,
-                                          const char *        value,
+                                          const char         *key,
+                                          const char         *value,
                                           gint32              len,
                                           NMSupplOptType      opt_type,
-                                          const char *        display_value,
-                                          GError **           error)
+                                          const char         *display_value,
+                                          GError            **error)
 {
     NMSupplicantConfigPrivate *priv;
-    ConfigOption *             old_opt;
-    ConfigOption *             opt;
+    ConfigOption              *old_opt;
+    ConfigOption              *opt;
     NMSupplOptType             type;
 
     g_return_val_if_fail(NM_IS_SUPPLICANT_CONFIG(self), FALSE);
@@ -124,7 +124,7 @@ nm_supplicant_config_add_option_with_type(NMSupplicantConfig *self,
         type = nm_supplicant_settings_verify_setting(key, value, len);
         if (type == NM_SUPPL_OPT_TYPE_INVALID) {
             gs_free char *str_free = NULL;
-            const char *  str;
+            const char   *str;
 
             str = nm_utils_buf_utf8safe_escape(value,
                                                len,
@@ -178,11 +178,11 @@ nm_supplicant_config_add_option_with_type(NMSupplicantConfig *self,
 
 static gboolean
 nm_supplicant_config_add_option(NMSupplicantConfig *self,
-                                const char *        key,
-                                const char *        value,
+                                const char         *key,
+                                const char         *value,
                                 gint32              len,
-                                const char *        display_value,
-                                GError **           error)
+                                const char         *display_value,
+                                GError            **error)
 {
     return nm_supplicant_config_add_option_with_type(self,
                                                      key,
@@ -195,16 +195,16 @@ nm_supplicant_config_add_option(NMSupplicantConfig *self,
 
 static gboolean
 nm_supplicant_config_add_blob(NMSupplicantConfig *self,
-                              const char *        key,
-                              GBytes *            value,
-                              const char *        blobid,
-                              GError **           error)
+                              const char         *key,
+                              GBytes             *value,
+                              const char         *blobid,
+                              GError            **error)
 {
     NMSupplicantConfigPrivate *priv;
-    ConfigOption *             old_opt;
-    ConfigOption *             opt;
+    ConfigOption              *old_opt;
+    ConfigOption              *opt;
     NMSupplOptType             type;
-    const guint8 *             data;
+    const guint8              *data;
     gsize                      data_len;
 
     g_return_val_if_fail(NM_IS_SUPPLICANT_CONFIG(self), FALSE);
@@ -256,14 +256,14 @@ nm_supplicant_config_add_blob(NMSupplicantConfig *self,
 
 static gboolean
 nm_supplicant_config_add_blob_for_connection(NMSupplicantConfig *self,
-                                             GBytes *            field,
-                                             const char *        name,
-                                             const char *        con_uid,
-                                             GError **           error)
+                                             GBytes             *field,
+                                             const char         *name,
+                                             const char         *con_uid,
+                                             GError            **error)
 {
     if (field && g_bytes_get_size(field)) {
         gs_free char *uid = NULL;
-        char *        p;
+        char         *p;
 
         uid = g_strdup_printf("%s-%s", con_uid, name);
         for (p = uid; *p; p++) {
@@ -317,8 +317,8 @@ nm_supplicant_config_to_variant(NMSupplicantConfig *self)
     NMSupplicantConfigPrivate *priv;
     GVariantBuilder            builder;
     GHashTableIter             iter;
-    ConfigOption *             option;
-    const char *               key;
+    ConfigOption              *option;
+    const char                *key;
 
     g_return_val_if_fail(NM_IS_SUPPLICANT_CONFIG(self), NULL);
 
@@ -364,8 +364,8 @@ wifi_freqs_to_string(gboolean bg_band)
 {
     static const char *str_2ghz = NULL;
     static const char *str_5ghz = NULL;
-    const char **      f_p;
-    const char *       f;
+    const char       **f_p;
+    const char        *f;
 
     f_p = bg_band ? &str_2ghz : &str_5ghz;
 
@@ -374,7 +374,7 @@ again:
 
     if (G_UNLIKELY(!f)) {
         nm_auto_str_buf NMStrBuf strbuf = NM_STR_BUF_INIT(400, FALSE);
-        const guint *            freqs;
+        const guint             *freqs;
         int                      i;
 
         freqs = bg_band ? nm_utils_wifi_2ghz_freqs() : nm_utils_wifi_5ghz_freqs();
@@ -397,8 +397,8 @@ again:
 
 gboolean
 nm_supplicant_config_add_setting_macsec(NMSupplicantConfig *self,
-                                        NMSettingMacsec *   setting,
-                                        GError **           error)
+                                        NMSettingMacsec    *setting,
+                                        GError            **error)
 {
     const char *value;
     char        buf[32];
@@ -467,16 +467,16 @@ nm_supplicant_config_add_setting_macsec(NMSupplicantConfig *self,
 
 gboolean
 nm_supplicant_config_add_setting_wireless(NMSupplicantConfig *self,
-                                          NMSettingWireless * setting,
+                                          NMSettingWireless  *setting,
                                           guint32             fixed_freq,
-                                          GError **           error)
+                                          GError            **error)
 {
     NMSupplicantConfigPrivate *priv;
     gboolean                   is_adhoc, is_ap, is_mesh;
-    const char *               mode, *band;
+    const char                *mode, *band;
     guint32                    channel;
-    GBytes *                   ssid;
-    const char *               bssid;
+    GBytes                    *ssid;
+    const char                *bssid;
 
     g_return_val_if_fail(NM_IS_SUPPLICANT_CONFIG(self), FALSE);
     g_return_val_if_fail(setting != NULL, FALSE);
@@ -584,9 +584,9 @@ nm_supplicant_config_add_setting_wireless(NMSupplicantConfig *self,
 gboolean
 nm_supplicant_config_add_bgscan(NMSupplicantConfig *self, NMConnection *connection, GError **error)
 {
-    NMSettingWireless *        s_wifi;
+    NMSettingWireless         *s_wifi;
     NMSettingWirelessSecurity *s_wsec;
-    const char *               bgscan;
+    const char                *bgscan;
 
     s_wifi = nm_connection_get_setting_wireless(connection);
     g_assert(s_wifi);
@@ -632,11 +632,11 @@ nm_supplicant_config_add_bgscan(NMSupplicantConfig *self, NMConnection *connecti
 
 static gboolean
 add_string_val(NMSupplicantConfig *self,
-               const char *        field,
-               const char *        name,
+               const char         *field,
+               const char         *name,
                gboolean            ucase,
-               const char *        display_value,
-               GError **           error)
+               const char         *display_value,
+               GError            **error)
 {
     if (field) {
         gs_free char *value = NULL;
@@ -671,7 +671,7 @@ add_string_val(NMSupplicantConfig *self,
                                                                                           \
         if (nm_setting_##setting_name##_get_num_##field_plural(_setting)) {               \
             const char _separator = (separator);                                          \
-            GString *  _str       = g_string_new(NULL);                                   \
+            GString   *_str       = g_string_new(NULL);                                   \
             guint      _k, _n;                                                            \
                                                                                           \
             _n = nm_setting_##setting_name##_get_num_##field_plural(_setting);            \
@@ -727,10 +727,10 @@ wep128_passphrase_hash(const char *input, gsize input_len, guint8 *digest /* 13
 
 static gboolean
 add_wep_key(NMSupplicantConfig *self,
-            const char *        key,
-            const char *        name,
+            const char         *key,
+            const char         *name,
             NMWepKeyType        wep_type,
-            GError **           error)
+            GError            **error)
 {
     gsize key_len;
 
@@ -801,19 +801,19 @@ add_wep_key(NMSupplicantConfig *self,
 }
 
 gboolean
-nm_supplicant_config_add_setting_wireless_security(NMSupplicantConfig *          self,
-                                                   NMSettingWirelessSecurity *   setting,
-                                                   NMSetting8021x *              setting_8021x,
-                                                   const char *                  con_uuid,
+nm_supplicant_config_add_setting_wireless_security(NMSupplicantConfig           *self,
+                                                   NMSettingWirelessSecurity    *setting,
+                                                   NMSetting8021x               *setting_8021x,
+                                                   const char                   *con_uuid,
                                                    guint32                       mtu,
                                                    NMSettingWirelessSecurityPmf  pmf,
                                                    NMSettingWirelessSecurityFils fils,
-                                                   GError **                     error)
+                                                   GError                      **error)
 {
-    NMSupplicantConfigPrivate *priv             = NM_SUPPLICANT_CONFIG_GET_PRIVATE(self);
+    NMSupplicantConfigPrivate    *priv          = NM_SUPPLICANT_CONFIG_GET_PRIVATE(self);
     nm_auto_free_gstring GString *key_mgmt_conf = NULL;
-    const char *                  key_mgmt, *auth_alg;
-    const char *                  psk;
+    const char                   *key_mgmt, *auth_alg;
+    const char                   *psk;
     gboolean                      set_pmf, wps_disabled;
 
     g_return_val_if_fail(NM_IS_SUPPLICANT_CONFIG(self), FALSE);
@@ -1056,10 +1056,10 @@ nm_supplicant_config_add_setting_wireless_security(NMSupplicantConfig *
     /* WEP keys if required */
     if (nm_streq(key_mgmt, "none")) {
         NMWepKeyType wep_type = nm_setting_wireless_security_get_wep_key_type(setting);
-        const char * wep0     = nm_setting_wireless_security_get_wep_key(setting, 0);
-        const char * wep1     = nm_setting_wireless_security_get_wep_key(setting, 1);
-        const char * wep2     = nm_setting_wireless_security_get_wep_key(setting, 2);
-        const char * wep3     = nm_setting_wireless_security_get_wep_key(setting, 3);
+        const char  *wep0     = nm_setting_wireless_security_get_wep_key(setting, 0);
+        const char  *wep1     = nm_setting_wireless_security_get_wep_key(setting, 1);
+        const char  *wep2     = nm_setting_wireless_security_get_wep_key(setting, 2);
+        const char  *wep3     = nm_setting_wireless_security_get_wep_key(setting, 3);
 
         if (!add_wep_key(self, wep0, "wep_key0", wep_type, error))
             return FALSE;
@@ -1148,18 +1148,18 @@ nm_supplicant_config_add_setting_wireless_security(NMSupplicantConfig *
 }
 
 static gboolean
-add_pkcs11_uri_with_pin(NMSupplicantConfig *       self,
-                        const char *               name,
-                        const char *               uri,
-                        const char *               pin,
+add_pkcs11_uri_with_pin(NMSupplicantConfig        *self,
+                        const char                *name,
+                        const char                *uri,
+                        const char                *pin,
                         const NMSettingSecretFlags pin_flags,
-                        GError **                  error)
+                        GError                   **error)
 {
     gs_strfreev char **split     = NULL;
-    gs_free char *     tmp       = NULL;
-    gs_free char *     tmp_log   = NULL;
-    gs_free char *     pin_qattr = NULL;
-    char *             escaped   = NULL;
+    gs_free char      *tmp       = NULL;
+    gs_free char      *tmp_log   = NULL;
+    gs_free char      *pin_qattr = NULL;
+    char              *escaped   = NULL;
 
     if (uri == NULL)
         return TRUE;
@@ -1195,25 +1195,25 @@ add_pkcs11_uri_with_pin(NMSupplicantConfig *       self,
 
 gboolean
 nm_supplicant_config_add_setting_8021x(NMSupplicantConfig *self,
-                                       NMSetting8021x *    setting,
-                                       const char *        con_uuid,
+                                       NMSetting8021x     *setting,
+                                       const char         *con_uuid,
                                        guint32             mtu,
                                        gboolean            wired,
-                                       GError **           error)
+                                       GError            **error)
 {
-    NMSupplicantConfigPrivate *priv;
-    char *                     tmp;
-    const char *               peapver, *value, *path;
-    gboolean                   added;
-    GString *                  phase1, *phase2;
-    GBytes *                   bytes;
-    gboolean                   fast = FALSE;
-    guint32                    i, num_eap;
-    gboolean                   fast_provisoning_allowed = FALSE;
-    const char *               ca_path_override = NULL, *ca_cert_override = NULL;
-    guint32                    frag, hdrs;
-    gs_free char *             frag_str = NULL;
-    NMSetting8021xAuthFlags    phase1_auth_flags;
+    NMSupplicantConfigPrivate    *priv;
+    char                         *tmp;
+    const char                   *peapver, *value, *path;
+    gboolean                      added;
+    GString                      *phase1, *phase2;
+    GBytes                       *bytes;
+    gboolean                      fast = FALSE;
+    guint32                       i, num_eap;
+    gboolean                      fast_provisoning_allowed = FALSE;
+    const char                   *ca_path_override = NULL, *ca_cert_override = NULL;
+    guint32                       frag, hdrs;
+    gs_free char                 *frag_str = NULL;
+    NMSetting8021xAuthFlags       phase1_auth_flags;
     nm_auto_free_gstring GString *eap_str = NULL;
 
     g_return_val_if_fail(NM_IS_SUPPLICANT_CONFIG(self), FALSE);
diff --git a/src/core/supplicant/nm-supplicant-config.h b/src/core/supplicant/nm-supplicant-config.h
index b5619362..349c310f 100644
--- a/src/core/supplicant/nm-supplicant-config.h
+++ b/src/core/supplicant/nm-supplicant-config.h
@@ -40,34 +40,34 @@ GVariant *nm_supplicant_config_to_variant(NMSupplicantConfig *self);
 GHashTable *nm_supplicant_config_get_blobs(NMSupplicantConfig *self);
 
 gboolean nm_supplicant_config_add_setting_wireless(NMSupplicantConfig *self,
-                                                   NMSettingWireless * setting,
+                                                   NMSettingWireless  *setting,
                                                    guint32             fixed_freq,
-                                                   GError **           error);
+                                                   GError            **error);
 
 gboolean
 nm_supplicant_config_add_bgscan(NMSupplicantConfig *self, NMConnection *connection, GError **error);
 
-gboolean nm_supplicant_config_add_setting_wireless_security(NMSupplicantConfig *       self,
+gboolean nm_supplicant_config_add_setting_wireless_security(NMSupplicantConfig        *self,
                                                             NMSettingWirelessSecurity *setting,
                                                             NMSetting8021x *setting_8021x,
-                                                            const char *    con_uuid,
+                                                            const char     *con_uuid,
                                                             guint32         mtu,
                                                             NMSettingWirelessSecurityPmf  pmf,
                                                             NMSettingWirelessSecurityFils fils,
-                                                            GError **                     error);
+                                                            GError                      **error);
 
 gboolean nm_supplicant_config_add_no_security(NMSupplicantConfig *self, GError **error);
 
 gboolean nm_supplicant_config_add_setting_8021x(NMSupplicantConfig *self,
-                                                NMSetting8021x *    setting,
-                                                const char *        con_uuid,
+                                                NMSetting8021x     *setting,
+                                                const char         *con_uuid,
                                                 guint32             mtu,
                                                 gboolean            wired,
-                                                GError **           error);
+                                                GError            **error);
 
 gboolean nm_supplicant_config_add_setting_macsec(NMSupplicantConfig *self,
-                                                 NMSettingMacsec *   setting,
-                                                 GError **           error);
+                                                 NMSettingMacsec    *setting,
+                                                 GError            **error);
 
 gboolean nm_supplicant_config_enable_pmf_akm(NMSupplicantConfig *self, GError **error);
 
diff --git a/src/core/supplicant/nm-supplicant-interface.c b/src/core/supplicant/nm-supplicant-interface.c
index 2d56b836..d8276144 100644
--- a/src/core/supplicant/nm-supplicant-interface.c
+++ b/src/core/supplicant/nm-supplicant-interface.c
@@ -26,11 +26,11 @@
 
 typedef struct {
     NMSupplicantInterface *self;
-    char *                 type;
-    char *                 bssid;
-    char *                 pin;
+    char                  *type;
+    char                  *bssid;
+    char                  *pin;
     guint                  signal_id;
-    GCancellable *         cancellable;
+    GCancellable          *cancellable;
     bool                   needs_cancelling : 1;
     bool                   is_cancelling : 1;
 } WpsData;
@@ -38,23 +38,23 @@ typedef struct {
 struct _AddNetworkData;
 
 typedef struct {
-    NMSupplicantInterface *      self;
-    NMSupplicantConfig *         cfg;
-    GCancellable *               cancellable;
+    NMSupplicantInterface       *self;
+    NMSupplicantConfig          *cfg;
+    GCancellable                *cancellable;
     NMSupplicantInterfaceAssocCb callback;
     gpointer                     user_data;
     guint                        fail_on_idle_id;
     guint                        blobs_left;
     guint                        calls_left;
-    struct _AddNetworkData *     add_network_data;
+    struct _AddNetworkData      *add_network_data;
 } AssocData;
 
 typedef struct _AddNetworkData {
     /* the assoc_data at the time when doing the call. */
-    AssocData *  assoc_data;
+    AssocData   *assoc_data;
     NMRefString *name_owner;
     NMRefString *object_path;
-    GObject *    shutdown_wait_obj;
+    GObject     *shutdown_wait_obj;
 } AddNetworkData;
 
 enum {
@@ -86,8 +86,8 @@ typedef struct _NMSupplicantInterfacePrivate {
     NMSupplicantManager *supplicant_manager;
 
     GDBusConnection *dbus_connection;
-    NMRefString *    name_owner;
-    NMRefString *    object_path;
+    NMRefString     *name_owner;
+    NMRefString     *object_path;
 
     char *ifname;
 
@@ -173,6 +173,8 @@ G_DEFINE_TYPE(NMSupplicantInterface, nm_supplicant_interface, G_TYPE_OBJECT)
 #define NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self) \
     _NM_GET_PRIVATE_PTR(self, NMSupplicantInterface, NM_IS_SUPPLICANT_INTERFACE)
 
+static NMTernary _get_capability(NMSupplicantInterfacePrivate *priv, NMSupplCapType type);
+
 /*****************************************************************************/
 
 static const char *
@@ -197,7 +199,7 @@ _log_pretty_object_path(NMSupplicantInterfacePrivate *priv)
 #define _NMLOG(level, ...)                                                      \
     G_STMT_START                                                                \
     {                                                                           \
-        NMSupplicantInterface *       _self = (self);                           \
+        NMSupplicantInterface        *_self = (self);                           \
         NMSupplicantInterfacePrivate *_priv =                                   \
             _self ? NM_SUPPLICANT_INTERFACE_GET_PRIVATE(_self) : NULL;          \
         char        _sbuf[255];                                                 \
@@ -268,10 +270,10 @@ static NM80211ApSecurityFlags
 security_from_vardict(GVariant *security)
 {
     NM80211ApSecurityFlags flags = NM_802_11_AP_SEC_NONE;
-    const char **          array;
-    const char *           tmp;
+    const char           **array;
+    const char            *tmp;
     gsize                  i;
-    const char *           v;
+    const char            *v;
 
     nm_assert(g_variant_is_of_type(security, G_VARIANT_TYPE_VARDICT));
 
@@ -339,13 +341,13 @@ security_from_vardict(GVariant *security)
 
 static void
 _dbus_connection_call(NMSupplicantInterface *self,
-                      const char *           interface_name,
-                      const char *           method_name,
-                      GVariant *             parameters,
-                      const GVariantType *   reply_type,
+                      const char            *interface_name,
+                      const char            *method_name,
+                      GVariant              *parameters,
+                      const GVariantType    *reply_type,
                       GDBusCallFlags         flags,
                       int                    timeout_msec,
-                      GCancellable *         cancellable,
+                      GCancellable          *cancellable,
                       GAsyncReadyCallback    callback,
                       gpointer               user_data)
 {
@@ -368,13 +370,13 @@ _dbus_connection_call(NMSupplicantInterface *self,
 static void
 _dbus_connection_call_simple_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
-    NMSupplicantInterface *self;
-    gs_unref_variant GVariant *res = NULL;
-    gs_free_error GError *error    = NULL;
-    const char *          log_reason;
-    gs_free char *        remote_error = NULL;
-    gpointer              p_suppress_warning;
-    gboolean              suppress_warning;
+    NMSupplicantInterface     *self;
+    gs_unref_variant GVariant *res   = NULL;
+    gs_free_error GError      *error = NULL;
+    const char                *log_reason;
+    gs_free char              *remote_error = NULL;
+    gpointer                   p_suppress_warning;
+    gboolean                   suppress_warning;
 
     nm_utils_user_data_unpack(user_data, &self, &log_reason, &p_suppress_warning);
 
@@ -403,11 +405,11 @@ _dbus_connection_call_simple_cb(GObject *source, GAsyncResult *result, gpointer
 
 static void
 _dbus_connection_call_simple_full_impl(NMSupplicantInterface *self,
-                                       const char *           interface_name,
-                                       const char *           method_name,
-                                       GVariant *             parameters,
-                                       const GVariantType *   reply_type,
-                                       const char *           log_reason,
+                                       const char            *interface_name,
+                                       const char            *method_name,
+                                       GVariant              *parameters,
+                                       const GVariantType    *reply_type,
+                                       const char            *log_reason,
                                        gboolean               suppress_warning)
 {
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
@@ -457,7 +459,7 @@ _dbus_connection_call_simple_full_impl(NMSupplicantInterface *self,
 /*****************************************************************************/
 
 static void
-_emit_signal_state(NMSupplicantInterface *    self,
+_emit_signal_state(NMSupplicantInterface     *self,
                    NMSupplicantInterfaceState new_state,
                    NMSupplicantInterfaceState old_state,
                    gint32                     disconnect_reason)
@@ -476,7 +478,7 @@ static void
 _remove_network(NMSupplicantInterface *self)
 {
     NMSupplicantInterfacePrivate *priv     = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    gs_free char *                net_path = NULL;
+    gs_free char                 *net_path = NULL;
 
     if (!priv->net_path)
         return;
@@ -588,7 +590,7 @@ _bss_info_destroy(NMSupplicantBssInfo *bss_info)
 
 static void
 _bss_info_changed_emit(NMSupplicantInterface *self,
-                       NMSupplicantBssInfo *  bss_info,
+                       NMSupplicantBssInfo   *bss_info,
                        gboolean               is_present)
 {
     _LOGT("BSS %s %s", bss_info->bss_path->str, is_present ? "updated" : "deleted");
@@ -597,20 +599,20 @@ _bss_info_changed_emit(NMSupplicantInterface *self,
 
 static void
 _bss_info_properties_changed(NMSupplicantInterface *self,
-                             NMSupplicantBssInfo *  bss_info,
-                             GVariant *             properties,
+                             NMSupplicantBssInfo   *bss_info,
+                             GVariant              *properties,
                              gboolean               initial)
 {
     gboolean       v_b;
-    GVariant *     v_v;
-    const char *   v_s;
+    GVariant      *v_v;
+    const char    *v_s;
     gint16         v_i16;
     guint16        v_u16;
     guint32        v_u32;
     NM80211ApFlags p_ap_flags;
     _NM80211Mode   p_mode;
     guint8         p_signal_percent;
-    const guint8 * arr_data;
+    const guint8  *arr_data;
     gsize          arr_len;
     guint32        p_max_rate;
     gboolean       p_max_rate_has;
@@ -786,10 +788,10 @@ _bss_info_properties_changed(NMSupplicantInterface *self,
 static void
 _bss_info_get_all_cb(GVariant *result, GError *error, gpointer user_data)
 {
-    NMSupplicantBssInfo *         bss_info;
-    NMSupplicantInterface *       self;
+    NMSupplicantBssInfo          *bss_info;
+    NMSupplicantInterface        *self;
     NMSupplicantInterfacePrivate *priv;
-    gs_unref_variant GVariant *properties = NULL;
+    gs_unref_variant GVariant    *properties = NULL;
 
     if (nm_utils_error_is_cancelled(error))
         return;
@@ -814,9 +816,9 @@ _bss_info_get_all_cb(GVariant *result, GError *error, gpointer user_data)
 static void
 _bss_info_add(NMSupplicantInterface *self, const char *object_path)
 {
-    NMSupplicantInterfacePrivate *priv       = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
+    NMSupplicantInterfacePrivate   *priv     = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
     nm_auto_ref_string NMRefString *bss_path = NULL;
-    NMSupplicantBssInfo *           bss_info;
+    NMSupplicantBssInfo            *bss_info;
 
     bss_path = nm_ref_string_new(nm_dbus_path_not_empty(object_path));
     if (!bss_path)
@@ -851,7 +853,7 @@ static gboolean
 _bss_info_remove(NMSupplicantInterface *self, NMRefString **p_bss_path)
 {
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    NMSupplicantBssInfo *         bss_info;
+    NMSupplicantBssInfo          *bss_info;
     gpointer                      unused_but_required;
 
     if (!g_hash_table_steal_extended(priv->bss_idx,
@@ -893,7 +895,7 @@ _peer_info_destroy(NMSupplicantPeerInfo *peer_info)
 
 static void
 _peer_info_changed_emit(NMSupplicantInterface *self,
-                        NMSupplicantPeerInfo * peer_info,
+                        NMSupplicantPeerInfo  *peer_info,
                         gboolean               is_present)
 {
     g_signal_emit(self, signals[PEER_CHANGED], 0, peer_info, is_present);
@@ -901,13 +903,13 @@ _peer_info_changed_emit(NMSupplicantInterface *self,
 
 static void
 _peer_info_properties_changed(NMSupplicantInterface *self,
-                              NMSupplicantPeerInfo * peer_info,
-                              GVariant *             properties,
+                              NMSupplicantPeerInfo  *peer_info,
+                              GVariant              *properties,
                               gboolean               initial)
 {
-    GVariant *    v_v;
-    const char *  v_s;
-    const char ** v_strv;
+    GVariant     *v_v;
+    const char   *v_s;
+    const char  **v_strv;
     gint32        v_i32;
     const guint8 *arr_data;
     gsize         arr_len;
@@ -985,10 +987,10 @@ _peer_info_properties_changed(NMSupplicantInterface *self,
 static void
 _peer_info_get_all_cb(GVariant *result, GError *error, gpointer user_data)
 {
-    NMSupplicantPeerInfo *        peer_info;
-    NMSupplicantInterface *       self;
+    NMSupplicantPeerInfo         *peer_info;
+    NMSupplicantInterface        *self;
     NMSupplicantInterfacePrivate *priv;
-    gs_unref_variant GVariant *properties = NULL;
+    gs_unref_variant GVariant    *properties = NULL;
 
     if (nm_utils_error_is_cancelled(error))
         return;
@@ -1011,9 +1013,9 @@ _peer_info_get_all_cb(GVariant *result, GError *error, gpointer user_data)
 static void
 _peer_info_add(NMSupplicantInterface *self, const char *object_path)
 {
-    NMSupplicantInterfacePrivate *priv        = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
+    NMSupplicantInterfacePrivate   *priv      = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
     nm_auto_ref_string NMRefString *peer_path = NULL;
-    NMSupplicantPeerInfo *          peer_info;
+    NMSupplicantPeerInfo           *peer_info;
 
     peer_path = nm_ref_string_new(nm_dbus_path_not_empty(object_path));
     if (!peer_path)
@@ -1049,7 +1051,7 @@ static gboolean
 _peer_info_remove(NMSupplicantInterface *self, NMRefString **p_peer_path)
 {
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    NMSupplicantPeerInfo *        peer_info;
+    NMSupplicantPeerInfo         *peer_info;
     gpointer                      unused_but_required;
 
     if (!g_hash_table_steal_extended(priv->peer_idx,
@@ -1073,12 +1075,12 @@ _peer_info_remove(NMSupplicantInterface *self, NMRefString **p_peer_path)
 static void
 set_state_down(NMSupplicantInterface *self,
                gboolean               force_remove_from_supplicant,
-               const char *           reason)
+               const char            *reason)
 {
     _nm_unused gs_unref_object NMSupplicantInterface *self_keep_alive = g_object_ref(self);
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    NMSupplicantBssInfo *         bss_info;
-    NMSupplicantPeerInfo *        peer_info;
+    NMSupplicantBssInfo          *bss_info;
+    NMSupplicantPeerInfo         *peer_info;
     NMSupplicantInterfaceState    old_state;
 
     nm_assert(priv->state != NM_SUPPLICANT_INTERFACE_STATE_DOWN);
@@ -1224,7 +1226,7 @@ parse_capabilities(NMSupplicantInterface *self, GVariant *capabilities)
     gboolean                      have_ft              = FALSE;
     gboolean                      have_sae             = FALSE;
     gint32                        max_scan_ssids;
-    const char **                 array;
+    const char                  **array;
 
     nm_assert(capabilities && g_variant_is_of_type(capabilities, G_VARIANT_TYPE_VARDICT));
 
@@ -1320,6 +1322,22 @@ _starting_check_ready(NMSupplicantInterface *self)
           NM_SUPPL_CAP_TO_CHAR(priv->iface_capabilities, NM_SUPPL_CAP_TYPE_FT),
           NM_SUPPL_CAP_TO_CHAR(priv->iface_capabilities, NM_SUPPL_CAP_TYPE_SAE));
 
+    /* Other global properties are set in constructed() because they don't
+     * depend on interface capabilities. */
+    if (_get_capability(priv, NM_SUPPL_CAP_TYPE_SAE) == NM_TERNARY_TRUE) {
+        _LOGD("enabling SAE-H2E (SaePwe=2)");
+        nm_dbus_connection_call_set(priv->dbus_connection,
+                                    priv->name_owner->str,
+                                    priv->object_path->str,
+                                    NM_WPAS_DBUS_IFACE_INTERFACE,
+                                    "SaePwe",
+                                    g_variant_new_string("2"),
+                                    DBUS_TIMEOUT_MSEC,
+                                    NULL,
+                                    NULL,
+                                    NULL);
+    }
+
     set_state(self, priv->supp_state);
 }
 
@@ -1399,7 +1417,7 @@ set_bridge_cb(GVariant *ret, GError *error, gpointer user_data)
 {
     NMSupplicantInterface *self;
     NMLogLevel             level;
-    gs_free const char *   bridge = NULL;
+    gs_free const char    *bridge = NULL;
 
     nm_utils_user_data_unpack(user_data, &self, &bridge);
 
@@ -1462,7 +1480,7 @@ static void
 _p2p_group_properties_changed(NMSupplicantInterface *self, GVariant *properties)
 {
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    const char *                  s;
+    const char                   *s;
 
     if (!properties)
         priv->p2p_group_owner_property = FALSE;
@@ -1474,16 +1492,16 @@ _p2p_group_properties_changed(NMSupplicantInterface *self, GVariant *properties)
 
 static void
 _p2p_group_properties_changed_cb(GDBusConnection *connection,
-                                 const char *     sender_name,
-                                 const char *     object_path,
-                                 const char *     signal_interface_name,
-                                 const char *     signal_name,
-                                 GVariant *       parameters,
+                                 const char      *sender_name,
+                                 const char      *object_path,
+                                 const char      *signal_interface_name,
+                                 const char      *signal_name,
+                                 GVariant        *parameters,
                                  gpointer         user_data)
 {
-    NMSupplicantInterface *       self            = NM_SUPPLICANT_INTERFACE(user_data);
-    NMSupplicantInterfacePrivate *priv            = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    gs_unref_variant GVariant *changed_properties = NULL;
+    NMSupplicantInterface        *self               = NM_SUPPLICANT_INTERFACE(user_data);
+    NMSupplicantInterfacePrivate *priv               = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
+    gs_unref_variant GVariant    *changed_properties = NULL;
 
     if (priv->p2p_group_properties_cancellable)
         return;
@@ -1498,9 +1516,9 @@ _p2p_group_properties_changed_cb(GDBusConnection *connection,
 static void
 _p2p_group_properties_get_all_cb(GVariant *result, GError *error, gpointer user_data)
 {
-    NMSupplicantInterface *       self;
+    NMSupplicantInterface        *self;
     NMSupplicantInterfacePrivate *priv;
-    gs_unref_variant GVariant *properties = NULL;
+    gs_unref_variant GVariant    *properties = NULL;
 
     if (nm_utils_error_is_cancelled(error))
         return;
@@ -1527,7 +1545,7 @@ _p2p_group_properties_get_all_cb(GVariant *result, GError *error, gpointer user_
 static void
 _p2p_group_set_path(NMSupplicantInterface *self, const char *path)
 {
-    NMSupplicantInterfacePrivate *priv         = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
+    NMSupplicantInterfacePrivate   *priv       = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
     nm_auto_ref_string NMRefString *group_path = NULL;
 
     group_path = nm_ref_string_new(nm_dbus_path_not_empty(path));
@@ -1583,14 +1601,14 @@ _wps_data_free(WpsData *wps_data, GDBusConnection *dbus_connection)
 
 static void
 _wps_credentials_changed_cb(GDBusConnection *connection,
-                            const char *     sender_name,
-                            const char *     object_path,
-                            const char *     signal_interface_name,
-                            const char *     signal_name,
-                            GVariant *       parameters,
+                            const char      *sender_name,
+                            const char      *object_path,
+                            const char      *signal_interface_name,
+                            const char      *signal_name,
+                            GVariant        *parameters,
                             gpointer         user_data)
 {
-    NMSupplicantInterface *self      = user_data;
+    NMSupplicantInterface     *self  = user_data;
     gs_unref_variant GVariant *props = NULL;
 
     if (!g_variant_is_of_type(parameters, G_VARIANT_TYPE("(a{sv})")))
@@ -1605,10 +1623,10 @@ _wps_credentials_changed_cb(GDBusConnection *connection,
 static void
 _wps_handle_start_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
-    NMSupplicantInterface *self;
-    WpsData *              wps_data;
-    gs_unref_variant GVariant *res = NULL;
-    gs_free_error GError *error    = NULL;
+    NMSupplicantInterface     *self;
+    WpsData                   *wps_data;
+    gs_unref_variant GVariant *res   = NULL;
+    gs_free_error GError      *error = NULL;
 
     res = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), result, &error);
     if (nm_utils_error_is_cancelled(error))
@@ -1631,9 +1649,9 @@ _wps_handle_start_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 static void
 _wps_handle_set_pc_cb(GVariant *res, GError *error, gpointer user_data)
 {
-    NMSupplicantInterface *       self;
+    NMSupplicantInterface        *self;
     NMSupplicantInterfacePrivate *priv;
-    WpsData *                     wps_data;
+    WpsData                      *wps_data;
     GVariantBuilder               start_args;
     guint8                        bssid_buf[ETH_ALEN];
 
@@ -1715,12 +1733,12 @@ _wps_call_set_pc(NMSupplicantInterface *self, WpsData *wps_data)
 static void
 _wps_handle_cancel_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
-    GDBusConnection *             dbus_connection = G_DBUS_CONNECTION(source);
-    NMSupplicantInterface *       self;
+    GDBusConnection              *dbus_connection = G_DBUS_CONNECTION(source);
+    NMSupplicantInterface        *self;
     NMSupplicantInterfacePrivate *priv;
-    WpsData *                     wps_data;
-    gs_unref_variant GVariant *res = NULL;
-    gs_free_error GError *error    = NULL;
+    WpsData                      *wps_data;
+    gs_unref_variant GVariant    *res   = NULL;
+    gs_free_error GError         *error = NULL;
 
     res = g_dbus_connection_call_finish(dbus_connection, result, &error);
     nm_assert(!nm_utils_error_is_cancelled(error));
@@ -1763,7 +1781,7 @@ static void
 _wps_start(NMSupplicantInterface *self, const char *type, const char *bssid, const char *pin)
 {
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    WpsData *                     wps_data;
+    WpsData                      *wps_data;
 
     if (type)
         _LOGI("wps: type %s start...", type);
@@ -1828,9 +1846,9 @@ _wps_start(NMSupplicantInterface *self, const char *type, const char *bssid, con
 
 void
 nm_supplicant_interface_enroll_wps(NMSupplicantInterface *self,
-                                   const char *           type,
-                                   const char *           bssid,
-                                   const char *           pin)
+                                   const char            *type,
+                                   const char            *bssid,
+                                   const char            *pin)
 {
     _wps_start(self, type, bssid, pin);
 }
@@ -1846,12 +1864,12 @@ nm_supplicant_interface_cancel_wps(NMSupplicantInterface *self)
 static void
 iface_introspect_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
-    NMSupplicantInterface *       self;
+    NMSupplicantInterface        *self;
     NMSupplicantInterfacePrivate *priv;
-    gs_unref_variant GVariant *res = NULL;
-    gs_free_error GError *error    = NULL;
-    const char *          data;
-    NMTernary             value;
+    gs_unref_variant GVariant    *res   = NULL;
+    gs_free_error GError         *error = NULL;
+    const char                   *data;
+    NMTernary                     value;
 
     res = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), result, &error);
     if (nm_utils_error_is_cancelled(error))
@@ -1882,11 +1900,11 @@ static void
 _properties_changed_main(NMSupplicantInterface *self, GVariant *properties)
 {
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    const char **                 v_strv;
-    const char *                  v_s;
+    const char                  **v_strv;
+    const char                   *v_s;
     gboolean                      v_b;
     gint32                        v_i32;
-    GVariant *                    v_v;
+    GVariant                     *v_v;
     gboolean                      do_log_driver_info    = FALSE;
     gboolean                      do_set_state          = FALSE;
     gboolean                      do_notify_current_bss = FALSE;
@@ -1951,11 +1969,8 @@ _properties_changed_main(NMSupplicantInterface *self, GVariant *properties)
 
     if (nm_g_variant_lookup(properties, "CurrentBSS", "&o", &v_s)) {
         v_s = nm_dbus_path_not_empty(v_s);
-        if (!nm_ref_string_equal_str(priv->current_bss, v_s)) {
-            nm_ref_string_unref(priv->current_bss);
-            priv->current_bss     = nm_ref_string_new(v_s);
+        if (nm_ref_string_reset_str(&priv->current_bss, v_s))
             do_notify_current_bss = TRUE;
-        }
     }
 
     if (nm_g_variant_lookup(properties, "ApIsolate", "&s", &v_s))
@@ -1972,7 +1987,7 @@ _properties_changed_main(NMSupplicantInterface *self, GVariant *properties)
     if (nm_g_variant_lookup(properties, "BSSs", "^a&o", &v_strv)) {
         NMSupplicantBssInfo *bss_info;
         NMSupplicantBssInfo *bss_info_safe;
-        const char **        iter;
+        const char         **iter;
 
         c_list_for_each_entry (bss_info, &priv->bss_lst_head, _bss_lst)
             bss_info->_bss_dirty = TRUE;
@@ -2010,15 +2025,15 @@ static void
 _properties_changed_p2p_device(NMSupplicantInterface *self, GVariant *properties)
 {
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    const char **                 v_strv;
-    const char *                  v_s;
+    const char                  **v_strv;
+    const char                   *v_s;
 
     nm_assert(!properties || g_variant_is_of_type(properties, G_VARIANT_TYPE("a{sv}")));
 
     if (nm_g_variant_lookup(properties, "Peers", "^a&o", &v_strv)) {
         NMSupplicantPeerInfo *peer_info;
         NMSupplicantPeerInfo *peer_info_safe;
-        const char *const *   iter;
+        const char *const    *iter;
 
         c_list_for_each_entry (peer_info, &priv->peer_lst_head, _peer_lst)
             peer_info->_peer_dirty = TRUE;
@@ -2053,7 +2068,7 @@ static void
 assoc_return(NMSupplicantInterface *self, GError *error, const char *message)
 {
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    AssocData *                   assoc_data;
+    AssocData                    *assoc_data;
 
     assoc_data = g_steal_pointer(&priv->assoc_data);
     if (!assoc_data)
@@ -2122,11 +2137,11 @@ nm_supplicant_interface_disconnect(NMSupplicantInterface *self)
 static void
 disconnect_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
-    gs_unref_object NMSupplicantInterface *self = NULL;
-    gs_unref_variant GVariant *res              = NULL;
-    gs_free_error GError *            error     = NULL;
-    NMSupplicantInterfaceDisconnectCb callback;
-    gpointer                          callback_user_data;
+    gs_unref_object NMSupplicantInterface *self  = NULL;
+    gs_unref_variant GVariant             *res   = NULL;
+    gs_free_error GError                  *error = NULL;
+    NMSupplicantInterfaceDisconnectCb      callback;
+    gpointer                               callback_user_data;
 
     nm_utils_user_data_unpack(user_data, &self, &callback, &callback_user_data);
 
@@ -2141,8 +2156,8 @@ disconnect_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 }
 
 void
-nm_supplicant_interface_disconnect_async(NMSupplicantInterface *           self,
-                                         GCancellable *                    cancellable,
+nm_supplicant_interface_disconnect_async(NMSupplicantInterface            *self,
+                                         GCancellable                     *cancellable,
                                          NMSupplicantInterfaceDisconnectCb callback,
                                          gpointer                          user_data)
 {
@@ -2164,9 +2179,9 @@ nm_supplicant_interface_disconnect_async(NMSupplicantInterface *           self,
 static void
 assoc_select_network_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
-    NMSupplicantInterface *self;
-    gs_unref_variant GVariant *res = NULL;
-    gs_free_error GError *error    = NULL;
+    NMSupplicantInterface     *self;
+    gs_unref_variant GVariant *res   = NULL;
+    gs_free_error GError      *error = NULL;
 
     res = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), result, &error);
     if (nm_utils_error_is_cancelled(error))
@@ -2199,10 +2214,10 @@ assoc_call_select_network(NMSupplicantInterface *self)
 static void
 assoc_add_blob_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
-    NMSupplicantInterface *       self;
+    NMSupplicantInterface        *self;
     NMSupplicantInterfacePrivate *priv;
-    gs_unref_variant GVariant *res = NULL;
-    gs_free_error GError *error    = NULL;
+    gs_unref_variant GVariant    *res   = NULL;
+    gs_free_error GError         *error = NULL;
 
     res = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), result, &error);
     if (nm_utils_error_is_cancelled(error))
@@ -2227,16 +2242,16 @@ assoc_add_blob_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 static void
 assoc_add_network_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
-    AddNetworkData *              add_network_data = user_data;
-    AssocData *                   assoc_data;
-    NMSupplicantInterface *       self;
-    NMSupplicantInterfacePrivate *priv;
-    gs_unref_variant GVariant *res = NULL;
-    gs_free_error GError *error    = NULL;
-    GHashTable *          blobs;
-    GHashTableIter        iter;
-    const char *          blob_name;
-    GBytes *              blob_data;
+    AddNetworkData                 *add_network_data = user_data;
+    AssocData                      *assoc_data;
+    NMSupplicantInterface          *self;
+    NMSupplicantInterfacePrivate   *priv;
+    gs_unref_variant GVariant      *res   = NULL;
+    gs_free_error GError           *error = NULL;
+    GHashTable                     *blobs;
+    GHashTableIter                  iter;
+    const char                     *blob_name;
+    GBytes                         *blob_data;
     nm_auto_ref_string NMRefString *name_owner  = NULL;
     nm_auto_ref_string NMRefString *object_path = NULL;
 
@@ -2322,7 +2337,7 @@ static void
 add_network(NMSupplicantInterface *self)
 {
     NMSupplicantInterfacePrivate *priv;
-    AddNetworkData *              add_network_data;
+    AddNetworkData               *add_network_data;
 
     priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
 
@@ -2359,7 +2374,7 @@ add_network(NMSupplicantInterface *self)
 static void
 assoc_set_ap_isolation(GVariant *ret, GError *error, gpointer user_data)
 {
-    NMSupplicantInterface *       self;
+    NMSupplicantInterface        *self;
     NMSupplicantInterfacePrivate *priv;
     gboolean                      value;
 
@@ -2389,7 +2404,7 @@ assoc_set_ap_isolation(GVariant *ret, GError *error, gpointer user_data)
 static void
 assoc_set_ap_scan_cb(GVariant *ret, GError *error, gpointer user_data)
 {
-    NMSupplicantInterface *       self;
+    NMSupplicantInterface        *self;
     NMSupplicantInterfacePrivate *priv;
 
     if (nm_utils_error_is_cancelled(error))
@@ -2415,9 +2430,9 @@ assoc_set_ap_scan_cb(GVariant *ret, GError *error, gpointer user_data)
 static gboolean
 assoc_fail_on_idle_cb(gpointer user_data)
 {
-    NMSupplicantInterface *       self = user_data;
-    NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    gs_free_error GError *error        = NULL;
+    NMSupplicantInterface        *self  = user_data;
+    NMSupplicantInterfacePrivate *priv  = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
+    gs_free_error GError         *error = NULL;
 
     priv->assoc_data->fail_on_idle_id = 0;
     g_set_error(&error,
@@ -2443,13 +2458,13 @@ assoc_fail_on_idle_cb(gpointer user_data)
  * an error reason indicating cancellation/disposing (see nm_utils_error_is_cancelled()).
  */
 void
-nm_supplicant_interface_assoc(NMSupplicantInterface *      self,
-                              NMSupplicantConfig *         cfg,
+nm_supplicant_interface_assoc(NMSupplicantInterface       *self,
+                              NMSupplicantConfig          *cfg,
                               NMSupplicantInterfaceAssocCb callback,
                               gpointer                     user_data)
 {
     NMSupplicantInterfacePrivate *priv;
-    AssocData *                   assoc_data;
+    AssocData                    *assoc_data;
     gboolean                      ap_isolation;
 
     g_return_if_fail(NM_IS_SUPPLICANT_INTERFACE(self));
@@ -2525,8 +2540,8 @@ nm_supplicant_interface_assoc(NMSupplicantInterface *      self,
 /*****************************************************************************/
 
 typedef struct {
-    NMSupplicantInterface *                  self;
-    GCancellable *                           cancellable;
+    NMSupplicantInterface                   *self;
+    GCancellable                            *cancellable;
     NMSupplicantInterfaceRequestScanCallback callback;
     gpointer                                 user_data;
 } ScanRequestData;
@@ -2535,11 +2550,11 @@ static void
 scan_request_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
     gs_unref_object NMSupplicantInterface *self_keep_alive = NULL;
-    NMSupplicantInterface *                self;
-    gs_unref_variant GVariant *res  = NULL;
-    gs_free_error GError *error     = NULL;
-    ScanRequestData *     data      = user_data;
-    gboolean              cancelled = FALSE;
+    NMSupplicantInterface                 *self;
+    gs_unref_variant GVariant             *res       = NULL;
+    gs_free_error GError                  *error     = NULL;
+    ScanRequestData                       *data      = user_data;
+    gboolean                               cancelled = FALSE;
 
     res = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), result, &error);
     if (nm_utils_error_is_cancelled(error)) {
@@ -2583,16 +2598,16 @@ scan_request_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 }
 
 void
-nm_supplicant_interface_request_scan(NMSupplicantInterface *                  self,
-                                     GBytes *const *                          ssids,
+nm_supplicant_interface_request_scan(NMSupplicantInterface                   *self,
+                                     GBytes *const                           *ssids,
                                      guint                                    ssids_len,
-                                     GCancellable *                           cancellable,
+                                     GCancellable                            *cancellable,
                                      NMSupplicantInterfaceRequestScanCallback callback,
                                      gpointer                                 user_data)
 {
     NMSupplicantInterfacePrivate *priv;
     GVariantBuilder               builder;
-    ScanRequestData *             data;
+    ScanRequestData              *data;
     guint                         i;
 
     g_return_if_fail(NM_IS_SUPPLICANT_INTERFACE(self));
@@ -2662,7 +2677,7 @@ nm_supplicant_interface_get_state(NMSupplicantInterface *self)
 void
 _nm_supplicant_interface_set_state_down(NMSupplicantInterface *self,
                                         gboolean               force_remove_from_supplicant,
-                                        const char *           reason)
+                                        const char            *reason)
 {
     set_state_down(self, force_remove_from_supplicant, reason);
 }
@@ -2740,9 +2755,9 @@ nm_supplicant_interface_p2p_stop_find(NMSupplicantInterface *self)
 
 void
 nm_supplicant_interface_p2p_connect(NMSupplicantInterface *self,
-                                    const char *           peer,
-                                    const char *           wps_method,
-                                    const char *           wps_pin)
+                                    const char            *peer,
+                                    const char            *wps_method,
+                                    const char            *wps_pin)
 {
     GVariantBuilder builder;
 
@@ -2797,8 +2812,8 @@ nm_supplicant_interface_p2p_disconnect(NMSupplicantInterface *self)
 
 static void
 _properties_changed(NMSupplicantInterface *self,
-                    const char *           interface_name,
-                    GVariant *             properties,
+                    const char            *interface_name,
+                    GVariant              *properties,
                     gboolean               initial)
 {
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
@@ -2841,15 +2856,15 @@ _properties_changed(NMSupplicantInterface *self,
 
 static void
 _properties_changed_cb(GDBusConnection *connection,
-                       const char *     sender_name,
-                       const char *     object_path,
-                       const char *     signal_interface_name,
-                       const char *     signal_name,
-                       GVariant *       parameters,
+                       const char      *sender_name,
+                       const char      *object_path,
+                       const char      *signal_interface_name,
+                       const char      *signal_name,
+                       GVariant        *parameters,
                        gpointer         user_data)
 {
-    NMSupplicantInterface *self = NM_SUPPLICANT_INTERFACE(user_data);
-    const char *           interface_name;
+    NMSupplicantInterface     *self = NM_SUPPLICANT_INTERFACE(user_data);
+    const char                *interface_name;
     gs_unref_variant GVariant *changed_properties = NULL;
 
     if (!g_variant_is_of_type(parameters, G_VARIANT_TYPE("(sa{sv}as)")))
@@ -2861,18 +2876,18 @@ _properties_changed_cb(GDBusConnection *connection,
 
 static void
 _bss_properties_changed_cb(GDBusConnection *connection,
-                           const char *     sender_name,
-                           const char *     object_path,
-                           const char *     signal_interface_name,
-                           const char *     signal_name,
-                           GVariant *       parameters,
+                           const char      *sender_name,
+                           const char      *object_path,
+                           const char      *signal_interface_name,
+                           const char      *signal_name,
+                           GVariant        *parameters,
                            gpointer         user_data)
 {
-    NMSupplicantInterface *       self            = NM_SUPPLICANT_INTERFACE(user_data);
-    NMSupplicantInterfacePrivate *priv            = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    nm_auto_ref_string NMRefString *bss_path      = NULL;
-    gs_unref_variant GVariant *changed_properties = NULL;
-    NMSupplicantBssInfo *      bss_info;
+    NMSupplicantInterface          *self               = NM_SUPPLICANT_INTERFACE(user_data);
+    NMSupplicantInterfacePrivate   *priv               = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
+    nm_auto_ref_string NMRefString *bss_path           = NULL;
+    gs_unref_variant GVariant      *changed_properties = NULL;
+    NMSupplicantBssInfo            *bss_info;
 
     if (!g_variant_is_of_type(parameters, G_VARIANT_TYPE("(sa{sv}as)")))
         return;
@@ -2891,18 +2906,18 @@ _bss_properties_changed_cb(GDBusConnection *connection,
 
 static void
 _peer_properties_changed_cb(GDBusConnection *connection,
-                            const char *     sender_name,
-                            const char *     object_path,
-                            const char *     signal_interface_name,
-                            const char *     signal_name,
-                            GVariant *       parameters,
+                            const char      *sender_name,
+                            const char      *object_path,
+                            const char      *signal_interface_name,
+                            const char      *signal_name,
+                            GVariant        *parameters,
                             gpointer         user_data)
 {
-    NMSupplicantInterface *       self            = NM_SUPPLICANT_INTERFACE(user_data);
-    NMSupplicantInterfacePrivate *priv            = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    nm_auto_ref_string NMRefString *peer_path     = NULL;
-    gs_unref_variant GVariant *changed_properties = NULL;
-    NMSupplicantPeerInfo *     peer_info;
+    NMSupplicantInterface          *self               = NM_SUPPLICANT_INTERFACE(user_data);
+    NMSupplicantInterfacePrivate   *priv               = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
+    nm_auto_ref_string NMRefString *peer_path          = NULL;
+    gs_unref_variant GVariant      *changed_properties = NULL;
+    NMSupplicantPeerInfo           *peer_info;
 
     if (!g_variant_is_of_type(parameters, G_VARIANT_TYPE("(sa{sv}as)")))
         return;
@@ -2956,12 +2971,12 @@ _set_p2p_assigned_addr(NMSupplicantInterface *self, gconstpointer addr, guint8 p
 
 static void
 _signal_handle(NMSupplicantInterface *self,
-               const char *           signal_interface_name,
-               const char *           signal_name,
-               GVariant *             parameters)
+               const char            *signal_interface_name,
+               const char            *signal_name,
+               GVariant              *parameters)
 {
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
-    const char *                  path;
+    const char                   *path;
 
     if (nm_streq(signal_interface_name, NM_WPAS_DBUS_IFACE_INTERFACE)) {
         if (!priv->is_ready_main)
@@ -2990,8 +3005,8 @@ _signal_handle(NMSupplicantInterface *self,
 
         if (nm_streq(signal_name, "EAP")) {
             NMSupplicantAuthState auth_state = NM_SUPPLICANT_AUTH_STATE_UNKNOWN;
-            const char *          status;
-            const char *          parameter;
+            const char           *status;
+            const char           *parameter;
 
             if (g_variant_is_of_type(parameters, G_VARIANT_TYPE("(ss)")))
                 return;
@@ -3044,11 +3059,11 @@ _signal_handle(NMSupplicantInterface *self,
 
         if (nm_streq(signal_name, "GroupStarted")) {
             if (g_variant_is_of_type(parameters, G_VARIANT_TYPE("(a{sv})"))) {
-                gs_unref_variant GVariant *args              = NULL;
+                gs_unref_variant GVariant             *args  = NULL;
                 gs_unref_object NMSupplicantInterface *iface = NULL;
-                const char *                           group_path;
-                const char *                           iface_path;
-                GVariant *                             v_v = NULL;
+                const char                            *group_path;
+                const char                            *iface_path;
+                GVariant                              *v_v = NULL;
 
                 g_variant_get(parameters, "(@a{sv})", &args);
                 if (!g_variant_lookup(args, "group_object", "&o", &group_path))
@@ -3107,7 +3122,7 @@ _signal_handle(NMSupplicantInterface *self,
         if (nm_streq(signal_name, "GroupFinished")) {
             if (g_variant_is_of_type(parameters, G_VARIANT_TYPE("(a{sv})"))) {
                 gs_unref_variant GVariant *args = NULL;
-                const char *               iface_path;
+                const char                *iface_path;
 
                 g_variant_get(parameters, "(@a{sv})", &args);
 
@@ -3134,14 +3149,14 @@ _signal_handle(NMSupplicantInterface *self,
 
 static void
 _signal_cb(GDBusConnection *connection,
-           const char *     sender_name,
-           const char *     object_path,
-           const char *     signal_interface_name,
-           const char *     signal_name,
-           GVariant *       parameters,
+           const char      *sender_name,
+           const char      *object_path,
+           const char      *signal_interface_name,
+           const char      *signal_name,
+           GVariant        *parameters,
            gpointer         user_data)
 {
-    NMSupplicantInterface *       self = user_data;
+    NMSupplicantInterface        *self = user_data;
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
 
     priv->starting_pending_count++;
@@ -3180,8 +3195,8 @@ nm_supplicant_interface_get_p2p_group_owner(NMSupplicantInterface *self)
 
 gboolean
 nm_supplicant_interface_get_p2p_assigned_addr(NMSupplicantInterface *self,
-                                              in_addr_t *            addr,
-                                              guint8 *               plen)
+                                              in_addr_t             *addr,
+                                              guint8                *plen)
 {
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
 
@@ -3201,7 +3216,7 @@ nm_supplicant_interface_get_p2p_assigned_addr(NMSupplicantInterface *self,
 static void
 get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-    NMSupplicantInterface *       self = NM_SUPPLICANT_INTERFACE(object);
+    NMSupplicantInterface        *self = NM_SUPPLICANT_INTERFACE(object);
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
 
     switch (prop_id) {
@@ -3314,7 +3329,7 @@ nm_supplicant_interface_init(NMSupplicantInterface *self)
 static void
 constructed(GObject *object)
 {
-    NMSupplicantInterface *       self = NM_SUPPLICANT_INTERFACE(object);
+    NMSupplicantInterface        *self = NM_SUPPLICANT_INTERFACE(object);
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
 
     G_OBJECT_CLASS(nm_supplicant_interface_parent_class)->constructed(object);
@@ -3439,7 +3454,7 @@ constructed(GObject *object)
 
 NMSupplicantInterface *
 nm_supplicant_interface_new(NMSupplicantManager *supplicant_manager,
-                            NMRefString *        object_path,
+                            NMRefString         *object_path,
                             int                  ifindex,
                             NMSupplicantDriver   driver)
 {
@@ -3460,7 +3475,7 @@ nm_supplicant_interface_new(NMSupplicantManager *supplicant_manager,
 static void
 dispose(GObject *object)
 {
-    NMSupplicantInterface *       self = NM_SUPPLICANT_INTERFACE(object);
+    NMSupplicantInterface        *self = NM_SUPPLICANT_INTERFACE(object);
     NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
 
     if (priv->state != NM_SUPPLICANT_INTERFACE_STATE_DOWN)
diff --git a/src/core/supplicant/nm-supplicant-interface.h b/src/core/supplicant/nm-supplicant-interface.h
index 4c5d8f64..5ccb455c 100644
--- a/src/core/supplicant/nm-supplicant-interface.h
+++ b/src/core/supplicant/nm-supplicant-interface.h
@@ -100,7 +100,7 @@ struct _NMSupplicantInterface {
 GType nm_supplicant_interface_get_type(void);
 
 NMSupplicantInterface *nm_supplicant_interface_new(NMSupplicantManager *supplicant_manager,
-                                                   NMRefString *        object_path,
+                                                   NMRefString         *object_path,
                                                    int                  ifindex,
                                                    NMSupplicantDriver   driver);
 
@@ -109,36 +109,36 @@ NMRefString *nm_supplicant_interface_get_object_path(NMSupplicantInterface *ifac
 
 void _nm_supplicant_interface_set_state_down(NMSupplicantInterface *self,
                                              gboolean               force_remove_from_supplicant,
-                                             const char *           reason);
+                                             const char            *reason);
 
 typedef void (*NMSupplicantInterfaceAssocCb)(NMSupplicantInterface *iface,
-                                             GError *               error,
+                                             GError                *error,
                                              gpointer               user_data);
 
-void nm_supplicant_interface_assoc(NMSupplicantInterface *      self,
-                                   NMSupplicantConfig *         cfg,
+void nm_supplicant_interface_assoc(NMSupplicantInterface       *self,
+                                   NMSupplicantConfig          *cfg,
                                    NMSupplicantInterfaceAssocCb callback,
                                    gpointer                     user_data);
 
 void nm_supplicant_interface_disconnect(NMSupplicantInterface *iface);
 
 typedef void (*NMSupplicantInterfaceDisconnectCb)(NMSupplicantInterface *iface,
-                                                  GError *               error,
+                                                  GError                *error,
                                                   gpointer               user_data);
 
-void nm_supplicant_interface_disconnect_async(NMSupplicantInterface *           self,
-                                              GCancellable *                    cancellable,
+void nm_supplicant_interface_disconnect_async(NMSupplicantInterface            *self,
+                                              GCancellable                     *cancellable,
                                               NMSupplicantInterfaceDisconnectCb callback,
                                               gpointer                          user_data);
 
 typedef void (*NMSupplicantInterfaceRequestScanCallback)(NMSupplicantInterface *self,
-                                                         GCancellable *         cancellable,
+                                                         GCancellable          *cancellable,
                                                          gpointer               user_data);
 
-void nm_supplicant_interface_request_scan(NMSupplicantInterface *                  self,
-                                          GBytes *const *                          ssids,
+void nm_supplicant_interface_request_scan(NMSupplicantInterface                   *self,
+                                          GBytes *const                           *ssids,
                                           guint                                    ssids_len,
-                                          GCancellable *                           cancellable,
+                                          GCancellable                            *cancellable,
                                           NMSupplicantInterfaceRequestScanCallback callback,
                                           gpointer                                 user_data);
 
@@ -165,16 +165,16 @@ const char *nm_supplicant_interface_get_p2p_group_path(NMSupplicantInterface *se
 gboolean nm_supplicant_interface_get_p2p_group_owner(NMSupplicantInterface *self);
 
 gboolean nm_supplicant_interface_get_p2p_assigned_addr(NMSupplicantInterface *self,
-                                                       in_addr_t *            assigned_addr,
-                                                       guint8 *               plen);
+                                                       in_addr_t             *assigned_addr,
+                                                       guint8                *plen);
 
 void nm_supplicant_interface_p2p_start_find(NMSupplicantInterface *self, guint timeout);
 void nm_supplicant_interface_p2p_stop_find(NMSupplicantInterface *self);
 
 void nm_supplicant_interface_p2p_connect(NMSupplicantInterface *self,
-                                         const char *           peer,
-                                         const char *           wps_method,
-                                         const char *           wps_pin);
+                                         const char            *peer,
+                                         const char            *wps_method,
+                                         const char            *wps_pin);
 void nm_supplicant_interface_p2p_cancel_connect(NMSupplicantInterface *self);
 void nm_supplicant_interface_p2p_disconnect(NMSupplicantInterface *self);
 
@@ -187,8 +187,8 @@ NMSupplCapMask nm_supplicant_interface_get_capabilities(NMSupplicantInterface *s
 
 void nm_supplicant_interface_enroll_wps(NMSupplicantInterface *self,
                                         const char *const      type,
-                                        const char *           bssid,
-                                        const char *           pin);
+                                        const char            *bssid,
+                                        const char            *pin);
 
 void nm_supplicant_interface_cancel_wps(NMSupplicantInterface *self);
 
diff --git a/src/core/supplicant/nm-supplicant-manager.c b/src/core/supplicant/nm-supplicant-manager.c
index 52beae78..1f8f0105 100644
--- a/src/core/supplicant/nm-supplicant-manager.c
+++ b/src/core/supplicant/nm-supplicant-manager.c
@@ -21,14 +21,14 @@
 #define CREATE_IFACE_TRY_COUNT_MAX 7u
 
 struct _NMSupplMgrCreateIfaceHandle {
-    NMSupplicantManager *                self;
+    NMSupplicantManager                 *self;
     CList                                create_iface_lst;
-    GCancellable *                       cancellable;
+    GCancellable                        *cancellable;
     NMSupplicantManagerCreateInterfaceCb callback;
     gpointer                             callback_user_data;
-    NMShutdownWaitObjHandle *            shutdown_handle;
-    NMRefString *                        name_owner;
-    GError *                             fail_on_idle_error;
+    NMShutdownWaitObjHandle             *shutdown_handle;
+    NMRefString                         *name_owner;
+    GError                              *fail_on_idle_error;
     NMSupplicantDriver                   driver;
     int                                  ifindex;
     guint                                fail_on_idle_id;
@@ -98,19 +98,19 @@ NM_CACHED_QUARK_FCN("nm-supplicant-error-quark", nm_supplicant_error_quark);
 /*****************************************************************************/
 
 static void     _create_iface_proceed_all(NMSupplicantManager *self, GError *error);
-static void     _supp_iface_add(NMSupplicantManager *  self,
-                                NMRefString *          iface_path,
+static void     _supp_iface_add(NMSupplicantManager   *self,
+                                NMRefString           *iface_path,
                                 NMSupplicantInterface *supp_iface);
-static void     _supp_iface_remove_one(NMSupplicantManager *  self,
+static void     _supp_iface_remove_one(NMSupplicantManager   *self,
                                        NMSupplicantInterface *supp_iface,
                                        gboolean               force_remove_from_supplicant,
-                                       const char *           reason);
-static void     _create_iface_dbus_call_get_interface(NMSupplicantManager *        self,
+                                       const char            *reason);
+static void     _create_iface_dbus_call_get_interface(NMSupplicantManager         *self,
                                                       NMSupplMgrCreateIfaceHandle *handle,
-                                                      const char *                 ifname);
-static void     _create_iface_dbus_call_create_interface(NMSupplicantManager *        self,
+                                                      const char                  *ifname);
+static void     _create_iface_dbus_call_create_interface(NMSupplicantManager         *self,
                                                          NMSupplMgrCreateIfaceHandle *handle,
-                                                         const char *                 ifname);
+                                                         const char                  *ifname);
 static gboolean _create_iface_fail_on_idle_cb(gpointer user_data);
 
 static gboolean _available_reset_cb(gpointer user_data);
@@ -172,8 +172,8 @@ _caps_set(NMSupplicantManagerPrivate *priv, NMSupplCapType type, NMTernary value
 
 static void
 _dbus_call_remove_interface(GDBusConnection *dbus_connection,
-                            const char *     name_owner,
-                            const char *     iface_path)
+                            const char      *name_owner,
+                            const char      *iface_path)
 {
     nm_assert(G_IS_DBUS_CONNECTION(dbus_connection));
     nm_assert(name_owner);
@@ -195,8 +195,8 @@ _dbus_call_remove_interface(GDBusConnection *dbus_connection,
 
 void
 _nm_supplicant_manager_dbus_call_remove_interface(NMSupplicantManager *self,
-                                                  const char *         name_owner,
-                                                  const char *         iface_path)
+                                                  const char          *name_owner,
+                                                  const char          *iface_path)
 {
     _dbus_call_remove_interface(NM_SUPPLICANT_MANAGER_GET_PRIVATE(self)->dbus_connection,
                                 name_owner,
@@ -208,8 +208,8 @@ _nm_supplicant_manager_dbus_call_remove_interface(NMSupplicantManager *self,
 static void
 on_supplicant_wfd_ies_set(GObject *source_object, GAsyncResult *result, gpointer user_data)
 {
-    gs_unref_variant GVariant *res = NULL;
-    gs_free_error GError *error    = NULL;
+    gs_unref_variant GVariant *res   = NULL;
+    gs_free_error GError      *error = NULL;
 
     res = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source_object), result, &error);
     if (!res)
@@ -265,10 +265,10 @@ nm_supplicant_manager_set_wfd_ies(NMSupplicantManager *self, GBytes *wfd_ies)
 static gboolean
 _poke_name_owner_timeout_cb(gpointer user_data)
 {
-    NMSupplicantManager *       self        = user_data;
-    NMSupplicantManagerPrivate *priv        = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
-    gs_free_error GError *error             = NULL;
-    gboolean              available_changed = FALSE;
+    NMSupplicantManager        *self              = user_data;
+    NMSupplicantManagerPrivate *priv              = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
+    gs_free_error GError       *error             = NULL;
+    gboolean                    available_changed = FALSE;
 
     nm_assert(!priv->name_owner);
 
@@ -307,8 +307,8 @@ _poke_name_owner_timeout_cb(gpointer user_data)
 static void
 _poke_name_owner_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
-    gs_unref_variant GVariant *res = NULL;
-    gs_free_error GError *error    = NULL;
+    gs_unref_variant GVariant *res   = NULL;
+    gs_free_error GError      *error = NULL;
 
     res = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), result, &error);
     if (nm_utils_error_is_cancelled(error))
@@ -347,8 +347,8 @@ _poke_name_owner(NMSupplicantManager *self)
 
 static void
 _create_iface_complete(NMSupplMgrCreateIfaceHandle *handle,
-                       NMSupplicantInterface *      supp_iface,
-                       GError *                     error)
+                       NMSupplicantInterface       *supp_iface,
+                       GError                      *error)
 {
     nm_assert(!supp_iface || NM_IS_SUPPLICANT_INTERFACE(supp_iface));
     nm_assert((!!supp_iface) != (!!error));
@@ -385,13 +385,13 @@ _create_iface_complete(NMSupplMgrCreateIfaceHandle *handle,
 }
 
 static void
-_create_iface_add(NMSupplicantManager *        self,
+_create_iface_add(NMSupplicantManager         *self,
                   NMSupplMgrCreateIfaceHandle *handle,
-                  const char *                 iface_path_str,
+                  const char                  *iface_path_str,
                   gboolean                     created_by_us)
 {
-    NMSupplicantManagerPrivate *priv                  = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
-    nm_auto_ref_string NMRefString *iface_path        = NULL;
+    NMSupplicantManagerPrivate            *priv       = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
+    nm_auto_ref_string NMRefString        *iface_path = NULL;
     gs_unref_object NMSupplicantInterface *supp_iface = NULL;
 
     iface_path = nm_ref_string_new(iface_path_str);
@@ -425,13 +425,13 @@ _create_iface_add(NMSupplicantManager *        self,
 static void
 _create_iface_dbus_call_get_interface_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
-    GDBusConnection *            dbus_connection = G_DBUS_CONNECTION(source);
+    GDBusConnection             *dbus_connection = G_DBUS_CONNECTION(source);
     NMSupplMgrCreateIfaceHandle *handle;
-    NMSupplicantManager *        self;
-    NMSupplicantManagerPrivate * priv;
-    gs_unref_variant GVariant *res = NULL;
-    gs_free_error GError *error    = NULL;
-    const char *          iface_path_str;
+    NMSupplicantManager         *self;
+    NMSupplicantManagerPrivate  *priv;
+    gs_unref_variant GVariant   *res   = NULL;
+    gs_free_error GError        *error = NULL;
+    const char                  *iface_path_str;
 
     res = g_dbus_connection_call_finish(dbus_connection, result, &error);
 
@@ -478,18 +478,18 @@ _create_iface_dbus_call_get_interface_cb(GObject *source, GAsyncResult *result,
 }
 
 static void
-_create_iface_dbus_call_create_interface_cb(GObject *     source,
+_create_iface_dbus_call_create_interface_cb(GObject      *source,
                                             GAsyncResult *result,
                                             gpointer      user_data)
 {
-    GDBusConnection *            dbus_connection = G_DBUS_CONNECTION(source);
+    GDBusConnection             *dbus_connection = G_DBUS_CONNECTION(source);
     NMSupplMgrCreateIfaceHandle *handle          = user_data;
-    NMSupplicantManager *        self;
-    NMSupplicantManagerPrivate * priv;
-    gs_unref_variant GVariant *res = NULL;
-    gs_free_error GError *error    = NULL;
-    const char *          iface_path_str;
-    char                  ifname[NMP_IFNAMSIZ];
+    NMSupplicantManager         *self;
+    NMSupplicantManagerPrivate  *priv;
+    gs_unref_variant GVariant   *res   = NULL;
+    gs_free_error GError        *error = NULL;
+    const char                  *iface_path_str;
+    char                         ifname[NMP_IFNAMSIZ];
 
     res = g_dbus_connection_call_finish(dbus_connection, result, &error);
 
@@ -553,9 +553,9 @@ _create_iface_dbus_call_create_interface_cb(GObject *     source,
 }
 
 static void
-_create_iface_dbus_call_get_interface(NMSupplicantManager *        self,
+_create_iface_dbus_call_get_interface(NMSupplicantManager         *self,
                                       NMSupplMgrCreateIfaceHandle *handle,
-                                      const char *                 ifname)
+                                      const char                  *ifname)
 {
     NMSupplicantManagerPrivate *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
 
@@ -577,9 +577,9 @@ _create_iface_dbus_call_get_interface(NMSupplicantManager *        self,
 }
 
 static void
-_create_iface_dbus_call_create_interface(NMSupplicantManager *        self,
+_create_iface_dbus_call_create_interface(NMSupplicantManager         *self,
                                          NMSupplMgrCreateIfaceHandle *handle,
-                                         const char *                 ifname)
+                                         const char                  *ifname)
 {
     NMSupplicantManagerPrivate *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
     GVariantBuilder             builder;
@@ -676,13 +676,13 @@ _create_iface_fail_on_idle_cb(gpointer user_data)
 }
 
 NMSupplMgrCreateIfaceHandle *
-nm_supplicant_manager_create_interface(NMSupplicantManager *                self,
+nm_supplicant_manager_create_interface(NMSupplicantManager                 *self,
                                        int                                  ifindex,
                                        NMSupplicantDriver                   driver,
                                        NMSupplicantManagerCreateInterfaceCb callback,
                                        gpointer                             user_data)
 {
-    NMSupplicantManagerPrivate * priv;
+    NMSupplicantManagerPrivate  *priv;
     NMSupplMgrCreateIfaceHandle *handle;
 
     g_return_val_if_fail(NM_IS_SUPPLICANT_MANAGER(self), NULL);
@@ -751,7 +751,7 @@ nm_supplicant_manager_create_interface(NMSupplicantManager *                self
 static void
 _create_iface_proceed_all(NMSupplicantManager *self, GError *error)
 {
-    NMSupplicantManagerPrivate * priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
+    NMSupplicantManagerPrivate  *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
     NMSupplMgrCreateIfaceHandle *handle;
 
     nm_assert(error || priv->name_owner);
@@ -810,8 +810,8 @@ nm_supplicant_manager_create_interface_cancel(NMSupplMgrCreateIfaceHandle *handl
 NMSupplicantInterface *
 nm_supplicant_manager_create_interface_from_path(NMSupplicantManager *self, const char *object_path)
 {
-    NMSupplicantManagerPrivate *priv;
-    NMSupplicantInterface *     supp_iface;
+    NMSupplicantManagerPrivate     *priv;
+    NMSupplicantInterface          *supp_iface;
     nm_auto_ref_string NMRefString *iface_path = NULL;
 
     g_return_val_if_fail(NM_IS_SUPPLICANT_MANAGER(self), NULL);
@@ -837,17 +837,17 @@ nm_supplicant_manager_create_interface_from_path(NMSupplicantManager *self, cons
 
 static void
 _dbus_interface_removed_cb(GDBusConnection *connection,
-                           const char *     sender_name,
-                           const char *     object_path,
-                           const char *     signal_interface_name,
-                           const char *     signal_name,
-                           GVariant *       parameters,
+                           const char      *sender_name,
+                           const char      *object_path,
+                           const char      *signal_interface_name,
+                           const char      *signal_name,
+                           GVariant        *parameters,
                            gpointer         user_data)
 {
-    NMSupplicantManager *       self = user_data;
-    NMSupplicantManagerPrivate *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
-    NMSupplicantInterface *     supp_iface;
-    const char *                iface_path_str;
+    NMSupplicantManager            *self = user_data;
+    NMSupplicantManagerPrivate     *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
+    NMSupplicantInterface          *supp_iface;
+    const char                     *iface_path_str;
     nm_auto_ref_string NMRefString *iface_path = NULL;
 
     nm_assert(nm_streq(sender_name, priv->name_owner->str));
@@ -871,7 +871,7 @@ _dbus_interface_removed_cb(GDBusConnection *connection,
 static void
 _dbus_get_capabilities_cb(GVariant *res, GError *error, gpointer user_data)
 {
-    NMSupplicantManager *       self;
+    NMSupplicantManager        *self;
     NMSupplicantManagerPrivate *priv;
 
     if (nm_utils_error_is_cancelled(error))
@@ -905,15 +905,15 @@ _dbus_get_capabilities_cb(GVariant *res, GError *error, gpointer user_data)
 
     if (res) {
         nm_auto_free_variant_iter GVariantIter *res_iter = NULL;
-        const char *                            res_key;
-        GVariant *                              res_val;
+        const char                             *res_key;
+        GVariant                               *res_val;
 
         g_variant_get(res, "(a{sv})", &res_iter);
         while (g_variant_iter_loop(res_iter, "{&sv}", &res_key, &res_val)) {
             if (nm_streq(res_key, "Capabilities")) {
                 if (g_variant_is_of_type(res_val, G_VARIANT_TYPE_STRING_ARRAY)) {
                     gs_free const char **array = NULL;
-                    const char **        a;
+                    const char         **a;
 
                     array = g_variant_get_strv(res_val, NULL);
                     _caps_set(priv, NM_SUPPL_CAP_TYPE_AP, NM_TERNARY_FALSE);
@@ -962,7 +962,7 @@ _dbus_get_capabilities_cb(GVariant *res, GError *error, gpointer user_data)
             if (nm_streq(res_key, "EapMethods")) {
                 if (g_variant_is_of_type(res_val, G_VARIANT_TYPE_STRING_ARRAY)) {
                     gs_free const char **array = NULL;
-                    const char **        a;
+                    const char         **a;
 
                     array = g_variant_get_strv(res_val, NULL);
                     if (array) {
@@ -1013,7 +1013,7 @@ _dbus_get_capabilities_cb(GVariant *res, GError *error, gpointer user_data)
 /*****************************************************************************/
 
 void
-_nm_supplicant_manager_unregister_interface(NMSupplicantManager *  self,
+_nm_supplicant_manager_unregister_interface(NMSupplicantManager   *self,
                                             NMSupplicantInterface *supp_iface)
 {
     NMSupplicantManagerPrivate *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
@@ -1029,8 +1029,8 @@ _nm_supplicant_manager_unregister_interface(NMSupplicantManager *  self,
 }
 
 static void
-_supp_iface_add(NMSupplicantManager *  self,
-                NMRefString *          iface_path,
+_supp_iface_add(NMSupplicantManager   *self,
+                NMRefString           *iface_path,
                 NMSupplicantInterface *supp_iface)
 {
     NMSupplicantManagerPrivate *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
@@ -1041,10 +1041,10 @@ _supp_iface_add(NMSupplicantManager *  self,
 }
 
 static void
-_supp_iface_remove_one(NMSupplicantManager *  self,
+_supp_iface_remove_one(NMSupplicantManager   *self,
                        NMSupplicantInterface *supp_iface,
                        gboolean               force_remove_from_supplicant,
-                       const char *           reason)
+                       const char            *reason)
 {
 #if NM_MORE_ASSERTS
     _nm_unused gs_unref_object NMSupplicantInterface *supp_iface_keep_alive =
@@ -1064,10 +1064,10 @@ _supp_iface_remove_one(NMSupplicantManager *  self,
 static void
 _supp_iface_remove_all(NMSupplicantManager *self,
                        gboolean             force_remove_from_supplicant,
-                       const char *         reason)
+                       const char          *reason)
 {
     NMSupplicantManagerPrivate *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
-    NMSupplicantInterface *     supp_iface;
+    NMSupplicantInterface      *supp_iface;
 
     while ((supp_iface = c_list_first_entry(&priv->supp_lst_head, NMSupplicantInterface, supp_lst)))
         _supp_iface_remove_one(self, supp_iface, force_remove_from_supplicant, reason);
@@ -1078,7 +1078,7 @@ _supp_iface_remove_all(NMSupplicantManager *self,
 static gboolean
 _available_reset_cb(gpointer user_data)
 {
-    NMSupplicantManager *       self = user_data;
+    NMSupplicantManager        *self = user_data;
     NMSupplicantManagerPrivate *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
 
     priv->available_reset_id = 0;
@@ -1209,16 +1209,16 @@ name_owner_changed(NMSupplicantManager *self, const char *name_owner, gboolean f
 
 static void
 name_owner_changed_cb(GDBusConnection *connection,
-                      const char *     sender_name,
-                      const char *     object_path,
-                      const char *     interface_name,
-                      const char *     signal_name,
-                      GVariant *       parameters,
+                      const char      *sender_name,
+                      const char      *object_path,
+                      const char      *interface_name,
+                      const char      *signal_name,
+                      GVariant        *parameters,
                       gpointer         user_data)
 {
     gs_unref_object NMSupplicantManager *self = g_object_ref(user_data);
-    NMSupplicantManagerPrivate *         priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
-    const char *                         name_owner;
+    NMSupplicantManagerPrivate          *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
+    const char                          *name_owner;
 
     if (!g_variant_is_of_type(parameters, G_VARIANT_TYPE("(sss)")))
         return;
@@ -1244,7 +1244,7 @@ name_owner_changed_cb(GDBusConnection *connection,
 static void
 get_name_owner_cb(const char *name_owner, GError *error, gpointer user_data)
 {
-    NMSupplicantManager *       self = user_data;
+    NMSupplicantManager        *self = user_data;
     NMSupplicantManagerPrivate *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
 
     if (!name_owner && nm_utils_error_is_cancelled(error))
@@ -1297,7 +1297,7 @@ nm_supplicant_manager_init(NMSupplicantManager *self)
 static void
 dispose(GObject *object)
 {
-    NMSupplicantManager *       self = (NMSupplicantManager *) object;
+    NMSupplicantManager        *self = (NMSupplicantManager *) object;
     NMSupplicantManagerPrivate *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self);
 
     _supp_iface_remove_all(self, TRUE, "NMSupplicantManager is disposing");
diff --git a/src/core/supplicant/nm-supplicant-manager.h b/src/core/supplicant/nm-supplicant-manager.h
index 3000d064..ab163b0d 100644
--- a/src/core/supplicant/nm-supplicant-manager.h
+++ b/src/core/supplicant/nm-supplicant-manager.h
@@ -33,21 +33,21 @@ NMSupplicantManager *nm_supplicant_manager_get(void);
 NMTernary nm_supplicant_manager_is_available(NMSupplicantManager *self);
 
 GDBusConnection *nm_supplicant_manager_get_dbus_connection(NMSupplicantManager *self);
-NMRefString *    nm_supplicant_manager_get_dbus_name_owner(NMSupplicantManager *self);
+NMRefString     *nm_supplicant_manager_get_dbus_name_owner(NMSupplicantManager *self);
 NMSupplCapMask   nm_supplicant_manager_get_global_capabilities(NMSupplicantManager *self);
 
 void nm_supplicant_manager_set_wfd_ies(NMSupplicantManager *self, GBytes *wfd_ies);
 
 typedef struct _NMSupplMgrCreateIfaceHandle NMSupplMgrCreateIfaceHandle;
 
-typedef void (*NMSupplicantManagerCreateInterfaceCb)(NMSupplicantManager *        self,
+typedef void (*NMSupplicantManagerCreateInterfaceCb)(NMSupplicantManager         *self,
                                                      NMSupplMgrCreateIfaceHandle *handle,
-                                                     NMSupplicantInterface *      iface,
-                                                     GError *                     error,
+                                                     NMSupplicantInterface       *iface,
+                                                     GError                      *error,
                                                      gpointer                     user_data);
 
 NMSupplMgrCreateIfaceHandle *
-nm_supplicant_manager_create_interface(NMSupplicantManager *                self,
+nm_supplicant_manager_create_interface(NMSupplicantManager                 *self,
                                        int                                  ifindex,
                                        NMSupplicantDriver                   driver,
                                        NMSupplicantManagerCreateInterfaceCb callback,
@@ -60,11 +60,11 @@ NMSupplicantInterface *nm_supplicant_manager_create_interface_from_path(NMSuppli
 
 /*****************************************************************************/
 
-void _nm_supplicant_manager_unregister_interface(NMSupplicantManager *  self,
+void _nm_supplicant_manager_unregister_interface(NMSupplicantManager   *self,
                                                  NMSupplicantInterface *supp_iface);
 
 void _nm_supplicant_manager_dbus_call_remove_interface(NMSupplicantManager *self,
-                                                       const char *         name_owner,
-                                                       const char *         iface_path);
+                                                       const char          *name_owner,
+                                                       const char          *iface_path);
 
 #endif /* __NETWORKMANAGER_SUPPLICANT_MANAGER_H__ */
diff --git a/src/core/supplicant/nm-supplicant-settings-verify.c b/src/core/supplicant/nm-supplicant-settings-verify.c
index ceb4b6ae..566173af 100644
--- a/src/core/supplicant/nm-supplicant-settings-verify.c
+++ b/src/core/supplicant/nm-supplicant-settings-verify.c
@@ -11,8 +11,8 @@
 #include <stdlib.h>
 
 struct Opt {
-    const char *         key;
-    const char *const *  str_allowed;
+    const char          *key;
+    const char *const   *str_allowed;
     const NMSupplOptType type;
     const guint32        int_low;  /* Inclusive */
     const guint32        int_high; /* Inclusive; max length for strings */
diff --git a/src/core/supplicant/nm-supplicant-types.h b/src/core/supplicant/nm-supplicant-types.h
index 743ef8f0..d5cf1bf7 100644
--- a/src/core/supplicant/nm-supplicant-types.h
+++ b/src/core/supplicant/nm-supplicant-types.h
@@ -160,7 +160,7 @@ typedef struct _NMSupplicantBssInfo {
 
     NMSupplicantInterface *_self;
     CList                  _bss_lst;
-    GCancellable *         _init_cancellable;
+    GCancellable          *_init_cancellable;
 
     GBytes *ssid;
 
@@ -194,7 +194,7 @@ typedef struct _NMSupplicantPeerInfo {
 
     CList                  _peer_lst;
     NMSupplicantInterface *_self;
-    GCancellable *         _init_cancellable;
+    GCancellable          *_init_cancellable;
 
     char *device_name;
     char *manufacturer;
diff --git a/src/core/supplicant/tests/test-supplicant-config.c b/src/core/supplicant/tests/test-supplicant-config.c
index 0cf35d0e..53c5f70f 100644
--- a/src/core/supplicant/tests/test-supplicant-config.c
+++ b/src/core/supplicant/tests/test-supplicant-config.c
@@ -26,14 +26,14 @@
 /*****************************************************************************/
 
 static gboolean
-validate_opt(const char *   detail,
-             GVariant *     config,
-             const char *   key,
+validate_opt(const char    *detail,
+             GVariant      *config,
+             const char    *key,
              NMSupplOptType val_type,
              gconstpointer  expected)
 {
-    char *       config_key;
-    GVariant *   config_value;
+    char        *config_key;
+    GVariant    *config_value;
     gboolean     found = FALSE;
     GVariantIter iter;
 
@@ -86,17 +86,17 @@ validate_opt(const char *   detail,
 }
 
 static GVariant *
-build_supplicant_config(NMConnection * connection,
+build_supplicant_config(NMConnection  *connection,
                         guint          mtu,
                         guint          fixed_freq,
                         NMSupplCapMask capabilities)
 {
     gs_unref_object NMSupplicantConfig *config = NULL;
-    gs_free_error GError *     error           = NULL;
-    NMSettingWireless *        s_wifi;
-    NMSettingWirelessSecurity *s_wsec;
-    NMSetting8021x *           s_8021x;
-    gboolean                   success;
+    gs_free_error GError               *error  = NULL;
+    NMSettingWireless                  *s_wifi;
+    NMSettingWirelessSecurity          *s_wsec;
+    NMSetting8021x                     *s_8021x;
+    gboolean                            success;
 
     config = nm_supplicant_config_new(capabilities);
 
@@ -136,11 +136,11 @@ build_supplicant_config(NMConnection * connection,
 static NMConnection *
 new_basic_connection(const char *id, GBytes *ssid, const char *bssid_str)
 {
-    NMConnection *       connection;
+    NMConnection        *connection;
     NMSettingConnection *s_con;
-    NMSettingWireless *  s_wifi;
-    NMSettingIPConfig *  s_ip4;
-    gs_free char *       uuid = nm_utils_uuid_generate();
+    NMSettingWireless   *s_wifi;
+    NMSettingIPConfig   *s_ip4;
+    gs_free char        *uuid = nm_utils_uuid_generate();
 
     connection = nm_simple_connection_new();
 
@@ -183,13 +183,13 @@ new_basic_connection(const char *id, GBytes *ssid, const char *bssid_str)
 static void
 test_wifi_open(void)
 {
-    gs_unref_object NMConnection *connection = NULL;
-    gs_unref_variant GVariant *config_dict   = NULL;
-    gboolean                   success;
-    GError *                   error       = NULL;
-    const unsigned char        ssid_data[] = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
-    gs_unref_bytes GBytes *ssid            = g_bytes_new(ssid_data, sizeof(ssid_data));
-    const char *           bssid_str       = "11:22:33:44:55:66";
+    gs_unref_object NMConnection *connection  = NULL;
+    gs_unref_variant GVariant    *config_dict = NULL;
+    gboolean                      success;
+    GError                       *error = NULL;
+    const unsigned char    ssid_data[]  = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
+    gs_unref_bytes GBytes *ssid         = g_bytes_new(ssid_data, sizeof(ssid_data));
+    const char            *bssid_str    = "11:22:33:44:55:66";
 
     connection = new_basic_connection("Test Wifi Open", ssid, bssid_str);
     success    = nm_connection_verify(connection, &error);
@@ -216,24 +216,24 @@ test_wifi_open(void)
 }
 
 static void
-test_wifi_wep_key(const char *         detail,
+test_wifi_wep_key(const char          *detail,
                   gboolean             test_bssid,
                   NMWepKeyType         wep_type,
-                  const char *         key_data,
+                  const char          *key_data,
                   const unsigned char *expected,
                   size_t               expected_size)
 {
-    gs_unref_object NMConnection *connection = NULL;
-    gs_unref_variant GVariant *config_dict   = NULL;
-    NMSettingWirelessSecurity *s_wsec;
-    gboolean                   success;
-    GError *                   error       = NULL;
-    const unsigned char        ssid_data[] = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
-    gs_unref_bytes GBytes *ssid            = g_bytes_new(ssid_data, sizeof(ssid_data));
-    const char *           bssid_str       = "11:22:33:44:55:66";
-    gs_unref_bytes GBytes *wep_key_bytes   = g_bytes_new(expected, expected_size);
-    const char *           bgscan_data     = "simple:30:-70:86400";
-    gs_unref_bytes GBytes *bgscan          = g_bytes_new(bgscan_data, strlen(bgscan_data));
+    gs_unref_object NMConnection *connection  = NULL;
+    gs_unref_variant GVariant    *config_dict = NULL;
+    NMSettingWirelessSecurity    *s_wsec;
+    gboolean                      success;
+    GError                       *error  = NULL;
+    const unsigned char    ssid_data[]   = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
+    gs_unref_bytes GBytes *ssid          = g_bytes_new(ssid_data, sizeof(ssid_data));
+    const char            *bssid_str     = "11:22:33:44:55:66";
+    gs_unref_bytes GBytes *wep_key_bytes = g_bytes_new(expected, expected_size);
+    const char            *bgscan_data   = "simple:30:-70:86400";
+    gs_unref_bytes GBytes *bgscan        = g_bytes_new(bgscan_data, strlen(bgscan_data));
 
     connection = new_basic_connection("Test Wifi WEP Key", ssid, test_bssid ? bssid_str : NULL);
 
@@ -287,17 +287,17 @@ test_wifi_wep_key(const char *         detail,
 static void
 test_wifi_wep(void)
 {
-    const char *        key1            = "12345";
+    const char         *key1            = "12345";
     const unsigned char key1_expected[] = {0x31, 0x32, 0x33, 0x34, 0x35};
-    const char *        key2            = "ascii test$$$";
+    const char         *key2            = "ascii test$$$";
     const unsigned char key2_expected[] =
         {0x61, 0x73, 0x63, 0x69, 0x69, 0x20, 0x74, 0x65, 0x73, 0x74, 0x24, 0x24, 0x24};
-    const char *        key3            = "abcdef1234";
+    const char         *key3            = "abcdef1234";
     const unsigned char key3_expected[] = {0xab, 0xcd, 0xef, 0x12, 0x34};
-    const char *        key4            = "96aec785c6392675f87f592972";
+    const char         *key4            = "96aec785c6392675f87f592972";
     const unsigned char key4_expected[] =
         {0x96, 0xae, 0xc7, 0x85, 0xc6, 0x39, 0x26, 0x75, 0xf8, 0x7f, 0x59, 0x29, 0x72};
-    const char *        key5 = "r34lly l33t w3p p4ssphr4s3 for t3st1ng";
+    const char         *key5 = "r34lly l33t w3p p4ssphr4s3 for t3st1ng";
     const unsigned char key5_expected[] =
         {0xce, 0x68, 0x8b, 0x35, 0xf6, 0x0a, 0x2b, 0xbf, 0xc9, 0x8f, 0xed, 0x10, 0xda};
 
@@ -349,22 +349,22 @@ test_wifi_wep(void)
 }
 
 static void
-test_wifi_wpa_psk(const char *                 detail,
+test_wifi_wpa_psk(const char                  *detail,
                   NMSupplOptType               key_type,
-                  const char *                 key_data,
-                  const unsigned char *        expected,
+                  const char                  *key_data,
+                  const unsigned char         *expected,
                   size_t                       expected_size,
                   NMSettingWirelessSecurityPmf pmf)
 {
-    gs_unref_object NMConnection *connection = NULL;
-    gs_unref_variant GVariant *config_dict   = NULL;
-    NMSettingWirelessSecurity *s_wsec;
-    gboolean                   success;
-    GError *                   error       = NULL;
-    const unsigned char        ssid_data[] = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
-    gs_unref_bytes GBytes *ssid            = g_bytes_new(ssid_data, sizeof(ssid_data));
-    const char *           bssid_str       = "11:22:33:44:55:66";
-    gs_unref_bytes GBytes *wpa_psk_bytes   = g_bytes_new(expected, expected_size);
+    gs_unref_object NMConnection *connection  = NULL;
+    gs_unref_variant GVariant    *config_dict = NULL;
+    NMSettingWirelessSecurity    *s_wsec;
+    gboolean                      success;
+    GError                       *error  = NULL;
+    const unsigned char    ssid_data[]   = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
+    gs_unref_bytes GBytes *ssid          = g_bytes_new(ssid_data, sizeof(ssid_data));
+    const char            *bssid_str     = "11:22:33:44:55:66";
+    gs_unref_bytes GBytes *wpa_psk_bytes = g_bytes_new(expected, expected_size);
 
     connection = new_basic_connection("Test Wifi WPA PSK", ssid, bssid_str);
 
@@ -461,15 +461,15 @@ test_wifi_wpa_psk(const char *                 detail,
 static void
 test_wifi_sae_psk(const char *psk)
 {
-    gs_unref_object NMConnection *connection = NULL;
-    gs_unref_variant GVariant *config_dict   = NULL;
-    NMSettingWirelessSecurity *s_wsec;
-    gboolean                   success;
-    GError *                   error       = NULL;
-    const unsigned char        ssid_data[] = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
-    gs_unref_bytes GBytes *ssid            = g_bytes_new(ssid_data, sizeof(ssid_data));
-    const char *           bssid_str       = "11:22:33:44:55:66";
-    int                    short_psk       = strlen(psk) < 8;
+    gs_unref_object NMConnection *connection  = NULL;
+    gs_unref_variant GVariant    *config_dict = NULL;
+    NMSettingWirelessSecurity    *s_wsec;
+    gboolean                      success;
+    GError                       *error = NULL;
+    const unsigned char    ssid_data[]  = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
+    gs_unref_bytes GBytes *ssid         = g_bytes_new(ssid_data, sizeof(ssid_data));
+    const char            *bssid_str    = "11:22:33:44:55:66";
+    int                    short_psk    = strlen(psk) < 8;
 
     connection = new_basic_connection("Test Wifi SAE", ssid, bssid_str);
 
@@ -537,12 +537,12 @@ test_wifi_sae(void)
 static void
 test_wifi_wpa_psk_types(void)
 {
-    const char *        key1 = "d4721e911461d3cdef9793858e977fcda091779243abb7316c2f11605a160893";
+    const char         *key1 = "d4721e911461d3cdef9793858e977fcda091779243abb7316c2f11605a160893";
     const unsigned char key1_expected[] = {0xd4, 0x72, 0x1e, 0x91, 0x14, 0x61, 0xd3, 0xcd,
                                            0xef, 0x97, 0x93, 0x85, 0x8e, 0x97, 0x7f, 0xcd,
                                            0xa0, 0x91, 0x77, 0x92, 0x43, 0xab, 0xb7, 0x31,
                                            0x6c, 0x2f, 0x11, 0x60, 0x5a, 0x16, 0x08, 0x93};
-    const char *        key2            = "r34lly l33t wp4 p4ssphr4s3 for t3st1ng";
+    const char         *key2            = "r34lly l33t wp4 p4ssphr4s3 for t3st1ng";
 
     test_wifi_wpa_psk("wifi-wpa-psk-hex",
                       NM_SUPPL_OPT_TYPE_BYTES,
@@ -565,16 +565,16 @@ test_wifi_wpa_psk_types(void)
 }
 
 static NMConnection *
-generate_wifi_eap_connection(const char *                  id,
-                             GBytes *                      ssid,
-                             const char *                  bssid_str,
+generate_wifi_eap_connection(const char                   *id,
+                             GBytes                       *ssid,
+                             const char                   *bssid_str,
                              NMSettingWirelessSecurityFils fils)
 {
-    NMConnection *             connection = NULL;
+    NMConnection              *connection = NULL;
     NMSettingWirelessSecurity *s_wsec;
-    NMSetting8021x *           s_8021x;
+    NMSetting8021x            *s_8021x;
     gboolean                   success;
-    GError *                   error = NULL;
+    GError                    *error = NULL;
 
     connection = new_basic_connection(id, ssid, bssid_str);
 
@@ -625,11 +625,11 @@ generate_wifi_eap_connection(const char *                  id,
 static NMConnection *
 generate_wifi_eap_suite_b_192_connection(const char *id, GBytes *ssid, const char *bssid_str)
 {
-    NMConnection *             connection = NULL;
+    NMConnection              *connection = NULL;
     NMSettingWirelessSecurity *s_wsec;
-    NMSetting8021x *           s_8021x;
+    NMSetting8021x            *s_8021x;
     gboolean                   success;
-    GError *                   error = NULL;
+    GError                    *error = NULL;
 
     connection = new_basic_connection(id, ssid, bssid_str);
 
@@ -669,12 +669,12 @@ generate_wifi_eap_suite_b_192_connection(const char *id, GBytes *ssid, const cha
 static void
 test_wifi_eap_locked_bssid(void)
 {
-    gs_unref_object NMConnection *connection = NULL;
-    gs_unref_variant GVariant *config_dict   = NULL;
-    const unsigned char        ssid_data[] = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
-    gs_unref_bytes GBytes *ssid            = g_bytes_new(ssid_data, sizeof(ssid_data));
-    const char *           bssid_str       = "11:22:33:44:55:66";
-    guint32                mtu             = 1100;
+    gs_unref_object NMConnection *connection  = NULL;
+    gs_unref_variant GVariant    *config_dict = NULL;
+    const unsigned char    ssid_data[] = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
+    gs_unref_bytes GBytes *ssid        = g_bytes_new(ssid_data, sizeof(ssid_data));
+    const char            *bssid_str   = "11:22:33:44:55:66";
+    guint32                mtu         = 1100;
 
     connection = generate_wifi_eap_connection("Test Wifi EAP-TLS Locked",
                                               ssid,
@@ -716,13 +716,13 @@ test_wifi_eap_locked_bssid(void)
 static void
 test_wifi_eap_unlocked_bssid(void)
 {
-    gs_unref_object NMConnection *connection = NULL;
-    gs_unref_variant GVariant *config_dict   = NULL;
-    const unsigned char        ssid_data[] = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
-    gs_unref_bytes GBytes *ssid            = g_bytes_new(ssid_data, sizeof(ssid_data));
-    const char *           bgscan_data     = "simple:30:-65:300";
-    gs_unref_bytes GBytes *bgscan          = g_bytes_new(bgscan_data, strlen(bgscan_data));
-    guint32                mtu             = 1100;
+    gs_unref_object NMConnection *connection  = NULL;
+    gs_unref_variant GVariant    *config_dict = NULL;
+    const unsigned char    ssid_data[] = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
+    gs_unref_bytes GBytes *ssid        = g_bytes_new(ssid_data, sizeof(ssid_data));
+    const char            *bgscan_data = "simple:30:-65:300";
+    gs_unref_bytes GBytes *bgscan      = g_bytes_new(bgscan_data, strlen(bgscan_data));
+    guint32                mtu         = 1100;
 
     connection = generate_wifi_eap_connection("Test Wifi EAP-TLS Unlocked",
                                               ssid,
@@ -768,13 +768,13 @@ test_wifi_eap_unlocked_bssid(void)
 static void
 test_wifi_eap_fils_disabled(void)
 {
-    gs_unref_object NMConnection *connection = NULL;
-    gs_unref_variant GVariant *config_dict   = NULL;
-    const unsigned char        ssid_data[] = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
-    gs_unref_bytes GBytes *ssid            = g_bytes_new(ssid_data, sizeof(ssid_data));
-    const char *           bgscan_data     = "simple:30:-65:300";
-    gs_unref_bytes GBytes *bgscan          = g_bytes_new(bgscan_data, strlen(bgscan_data));
-    guint32                mtu             = 1100;
+    gs_unref_object NMConnection *connection  = NULL;
+    gs_unref_variant GVariant    *config_dict = NULL;
+    const unsigned char    ssid_data[] = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
+    gs_unref_bytes GBytes *ssid        = g_bytes_new(ssid_data, sizeof(ssid_data));
+    const char            *bgscan_data = "simple:30:-65:300";
+    gs_unref_bytes GBytes *bgscan      = g_bytes_new(bgscan_data, strlen(bgscan_data));
+    guint32                mtu         = 1100;
 
     connection = generate_wifi_eap_connection("Test Wifi FILS disabled",
                                               ssid,
@@ -824,12 +824,12 @@ test_wifi_eap_fils_disabled(void)
 static void
 test_wifi_eap_suite_b_generation(void)
 {
-    gs_unref_object NMConnection *connection = NULL;
-    gs_unref_variant GVariant *config_dict   = NULL;
-    const unsigned char        ssid_data[] = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
-    gs_unref_bytes GBytes *ssid            = g_bytes_new(ssid_data, sizeof(ssid_data));
-    const char *           bssid_str       = "11:22:33:44:55:66";
-    guint32                mtu             = 1100;
+    gs_unref_object NMConnection *connection  = NULL;
+    gs_unref_variant GVariant    *config_dict = NULL;
+    const unsigned char    ssid_data[] = {0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44};
+    gs_unref_bytes GBytes *ssid        = g_bytes_new(ssid_data, sizeof(ssid_data));
+    const char            *bssid_str   = "11:22:33:44:55:66";
+    guint32                mtu         = 1100;
 
     connection = generate_wifi_eap_suite_b_192_connection("EAP-TLS Suite B 192", ssid, bssid_str);