diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-03-31 15:03:55 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-03-31 15:03:55 +0000 |
| commit | 2e86f0d8d7185993d8cca5158af61d13224c3c26 (patch) | |
| tree | 308131c49aba8045da575d2f25c184a21073f96b /crypto/cms | |
| parent | e2a29d49ca8548f95ec1b92f2f443f0f9f416a58 (diff) | |
Use correct headers for signed receipts. Use consistent naming.
Update cms-test.pl to support OpenSSL 0.9.8.
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_io.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/cms/cms_io.c b/crypto/cms/cms_io.c index 051757b560..1cb0264cc5 100644 --- a/crypto/cms/cms_io.c +++ b/crypto/cms/cms_io.c @@ -114,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)); } |