GNOME.org
 

[gcr] egg: Rename egg_asn1x_xxx_raw_element() to egg_asn1x_xxx_element_raw()

commit c5b9ceec53e3ce9346fc25d620147e998ded53ab
Author: Stef Walter <stefw collabora co uk>
Date:   Thu Nov 17 09:10:20 2011 +0100

    egg: Rename egg_asn1x_xxx_raw_element() to egg_asn1x_xxx_element_raw()

 egg/egg-asn1x.c                     |    4 ++--
 egg/egg-asn1x.h                     |    4 ++--
 egg/egg-dn.c                        |    6 +++---
 egg/egg-symkey.c                    |    4 ++--
 egg/tests/test-asn1.c               |   16 ++++++++--------
 gcr/gcr-certificate-extensions.c    |    4 ++--
 gcr/gcr-certificate-renderer.c      |    6 +++---
 gcr/gcr-certificate-req-renderer.c  |    4 ++--
 gcr/gcr-certificate.c               |    4 ++--
 gcr/gcr-fingerprint.c               |    8 ++++----
 gcr/gcr-key-size.c                  |    2 +-
 gcr/gcr-parser.c                    |   24 ++++++++++++------------
 gcr/tests/test-fingerprint.c        |    2 +-
 gcr/tests/test-pkcs11-certificate.c |    2 +-
 14 files changed, 45 insertions(+), 45 deletions(-)
---
diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c
index a6ed2ee..f31f277 100644
--- a/egg/egg-asn1x.c
+++ b/egg/egg-asn1x.c
@@ -2895,7 +2895,7 @@ egg_asn1x_take_integer_as_usg (GNode *node,
 }
 
 EggBytes *
-egg_asn1x_get_raw_element (GNode *node)
+egg_asn1x_get_element_raw (GNode *node)
 {
 	EggBytes *backing;
 	const guchar *p;
@@ -2925,7 +2925,7 @@ egg_asn1x_get_raw_element (GNode *node)
 }
 
 gboolean
-egg_asn1x_set_raw_element (GNode *node,
+egg_asn1x_set_element_raw (GNode *node,
                            EggBytes *element)
 {
 	Atlv dtlv, *tlv;
diff --git a/egg/egg-asn1x.h b/egg/egg-asn1x.h
index 4849eda..ae9945d 100644
--- a/egg/egg-asn1x.h
+++ b/egg/egg-asn1x.h
@@ -116,9 +116,9 @@ void                egg_asn1x_take_integer_as_usg    (GNode *node,
 
 EggBytes *          egg_asn1x_get_raw_value          (GNode *node);
 
-EggBytes *          egg_asn1x_get_raw_element        (GNode *node);
+EggBytes *          egg_asn1x_get_element_raw        (GNode *node);
 
-gboolean            egg_asn1x_set_raw_element        (GNode *node,
+gboolean            egg_asn1x_set_element_raw        (GNode *node,
                                                       EggBytes *value);
 
 guchar*             egg_asn1x_get_string_as_raw      (GNode *node,
diff --git a/egg/egg-dn.c b/egg/egg-dn.c
index 1452261..234ae16 100644
--- a/egg/egg-dn.c
+++ b/egg/egg-dn.c
@@ -142,7 +142,7 @@ dn_parse_rdn (GNode *asn)
 	flags = egg_oid_get_flags (oid);
 	name = egg_oid_get_name (oid);
 
-	value = egg_asn1x_get_raw_element (egg_asn1x_node (asn, "value", NULL));
+	value = egg_asn1x_get_element_raw (egg_asn1x_node (asn, "value", NULL));
 	g_return_val_if_fail (value, NULL);
 
 	display = dn_print_oid_value (oid, flags, value);
@@ -234,7 +234,7 @@ egg_dn_read_part (GNode *asn, const gchar *match)
 			node = egg_asn1x_node (asn, i, j, "value", NULL);
 			g_return_val_if_fail (node, NULL);
 
-			value = egg_asn1x_get_raw_element (node);
+			value = egg_asn1x_get_element_raw (node);
 			g_return_val_if_fail (value, NULL);
 
 			result = dn_print_oid_value (oid, egg_oid_get_flags (oid), value);
@@ -280,7 +280,7 @@ egg_dn_parse (GNode *asn, EggDnCallback callback, gpointer user_data)
 				break;
 			}
 
-			value = egg_asn1x_get_raw_element (node);
+			value = egg_asn1x_get_element_raw (node);
 
 			if (callback)
 				(callback) (i, oid, value, user_data);
diff --git a/egg/egg-symkey.c b/egg/egg-symkey.c
index 50f147b..ea1665f 100644
--- a/egg/egg-symkey.c
+++ b/egg/egg-symkey.c
@@ -910,7 +910,7 @@ read_cipher_pkcs5_pbes2 (const gchar *password,
 	}
 
 	/* Read out the parameters */
-	params = egg_asn1x_get_raw_element (egg_asn1x_node (asn, "encryptionScheme", "parameters", NULL));
+	params = egg_asn1x_get_element_raw (egg_asn1x_node (asn, "encryptionScheme", "parameters", NULL));
 	if (!params)
 		goto done;
 
@@ -942,7 +942,7 @@ read_cipher_pkcs5_pbes2 (const gchar *password,
 	}
 
 	egg_bytes_unref (params);
-	params = egg_asn1x_get_raw_element (egg_asn1x_node (asn, "keyDerivationFunc", "parameters", NULL));
+	params = egg_asn1x_get_element_raw (egg_asn1x_node (asn, "keyDerivationFunc", "parameters", NULL));
 	if (!params)
 		goto done;
 
diff --git a/egg/tests/test-asn1.c b/egg/tests/test-asn1.c
index 480501f..c035770 100644
--- a/egg/tests/test-asn1.c
+++ b/egg/tests/test-asn1.c
@@ -532,7 +532,7 @@ test_any_set_raw (void)
 
 	bytes = egg_bytes_new_with_free_func (SFARNSWORTH, XL (SFARNSWORTH),
 	                                      test_is_freed, NULL);
-	if (!egg_asn1x_set_raw_element (node, bytes))
+	if (!egg_asn1x_set_element_raw (node, bytes))
 		g_assert_not_reached ();
 	egg_bytes_unref (bytes);
 
@@ -541,7 +541,7 @@ test_any_set_raw (void)
 
 	egg_assert_equal_bytes (data, SEQ_ENCODING, XL (SEQ_ENCODING));
 
-	check = egg_asn1x_get_raw_element (node);
+	check = egg_asn1x_get_element_raw (node);
 	g_assert (check);
 
 	egg_assert_equal_bytes (check, SFARNSWORTH, XL (SFARNSWORTH));
@@ -571,7 +571,7 @@ test_any_set_raw_explicit (void)
 	g_assert (node);
 
 	bytes = egg_bytes_new_with_free_func (SFARNSWORTH, XL (SFARNSWORTH), test_is_freed, NULL);
-	if (!egg_asn1x_set_raw_element (node, bytes))
+	if (!egg_asn1x_set_element_raw (node, bytes))
 		g_assert_not_reached ();
 	egg_bytes_unref (bytes);
 
@@ -580,7 +580,7 @@ test_any_set_raw_explicit (void)
 
 	egg_assert_equal_bytes (data, SEQ_ENCODING, XL (SEQ_ENCODING));
 
-	check = egg_asn1x_get_raw_element (node);
+	check = egg_asn1x_get_element_raw (node);
 	g_assert (check);
 
 	egg_assert_equal_bytes (check, SFARNSWORTH, XL (SFARNSWORTH));
@@ -605,7 +605,7 @@ test_choice_not_chosen (void)
 	g_assert (node);
 
 	bytes = egg_bytes_new_static (SFARNSWORTH, XL (SFARNSWORTH));
-	if (!egg_asn1x_set_raw_element (node, bytes))
+	if (!egg_asn1x_set_element_raw (node, bytes))
 		g_assert_not_reached ();
 	egg_bytes_unref (bytes);
 
@@ -637,7 +637,7 @@ perform_asn1_any_choice_set_raw (const gchar *choice, const gchar *encoding, gsi
 		g_assert_not_reached ();
 
 	bytes = egg_bytes_new_with_free_func (SFARNSWORTH, XL (SFARNSWORTH), test_is_freed, NULL);
-	if (!egg_asn1x_set_raw_element (node, bytes))
+	if (!egg_asn1x_set_element_raw (node, bytes))
 		g_assert_not_reached ();
 	egg_bytes_unref (bytes);
 
@@ -650,7 +650,7 @@ perform_asn1_any_choice_set_raw (const gchar *choice, const gchar *encoding, gsi
 
 	egg_assert_equal_bytes (data, encoding, n_encoding);
 
-	check = egg_asn1x_get_raw_element (node);
+	check = egg_asn1x_get_element_raw (node);
 	g_assert (check != NULL);
 
 	egg_assert_equal_bytes (check, SFARNSWORTH, XL (SFARNSWORTH));
@@ -1045,7 +1045,7 @@ test_read_element (Test* test, gconstpointer unused)
 	g_assert (buffer != NULL);
 
 	/* Now the real test */
-	data = egg_asn1x_get_raw_element (egg_asn1x_node (asn, "data", NULL));
+	data = egg_asn1x_get_element_raw (egg_asn1x_node (asn, "data", NULL));
 	g_assert (data != NULL);
 	g_assert_cmpint (egg_bytes_get_size (data), ==, 11);
 	egg_bytes_unref (data);
diff --git a/gcr/gcr-certificate-extensions.c b/gcr/gcr-certificate-extensions.c
index f130225..0068492 100644
--- a/gcr/gcr-certificate-extensions.c
+++ b/gcr/gcr-certificate-extensions.c
@@ -146,7 +146,7 @@ general_name_parse_other (GNode *node, GcrGeneralName *general)
 	general->description = _("Other Name");
 
 	oid = egg_asn1x_get_oid_as_quark (egg_asn1x_node (node, "type-id", NULL));
-	value = egg_asn1x_get_raw_element (egg_asn1x_node (node, "value", NULL));
+	value = egg_asn1x_get_element_raw (egg_asn1x_node (node, "value", NULL));
 
 	if (value == NULL)
 		return;
@@ -282,7 +282,7 @@ _gcr_certificate_extension_subject_alt_name (EggBytes *data)
 		else if (g_str_equal (node_name, "registeredID"))
 			general_name_parse_registered (choice, &general);
 
-		general.raw = egg_asn1x_get_raw_element (choice);
+		general.raw = egg_asn1x_get_element_raw (choice);
 		g_array_append_val (names, general);
 	}
 
diff --git a/gcr/gcr-certificate-renderer.c b/gcr/gcr-certificate-renderer.c
index ae3f73c..b3314f1 100644
--- a/gcr/gcr-certificate-renderer.c
+++ b/gcr/gcr-certificate-renderer.c
@@ -865,7 +865,7 @@ _gcr_certificate_renderer_append_subject_public_key (GcrRenderer *renderer,
 	text = egg_oid_get_description (oid);
 	_gcr_display_view_append_value (view, renderer, _("Key Algorithm"), text, FALSE);
 
-	value = egg_asn1x_get_raw_element (egg_asn1x_node (subject_public_key,
+	value = egg_asn1x_get_element_raw (egg_asn1x_node (subject_public_key,
 	                                                   "algorithm", "parameters", NULL));
 	if (value) {
 		_gcr_display_view_append_hex (view, renderer, _("Key Parameters"),
@@ -880,7 +880,7 @@ _gcr_certificate_renderer_append_subject_public_key (GcrRenderer *renderer,
 		g_free (display);
 	}
 
-	value = egg_asn1x_get_raw_element (subject_public_key);
+	value = egg_asn1x_get_element_raw (subject_public_key);
 	raw = gcr_fingerprint_from_subject_public_key_info (egg_bytes_get_data (value),
 	                                                    egg_bytes_get_size (value),
 	                                                    G_CHECKSUM_SHA1, &n_raw);
@@ -908,7 +908,7 @@ _gcr_certificate_renderer_append_signature (GcrRenderer *renderer,
 	text = egg_oid_get_description (oid);
 	_gcr_display_view_append_value (view, renderer, _("Signature Algorithm"), text, FALSE);
 
-	value = egg_asn1x_get_raw_element (egg_asn1x_node (asn, "signatureAlgorithm", "parameters", NULL));
+	value = egg_asn1x_get_element_raw (egg_asn1x_node (asn, "signatureAlgorithm", "parameters", NULL));
 	if (value) {
 		_gcr_display_view_append_hex (view, renderer, _("Signature Parameters"),
 		                              egg_bytes_get_data (value),
diff --git a/gcr/gcr-certificate-req-renderer.c b/gcr/gcr-certificate-req-renderer.c
index 78ebad6..4b41bee 100644
--- a/gcr/gcr-certificate-req-renderer.c
+++ b/gcr/gcr-certificate-req-renderer.c
@@ -237,7 +237,7 @@ append_extension_request (GcrRenderer *renderer,
 	if (node == NULL)
 		return FALSE;
 
-	value = egg_asn1x_get_raw_element (node);
+	value = egg_asn1x_get_element_raw (node);
 	asn = egg_asn1x_create_and_decode (pkix_asn1_tab, "ExtensionRequest", value);
 	if (asn == NULL)
 		return FALSE;
@@ -283,7 +283,7 @@ append_attribute (GcrRenderer *renderer,
 			node = egg_asn1x_node (attribute, "values", i, NULL);
 			if (node == NULL)
 				break;
-			value = egg_asn1x_get_raw_element (node);
+			value = egg_asn1x_get_element_raw (node);
 			_gcr_display_view_append_hex (view, renderer, _("Value"),
 			                              egg_bytes_get_data (value),
 			                              egg_bytes_get_size (value));
diff --git a/gcr/gcr-certificate.c b/gcr/gcr-certificate.c
index 75860b5..1713692 100644
--- a/gcr/gcr-certificate.c
+++ b/gcr/gcr-certificate.c
@@ -434,7 +434,7 @@ _gcr_certificate_get_issuer_const (GcrCertificate *self)
 	info = certificate_info_load (self);
 	g_return_val_if_fail (info, NULL);
 
-	return egg_asn1x_get_raw_element (egg_asn1x_node (info->asn1, "tbsCertificate", "issuer", NULL));
+	return egg_asn1x_get_element_raw (egg_asn1x_node (info->asn1, "tbsCertificate", "issuer", NULL));
 }
 
 /**
@@ -614,7 +614,7 @@ _gcr_certificate_get_subject_const (GcrCertificate *self)
 	info = certificate_info_load (self);
 	g_return_val_if_fail (info, NULL);
 
-	return egg_asn1x_get_raw_element (egg_asn1x_node (info->asn1, "tbsCertificate", "subject", NULL));
+	return egg_asn1x_get_element_raw (egg_asn1x_node (info->asn1, "tbsCertificate", "subject", NULL));
 }
 
 /**
diff --git a/gcr/gcr-fingerprint.c b/gcr/gcr-fingerprint.c
index 815ee59..1011797 100644
--- a/gcr/gcr-fingerprint.c
+++ b/gcr/gcr-fingerprint.c
@@ -134,7 +134,7 @@ rsa_subject_public_key_from_attributes (GckAttributes *attrs, GNode *info_asn)
 	                           key, egg_bytes_get_size (key) * 8);
 
 	egg_asn1x_set_oid_as_quark (egg_asn1x_node (info_asn, "algorithm", "algorithm", NULL), GCR_OID_PKIX1_RSA);
-	egg_asn1x_set_raw_element (egg_asn1x_node (info_asn, "algorithm", "parameters", NULL), params);
+	egg_asn1x_set_element_raw (egg_asn1x_node (info_asn, "algorithm", "parameters", NULL), params);
 
 	egg_bytes_unref (key);
 	egg_bytes_unref (params);
@@ -244,8 +244,8 @@ dsa_subject_public_key_from_attributes (GckAttributes *attrs,
 	egg_asn1x_destroy (params_asn);
 
 	egg_asn1x_set_bits_as_raw (egg_asn1x_node (info_asn, "subjectPublicKey", NULL),
-	                           key, egg_bytes_get_size (key) * 8);
-	egg_asn1x_set_raw_element (egg_asn1x_node (info_asn, "algorithm", "parameters", NULL), params);
+	                            key, egg_bytes_get_size (key) * 8);
+	egg_asn1x_set_element_raw (egg_asn1x_node (info_asn, "algorithm", "parameters", NULL), params);
 
 	egg_asn1x_set_oid_as_quark (egg_asn1x_node (info_asn, "algorithm", "algorithm", NULL), GCR_OID_PKIX1_DSA);
 
@@ -307,7 +307,7 @@ fingerprint_from_cert_value (EggBytes *der_data,
 	if (cert_asn == NULL)
 		return NULL;
 
-	info = egg_asn1x_get_raw_element (egg_asn1x_node (cert_asn, "tbsCertificate", "subjectPublicKeyInfo", NULL));
+	info = egg_asn1x_get_element_raw (egg_asn1x_node (cert_asn, "tbsCertificate", "subjectPublicKeyInfo", NULL));
 	g_return_val_if_fail (info != NULL, NULL);
 
 	fingerprint = gcr_fingerprint_from_subject_public_key_info (egg_bytes_get_data (info),
diff --git a/gcr/gcr-key-size.c b/gcr/gcr-key-size.c
index 06c5c09..1b94dd8 100644
--- a/gcr/gcr-key-size.c
+++ b/gcr/gcr-key-size.c
@@ -94,7 +94,7 @@ _gcr_key_size_calculate (GNode *subject_public_key)
 
 	/* The DSA key size is discovered by the prime in params */
 	} else if (oid == GCR_OID_PKIX1_DSA) {
-		key = egg_asn1x_get_raw_element (egg_asn1x_node (subject_public_key, "algorithm", "parameters", NULL));
+		key = egg_asn1x_get_element_raw (egg_asn1x_node (subject_public_key, "algorithm", "parameters", NULL));
 		key_size = calculate_dsa_params_size (key);
 		egg_bytes_unref (key);
 
diff --git a/gcr/gcr-parser.c b/gcr/gcr-parser.c
index b43731b..e8a5116 100644
--- a/gcr/gcr-parser.c
+++ b/gcr/gcr-parser.c
@@ -268,7 +268,7 @@ parsed_asn1_element (GcrParsed *parsed,
 	g_assert (asn);
 	g_assert (parsed);
 
-	value = egg_asn1x_get_raw_element (egg_asn1x_node (asn, part, NULL));
+	value = egg_asn1x_get_element_raw (egg_asn1x_node (asn, part, NULL));
 	if (value == NULL)
 		return FALSE;
 
@@ -665,7 +665,7 @@ parse_der_pkcs8_plain (GcrParser *self,
 	if (!keydata)
 		goto done;
 
-	params = egg_asn1x_get_raw_element (egg_asn1x_node (asn, "privateKeyAlgorithm", "parameters", NULL));
+	params = egg_asn1x_get_element_raw (egg_asn1x_node (asn, "privateKeyAlgorithm", "parameters", NULL));
 
 	ret = SUCCESS;
 
@@ -735,7 +735,7 @@ parse_der_pkcs8_encrypted (GcrParser *self,
 	if (!scheme)
 		goto done;
 
-	params = egg_asn1x_get_raw_element (egg_asn1x_node (asn, "encryptionAlgorithm", "parameters", NULL));
+	params = egg_asn1x_get_element_raw (egg_asn1x_node (asn, "encryptionAlgorithm", "parameters", NULL));
 
 	/* Loop to try different passwords */
 	for (;;) {
@@ -885,7 +885,7 @@ handle_pkcs7_signed_data (GcrParser *self,
 		if (node == NULL)
 			break;
 
-		certificate = egg_asn1x_get_raw_element (node);
+		certificate = egg_asn1x_get_element_raw (node);
 		ret = parse_der_certificate (self, certificate);
 		egg_bytes_unref (certificate);
 
@@ -936,7 +936,7 @@ parse_der_pkcs7 (GcrParser *self,
 		goto done;
 	}
 
-	content = egg_asn1x_get_raw_element (egg_asn1x_node (asn, "content", NULL));
+	content = egg_asn1x_get_element_raw (egg_asn1x_node (asn, "content", NULL));
 	if (!content)
 		goto done;
 
@@ -1006,7 +1006,7 @@ handle_pkcs12_cert_bag (GcrParser *self,
 
 	ret = GCR_ERROR_FAILURE;
 
-	element = egg_asn1x_get_raw_element (egg_asn1x_node (asn, "certValue", NULL));
+	element = egg_asn1x_get_element_raw (egg_asn1x_node (asn, "certValue", NULL));
 	if (!element)
 		goto done;
 
@@ -1049,7 +1049,7 @@ parse_pkcs12_bag_friendly_name (GNode *asn)
 		if (oid == GCR_OID_PKCS9_ATTRIBUTE_FRIENDLY) {
 			node = egg_asn1x_node (asn, i, "values", 1, NULL);
 			if (node != NULL) {
-				element = egg_asn1x_get_raw_element (node);
+				element = egg_asn1x_get_element_raw (node);
 				asn_str = egg_asn1x_create_and_decode (pkix_asn1_tab, "BMPString",
 				                                       element);
 				egg_bytes_unref (element);
@@ -1101,7 +1101,7 @@ handle_pkcs12_bag (GcrParser *self,
 		if (!oid)
 			goto done;
 
-		element = egg_asn1x_get_raw_element (egg_asn1x_node (asn, i, "bagValue", NULL));
+		element = egg_asn1x_get_element_raw (egg_asn1x_node (asn, i, "bagValue", NULL));
 		if (!element)
 			goto done;
 
@@ -1182,7 +1182,7 @@ handle_pkcs12_encrypted_bag (GcrParser *self,
 	if (!scheme)
 		goto done;
 
-	params = egg_asn1x_get_raw_element (egg_asn1x_node (asn, "encryptedContentInfo", "contentEncryptionAlgorithm", "parameters", NULL));
+	params = egg_asn1x_get_element_raw (egg_asn1x_node (asn, "encryptedContentInfo", "contentEncryptionAlgorithm", "parameters", NULL));
 	if (!params)
 		goto done;
 
@@ -1286,7 +1286,7 @@ handle_pkcs12_safe (GcrParser *self,
 		if (!node)
 			goto done;
 
-		bag = egg_asn1x_get_raw_element (node);
+		bag = egg_asn1x_get_element_raw (node);
 		g_return_val_if_fail (bag != NULL, ret);
 
 		/* A non encrypted bag, just parse */
@@ -1370,7 +1370,7 @@ verify_pkcs12_safe (GcrParser *self,
 	if (!algorithm)
 		goto done;
 
-	params = egg_asn1x_get_raw_element (mac_data);
+	params = egg_asn1x_get_element_raw (mac_data);
 	if (!params)
 		goto done;
 
@@ -1455,7 +1455,7 @@ parse_der_pkcs12 (GcrParser *self,
 		goto done;
 	}
 
-	element = egg_asn1x_get_raw_element (egg_asn1x_node (asn, "authSafe", "content", NULL));
+	element = egg_asn1x_get_element_raw (egg_asn1x_node (asn, "authSafe", "content", NULL));
 	if (!element)
 		goto done;
 
diff --git a/gcr/tests/test-fingerprint.c b/gcr/tests/test-fingerprint.c
index 94564f8..8851514 100644
--- a/gcr/tests/test-fingerprint.c
+++ b/gcr/tests/test-fingerprint.c
@@ -130,7 +130,7 @@ parse_subject_public_key_info_for_cert (EggBytes *data)
 	asn = egg_asn1x_create_and_decode (pkix_asn1_tab, "Certificate", data);
 	g_assert (asn != NULL);
 
-	info = egg_asn1x_get_raw_element (egg_asn1x_node (asn, "tbsCertificate", "subjectPublicKeyInfo", NULL));
+	info = egg_asn1x_get_element_raw (egg_asn1x_node (asn, "tbsCertificate", "subjectPublicKeyInfo", NULL));
 	g_assert (info != NULL);
 
 	egg_asn1x_destroy (asn);
diff --git a/gcr/tests/test-pkcs11-certificate.c b/gcr/tests/test-pkcs11-certificate.c
index fe01d5d..d6fea90 100644
--- a/gcr/tests/test-pkcs11-certificate.c
+++ b/gcr/tests/test-pkcs11-certificate.c
@@ -86,7 +86,7 @@ setup (Test *test, gconstpointer unused)
 	asn = egg_asn1x_create_and_decode (pkix_asn1_tab, "Certificate", bytes);
 	g_assert (asn);
 	node = egg_asn1x_node (asn, "tbsCertificate", "subject", NULL);
-	subject = egg_asn1x_get_raw_element (node);
+	subject = egg_asn1x_get_element_raw (node);
 
 	/* Add a certificate to the module */
 	attrs = gck_attributes_new ();
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]