diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-03-14 19:37:56 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-03-14 19:37:56 +0000 |
| commit | 320bfc1be79513f2a782f9ee8894cf7a7b9ffe2d (patch) | |
| tree | 88b544dce8cf3d100cee2b1f4f286eefbf106270 /crypto/cms/cms_lib.c | |
| parent | b820455c6e0aa38e7bdf121ec971f72e0eb097d0 (diff) | |
Reorganise encrypted content info code to avoid duplication and be more
consistent with other content types.
Diffstat (limited to 'crypto/cms/cms_lib.c')
| -rw-r--r-- | crypto/cms/cms_lib.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c index f2169e138b..606abafccb 100644 --- a/crypto/cms/cms_lib.c +++ b/crypto/cms/cms_lib.c @@ -68,12 +68,6 @@ DECLARE_ASN1_ITEM(CMS_RevocationInfoChoice) DECLARE_STACK_OF(CMS_CertificateChoices) DECLARE_STACK_OF(CMS_RevocationInfoChoice) -#if 0 -IMPLEMENT_ASN1_ALLOC_FUNCTIONS(CMS_CertificateChoices) -IMPLEMENT_ASN1_ALLOC_FUNCTIONS(CMS_RevocationInfoChoice) -#endif - - const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms) { return cms->contentType; @@ -140,7 +134,7 @@ BIO *CMS_dataInit(CMS_ContentInfo *cms, BIO *icont) #endif case NID_pkcs7_encrypted: - cmsbio = BIO_new(BIO_f_cipher()); + cmsbio = cms_EncryptedData_init_bio(cms); break; default: |