From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 11 Sep 2015 22:10:29 +0000 (+0100)
Subject: Fix zlib CMS compilation.
X-Git-Tag: OpenSSL_1_1_0-pre1~625
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bc2a15cdfb5a5a91b9166371b41b7e0c71e547c6;p=oweals%2Fopenssl.git

Fix zlib CMS compilation.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/crypto/cms/cms_asn1.c b/crypto/cms/cms_asn1.c
index 2bd3954e1f..e044cf519b 100644
--- a/crypto/cms/cms_asn1.c
+++ b/crypto/cms/cms_asn1.c
@@ -305,7 +305,7 @@ ASN1_NDEF_SEQUENCE(CMS_CompressedData) = {
         ASN1_SIMPLE(CMS_CompressedData, version, LONG),
         ASN1_SIMPLE(CMS_CompressedData, compressionAlgorithm, X509_ALGOR),
         ASN1_SIMPLE(CMS_CompressedData, encapContentInfo, CMS_EncapsulatedContentInfo),
-} static_ASN1_NDEF_SEQUENCE_END(CMS_CompressedData)
+} ASN1_NDEF_SEQUENCE_END(CMS_CompressedData)
 
 /* This is the ANY DEFINED BY table for the top level ContentInfo structure */
 
diff --git a/crypto/cms/cms_cd.c b/crypto/cms/cms_cd.c
index 889133ee74..81cc6c51d5 100644
--- a/crypto/cms/cms_cd.c
+++ b/crypto/cms/cms_cd.c
@@ -64,8 +64,6 @@
 #endif
 #include "cms_lcl.h"
 
-DECLARE_ASN1_ITEM(CMS_CompressedData)
-
 #ifdef ZLIB
 
 /* CMS CompressedData Utilities */
diff --git a/crypto/cms/cms_lcl.h b/crypto/cms/cms_lcl.h
index 5b0551c4ca..227356b265 100644
--- a/crypto/cms/cms_lcl.h
+++ b/crypto/cms/cms_lcl.h
@@ -479,6 +479,7 @@ DECLARE_ASN1_ITEM(CMS_RecipientEncryptedKey)
 DECLARE_ASN1_ITEM(CMS_RecipientKeyIdentifier)
 DECLARE_ASN1_ITEM(CMS_RevocationInfoChoice)
 DECLARE_ASN1_ITEM(CMS_SignedData)
+DECLARE_ASN1_ITEM(CMS_CompressedData)
 
 #ifdef  __cplusplus
 }