[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  5dfd03812c54ca72d5e4f3d866f270257e6af082 (commit)
      from  68a39960a7a46545419fa7447291fad2e4c483f2 (commit)


- Log -----------------------------------------------------------------
commit 5dfd03812c54ca72d5e4f3d866f270257e6af082
Author: Matt Caswell <matt at openssl.org>
Date:   Sat Aug 20 00:12:16 2016 +0100

    Fix enable-zlib
    
    The enable-zlib option was broken by the recent "const" changes.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/cms/cms_cd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/cms/cms_cd.c b/crypto/cms/cms_cd.c
index c0cb368..f05e308 100644
--- a/crypto/cms/cms_cd.c
+++ b/crypto/cms/cms_cd.c
@@ -63,7 +63,7 @@ CMS_ContentInfo *cms_CompressedData_create(int comp_nid)
 BIO *cms_CompressedData_init_bio(CMS_ContentInfo *cms)
 {
     CMS_CompressedData *cd;
-    ASN1_OBJECT *compoid;
+    const ASN1_OBJECT *compoid;
     if (OBJ_obj2nid(cms->contentType) != NID_id_smime_ct_compressedData) {
         CMSerr(CMS_F_CMS_COMPRESSEDDATA_INIT_BIO,
                CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA);