From 2eb8b115f3b99fd88feb71c85751c36edf9058e7 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 24 Oct 2007 19:27:48 +0000 Subject: [PATCH] 2007-10-24 Dan Williams * src/supplicant-manager/nm-supplicant-config.c - (nm_supplicant_config_add_blob): pass blob data and length for verification - (get_hash_cb): use GByteArrays rather than GArrays; easier to follow git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3020 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ src/supplicant-manager/nm-supplicant-config.c | 11 ++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5a1c499de..b4bf037009 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-10-24 Dan Williams + + * src/supplicant-manager/nm-supplicant-config.c + - (nm_supplicant_config_add_blob): pass blob data and length for + verification + - (get_hash_cb): use GByteArrays rather than GArrays; easier to follow + 2007-10-24 Dan Williams * src/supplicant-manager/nm-supplicant-settings-verify.c diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c index ca5a752083..41729ecbfb 100644 --- a/src/supplicant-manager/nm-supplicant-config.c +++ b/src/supplicant-manager/nm-supplicant-config.c @@ -171,7 +171,7 @@ nm_supplicant_config_add_blob (NMSupplicantConfig *self, priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE (self); - type = nm_supplicant_settings_verify_setting (key, NULL, 0); + type = nm_supplicant_settings_verify_setting (key, value->data, value->len); if (type == TYPE_INVALID) { nm_debug ("Key '%s' and/or it's contained value is invalid.", key); return FALSE; @@ -261,7 +261,7 @@ get_hash_cb (gpointer key, gpointer value, gpointer user_data) { ConfigOption *opt = (ConfigOption *) value; GValue *variant; - GArray *array; + GByteArray *array; variant = g_slice_new0 (GValue); @@ -271,10 +271,11 @@ get_hash_cb (gpointer key, gpointer value, gpointer user_data) g_value_set_int (variant, atoi (opt->value)); break; case TYPE_BYTES: - array = g_array_new (TRUE, TRUE, sizeof (char)); - g_array_append_vals (array, opt->value, opt->len); - g_value_init (variant, dbus_g_type_get_collection ("GArray", G_TYPE_CHAR)); + array = g_byte_array_sized_new (opt->len); + g_byte_array_append (array, opt->value, opt->len); + g_value_init (variant, DBUS_TYPE_G_UCHAR_ARRAY); g_value_set_boxed (variant, array); + g_byte_array_free (array, TRUE); break; case TYPE_KEYWORD: g_value_init (variant, G_TYPE_STRING);