From 59d21298df9176b64b41cc8583c7024f7f5895d4 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Wed, 17 Aug 2022 17:36:27 -0400 Subject: Convert ZLIB defines to OPENSSL_NO_ZLIB Use the normal OPENSSL_NO_ prefix to enable/disable ZLIB Make `BIO_f_zlib()` always available. Reviewed-by: Matt Caswell Reviewed-by: Hugo Landau (Merged from https://github.com/openssl/openssl/pull/18186) --- crypto/cms/cms_cd.c | 2 +- crypto/cms/cms_lib.c | 2 +- crypto/cms/cms_smime.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'crypto/cms') diff --git a/crypto/cms/cms_cd.c b/crypto/cms/cms_cd.c index 5578292dbf..3000268480 100644 --- a/crypto/cms/cms_cd.c +++ b/crypto/cms/cms_cd.c @@ -17,7 +17,7 @@ #include #include "cms_local.h" -#ifdef ZLIB +#ifndef OPENSSL_NO_ZLIB /* CMS CompressedData Utilities */ diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c index d92772d41d..a9e659b23d 100644 --- a/crypto/cms/cms_lib.c +++ b/crypto/cms/cms_lib.c @@ -174,7 +174,7 @@ BIO *CMS_dataInit(CMS_ContentInfo *cms, BIO *icont) case NID_pkcs7_digest: cmsbio = ossl_cms_DigestedData_init_bio(cms); break; -#ifdef ZLIB +#ifndef OPENSSL_NO_ZLIB case NID_id_smime_ct_compressedData: cmsbio = ossl_cms_CompressedData_init_bio(cms); break; diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index fe0850b93e..c5b82cf956 100644 --- a/crypto/cms/cms_smime.c +++ b/crypto/cms/cms_smime.c @@ -930,7 +930,7 @@ err: return ret; } -#ifdef ZLIB +#ifndef OPENSSL_NO_ZLIB int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out, unsigned int flags) -- cgit v1.2.3