Commit bc2a15cd authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix zlib CMS compilation. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 03706afa

crypto/cms/cms_asn1.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

crypto/cms/cms_cd.c

+0 −2
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ 
#endif

#include "cms_lcl.h"



DECLARE_ASN1_ITEM(CMS_CompressedData)



#ifdef ZLIB



/* CMS CompressedData Utilities */

crypto/cms/cms_lcl.h

+1 −0
Original line number Diff line number Diff line
@@ -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

}