Fix zlib CMS compilation.
authorDr. Stephen Henson <steve@openssl.org>
Fri, 11 Sep 2015 22:10:29 +0000 (23:10 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Fri, 11 Sep 2015 22:10:29 +0000 (23:10 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
crypto/cms/cms_asn1.c
crypto/cms/cms_cd.c
crypto/cms/cms_lcl.h

index 2bd3954..e044cf5 100644 (file)
@@ -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 */
 
index 889133e..81cc6c5 100644 (file)
@@ -64,8 +64,6 @@
 #endif
 #include "cms_lcl.h"
 
-DECLARE_ASN1_ITEM(CMS_CompressedData)
-
 #ifdef ZLIB
 
 /* CMS CompressedData Utilities */
index 5b0551c..227356b 100644 (file)
@@ -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
 }