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 2bd3954e1fd2f43b041412d6361e44ed10fe9f00..e044cf519b906fd049e5c553bd41c3165f5e5347 100644 (file)
--- 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 889133ee74decd45fc35fc8f08f8fb2dc37db282..81cc6c51d5607ddfdf7215a28de6b3a80dd42ecc 100644 (file)
--- 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 5b0551c4ca5bce47123c5f2b245edae0ffb1514e..227356b2657746bb28f5f62145a2b2eb83d372cc 100644 (file)
--- 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
 }