diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-12-23 00:47:28 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-01-07 18:00:51 +0000 |
| commit | 4a640fb6c395302d7aad22833d573c44211b0a2d (patch) | |
| tree | dd8f1928f7ed2e3a9db1362934e6b37bfd8e9e12 /crypto/cms | |
| parent | 411abf2dd37974a5baa54859c1abcd287b3c1181 (diff) | |
| download | openssl-4a640fb6c395302d7aad22833d573c44211b0a2d.zip openssl-4a640fb6c395302d7aad22833d573c44211b0a2d.tar.gz openssl-4a640fb6c395302d7aad22833d573c44211b0a2d.tar.bz2 | |
Fix declarations and constification for inline stack.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_env.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_lcl.h | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_lib.c | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c index a9a9d84..0b76548 100644 --- a/crypto/cms/cms_env.c +++ b/crypto/cms/cms_env.c @@ -65,8 +65,6 @@ /* CMS EnvelopedData Utilities */ -DECLARE_STACK_OF(CMS_RecipientInfo) - CMS_EnvelopedData *cms_get0_enveloped(CMS_ContentInfo *cms) { if (OBJ_obj2nid(cms->contentType) != NID_pkcs7_enveloped) { diff --git a/crypto/cms/cms_lcl.h b/crypto/cms/cms_lcl.h index 3d41d4f..abc2a27 100644 --- a/crypto/cms/cms_lcl.h +++ b/crypto/cms/cms_lcl.h @@ -109,6 +109,8 @@ struct CMS_ContentInfo_st { } d; }; +DECLARE_STACK_OF(CMS_CertificateChoices) + struct CMS_SignedData_st { long version; STACK_OF(X509_ALGOR) *digestAlgorithms; diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c index fdc69f6..f6de4ef 100644 --- a/crypto/cms/cms_lib.c +++ b/crypto/cms/cms_lib.c @@ -64,9 +64,6 @@ IMPLEMENT_ASN1_FUNCTIONS(CMS_ContentInfo) IMPLEMENT_ASN1_PRINT_FUNCTION(CMS_ContentInfo) -DECLARE_STACK_OF(CMS_CertificateChoices) -DECLARE_STACK_OF(CMS_RevocationInfoChoice) - const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms) { return cms->contentType; |