diff options
author | Matt Caswell <matt@openssl.org> | 2016-04-04 17:19:06 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-04-13 08:52:33 +0100 |
commit | 02a247e0fa23f2caa9c10df3adf3476eb9813c95 (patch) | |
tree | 27382f1da3d5bfffe5b6ac0d3bded12645a8146c /include | |
parent | 01d358a3ab09b0a4e79a5a492169aedcfbe8ddb3 (diff) | |
download | openssl-02a247e0fa23f2caa9c10df3adf3476eb9813c95.tar.gz |
Deprecate COMP_zlib_cleanup() and make it a no-op
COMP_zlib_cleanup() should not be called expicitly - we should leave
auto-deinit to clean this up instead.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/internal/comp.h | 11 | ||||
-rw-r--r-- | include/openssl/comp.h | 5 |
2 files changed, 15 insertions, 1 deletions
diff --git a/include/internal/comp.h b/include/internal/comp.h new file mode 100644 index 0000000000..8232574635 --- /dev/null +++ b/include/internal/comp.h @@ -0,0 +1,11 @@ +/* + * Licensed under the OpenSSL licenses, (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * https://www.openssl.org/source/license.html + * or in the file LICENSE in the source distribution. + */ + +#include <openssl/comp.h> + +void comp_zlib_cleanup_internal(void); diff --git a/include/openssl/comp.h b/include/openssl/comp.h index 9fa71efd55..bfdadce1a1 100644 --- a/include/openssl/comp.h +++ b/include/openssl/comp.h @@ -79,7 +79,10 @@ int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen, unsigned char *in, int ilen); COMP_METHOD *COMP_zlib(void); -void COMP_zlib_cleanup(void); + +#if OPENSSL_API_COMPAT < 0x10100000L +#define COMP_zlib_cleanup() +#endif # ifdef HEADER_BIO_H # ifdef ZLIB |