Avoid warnings.

[openssl.git] / crypto / asn1 / nsseq.c

diff --git a/crypto/asn1/nsseq.c b/crypto/asn1/nsseq.c
index bb447d76e8d32bf43ce0708538a89adf1e1147ac..417d024b81179320390c5a42909b02c2bf4ec607 100644 (file)
--- a/crypto/asn1/nsseq.c
+++ b/crypto/asn1/nsseq.c
@@ -70,14 +70,14 @@ int i2d_NETSCAPE_CERT_SEQUENCE(NETSCAPE_CERT_SEQUENCE *a, unsigned char **pp)
        int v = 0;
        M_ASN1_I2D_vars(a);
        M_ASN1_I2D_len (a->type, i2d_ASN1_OBJECT);
-       M_ASN1_I2D_len_EXP_SEQUENCE_opt(a->certs, i2d_X509, 0,
-                                                        V_ASN1_SEQUENCE, v);
+       M_ASN1_I2D_len_EXP_SEQUENCE_opt_type(X509,a->certs,i2d_X509,0,
+                                            V_ASN1_SEQUENCE,v);
 
        M_ASN1_I2D_seq_total();
 
        M_ASN1_I2D_put (a->type, i2d_ASN1_OBJECT);
-       M_ASN1_I2D_put_EXP_SEQUENCE_opt(a->certs, i2d_X509, 0,
-                                                        V_ASN1_SEQUENCE, v);
+       M_ASN1_I2D_put_EXP_SEQUENCE_opt_type(X509,a->certs,i2d_X509,0,
+                                            V_ASN1_SEQUENCE,v);
 
        M_ASN1_I2D_finish();
 }
@@ -102,15 +102,17 @@ NETSCAPE_CERT_SEQUENCE *d2i_NETSCAPE_CERT_SEQUENCE(NETSCAPE_CERT_SEQUENCE **a,
        M_ASN1_D2I_Init();
        M_ASN1_D2I_start_sequence();
        M_ASN1_D2I_get (ret->type, d2i_ASN1_OBJECT);
-       M_ASN1_D2I_get_EXP_set_opt(ret->certs, d2i_X509, X509_free, 0,
-                                                        V_ASN1_SEQUENCE);
-       M_ASN1_D2I_Finish(a, NETSCAPE_CERT_SEQUENCE_free, ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE);
+       M_ASN1_D2I_get_EXP_set_opt_type(X509,ret->certs,d2i_X509,X509_free,0,
+                                       V_ASN1_SEQUENCE);
+       M_ASN1_D2I_Finish(a, NETSCAPE_CERT_SEQUENCE_free,
+                         ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE);
 }
 
 void NETSCAPE_CERT_SEQUENCE_free (NETSCAPE_CERT_SEQUENCE *a)
 {
        if (a == NULL) return;
        ASN1_OBJECT_free(a->type);
-       if(a->certs) sk_pop_free(a->certs, X509_free);
-       Free ((char *)a);
+       if(a->certs)
+           sk_X509_pop_free(a->certs, X509_free);
+       Free (a);
 }