diff options
| author | Todd Short <tshort@akamai.com> | 2022-08-17 17:36:27 -0400 |
|---|---|---|
| committer | Todd Short <todd.short@me.com> | 2022-10-18 09:30:21 -0400 |
| commit | 59d21298df9176b64b41cc8583c7024f7f5895d4 (patch) | |
| tree | 6819e56eb1a1916dd85950bb210c27b9904e9859 /crypto/cms | |
| parent | caf9317d7d75213990014e07048384be15688889 (diff) | |
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 <matt@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18186)
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_cd.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_lib.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_smime.c | 2 |
3 files changed, 3 insertions, 3 deletions
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 <openssl/comp.h> #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) |