Include "constant_time_locl.h" rather than "../constant_time_locl.h".

[oweals/openssl.git] / crypto / cms / cms_io.c

diff --git a/crypto/cms/cms_io.c b/crypto/cms/cms_io.c
index 1bb60b8dcbbba0ccf627e7cb4ad76f9335bb0bdb..1cb0264cc531fbed2cca51040b3c2c51f88b71f5 100644 (file)
--- a/crypto/cms/cms_io.c
+++ b/crypto/cms/cms_io.c
@@ -89,20 +89,6 @@ int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms)
 
 IMPLEMENT_PEM_rw_const(CMS, CMS_ContentInfo, PEM_STRING_CMS, CMS_ContentInfo)
 
-#if 0
-/* Streaming encode support for CMS */
-
-static BIO *cmsbio_init(ASN1_VALUE *val, BIO *out)
-       {
-       return CMS_dataInit((CMS_ContentInfo *)val, out);
-       }
-
-static int cmsbio_final(ASN1_VALUE *val, BIO *cmsbio)
-       {
-       return CMS_dataFinal((CMS_ContentInfo *)val, cmsbio);
-       }
-#endif
-
 BIO *BIO_new_CMS(BIO *out, CMS_ContentInfo *cms) 
        {
        return BIO_new_NDEF(out, (ASN1_VALUE *)cms,
@@ -128,19 +114,20 @@ int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags)
        {
        STACK_OF(X509_ALGOR) *mdalgs;
        int ctype_nid = OBJ_obj2nid(cms->contentType);
+       int econt_nid = OBJ_obj2nid(CMS_get0_eContentType(cms));
        if (ctype_nid == NID_pkcs7_signed)
                mdalgs = cms->d.signedData->digestAlgorithms;
        else
                mdalgs = NULL;
 
        return SMIME_write_ASN1(bio, (ASN1_VALUE *)cms, data, flags,
-                                       ctype_nid, mdalgs,
+                                       ctype_nid, econt_nid, mdalgs,
                                        ASN1_ITEM_rptr(CMS_ContentInfo));       
        }
 
 CMS_ContentInfo *SMIME_read_CMS(BIO *bio, BIO **bcont)
        {
-       return (CMS_ContentInfo *)SMIME_read_asn1(bio, bcont,
+       return (CMS_ContentInfo *)SMIME_read_ASN1(bio, bcont,
                                        ASN1_ITEM_rptr(CMS_ContentInfo));
        }