Initial support for Certificate Policies extension: print out works but setting

[oweals/openssl.git] / crypto / asn1 / p7_signd.c

diff --git a/crypto/asn1/p7_signd.c b/crypto/asn1/p7_signd.c
index cefa92a2121a67f2227d5a828ea49bc1c0cfd7b5..f4d03f8b8999cce7434d3ea1ec5fda8b334224e7 100644 (file)
--- a/crypto/asn1/p7_signd.c
+++ b/crypto/asn1/p7_signd.c
@@ -75,7 +75,7 @@ unsigned char **pp;
        M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);
        M_ASN1_I2D_len_SET(a->md_algs,i2d_X509_ALGOR);
        M_ASN1_I2D_len(a->contents,i2d_PKCS7);
-       M_ASN1_I2D_len_IMP_SEQUENCE_opt(a->cert,i2d_X509,0);
+       M_ASN1_I2D_len_IMP_SEQUENCE_opt_type(X509,a->cert,i2d_X509,0);
        M_ASN1_I2D_len_IMP_SET_opt(a->crl,i2d_X509_CRL,1);
        M_ASN1_I2D_len_SET(a->signer_info,i2d_PKCS7_SIGNER_INFO);
 
@@ -84,7 +84,7 @@ unsigned char **pp;
        M_ASN1_I2D_put(a->version,i2d_ASN1_INTEGER);
        M_ASN1_I2D_put_SET(a->md_algs,i2d_X509_ALGOR);
        M_ASN1_I2D_put(a->contents,i2d_PKCS7);
-       M_ASN1_I2D_put_IMP_SEQUENCE_opt(a->cert,i2d_X509,0);
+       M_ASN1_I2D_put_IMP_SEQUENCE_opt_type(X509,a->cert,i2d_X509,0);
        M_ASN1_I2D_put_IMP_SET_opt(a->crl,i2d_X509_CRL,1);
        M_ASN1_I2D_put_SET(a->signer_info,i2d_PKCS7_SIGNER_INFO);
 
@@ -103,7 +103,7 @@ long length;
        M_ASN1_D2I_get(ret->version,d2i_ASN1_INTEGER);
        M_ASN1_D2I_get_set(ret->md_algs,d2i_X509_ALGOR,X509_ALGOR_free);
        M_ASN1_D2I_get(ret->contents,d2i_PKCS7);
-       M_ASN1_D2I_get_IMP_set_opt(ret->cert,d2i_X509,X509_free,0);
+       M_ASN1_D2I_get_IMP_set_opt_type(X509,ret->cert,d2i_X509,X509_free,0);
        M_ASN1_D2I_get_IMP_set_opt(ret->crl,d2i_X509_CRL,X509_CRL_free,1);
        M_ASN1_D2I_get_set(ret->signer_info,d2i_PKCS7_SIGNER_INFO,
                PKCS7_SIGNER_INFO_free);
@@ -134,7 +134,7 @@ PKCS7_SIGNED *a;
        ASN1_INTEGER_free(a->version);
        sk_pop_free(a->md_algs,X509_ALGOR_free);
        PKCS7_free(a->contents);
-       sk_pop_free(a->cert,X509_free);
+       sk_X509_pop_free(a->cert,X509_free);
        sk_pop_free(a->crl,X509_CRL_free);
        sk_pop_free(a->signer_info,PKCS7_SIGNER_INFO_free);
        Free((char *)a);