minimal build

[platform/upstream/gcr.git] / gcr / gcr-certificate-request.c

diff --git a/gcr/gcr-certificate-request.c b/gcr/gcr-certificate-request.c
index 81a510a..d772ac9 100644 (file)
--- a/gcr/gcr-certificate-request.c
+++ b/gcr/gcr-certificate-request.c
@@ -195,8 +195,6 @@ gcr_certificate_request_class_init (GcrCertificateRequestClass *klass)
 {
        GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-       _gcr_oids_init ();
-
        gobject_class->constructed = gcr_certificate_request_constructed;
        gobject_class->finalize = gcr_certificate_request_finalize;
        gobject_class->set_property = gcr_certificate_request_set_property;
@@ -420,7 +418,7 @@ prepare_subject_public_key_and_mechanisms (GcrCertificateRequest *self,
        }
 
        node = egg_asn1x_node (self->asn, "certificationRequestInfo", "subjectPKInfo", NULL);
-       if (!egg_asn1x_set_element_raw (node, encoded))
+       if (!egg_asn1x_decode (node, encoded))
                g_return_val_if_reached (FALSE);
 
        g_bytes_unref (encoded);
@@ -434,7 +432,6 @@ encode_take_signature_into_request (GcrCertificateRequest *self,
                                     guchar *result,
                                     gsize n_result)
 {
-       GBytes *data;
        GNode *params;
        GNode *node;
 
@@ -446,9 +443,7 @@ encode_take_signature_into_request (GcrCertificateRequest *self,
 
        node = egg_asn1x_node (self->asn, "signatureAlgorithm", "parameters", NULL);
        params = egg_asn1x_node (subject_public_key, "algorithm", "parameters", NULL);
-       data = egg_asn1x_encode (params, NULL);
-       egg_asn1x_set_element_raw (node, data);
-       g_bytes_unref (data);
+       egg_asn1x_set_any_from (node, params);
 }
 
 /**