diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-04-25 14:08:33 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-04-25 14:08:33 +0000 |
| commit | b8bcf1bcc3a5551e6c11881528a88eabd124206f (patch) | |
| tree | a4c898ada0886cb39ba9b6c446e0ae4c798a0cab | |
| parent | bc344de3497247983cfca5da9e5966e95012aefc (diff) | |
Fold in the zlib_cleanup macro.
| -rw-r--r-- | lib/libssl/src/apps/apps.h | 6 | ||||
| -rw-r--r-- | lib/libssl/src/apps/openssl.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/libssl/src/apps/apps.h b/lib/libssl/src/apps/apps.h index 41656f9b98b..42c5f9e3680 100644 --- a/lib/libssl/src/apps/apps.h +++ b/lib/libssl/src/apps/apps.h @@ -132,12 +132,6 @@ extern BIO *bio_err; #include <signal.h> -#ifdef OPENSSL_NO_COMP -#define zlib_cleanup() -#else -#define zlib_cleanup() COMP_zlib_cleanup() -#endif - typedef struct args_st { char **data; int count; diff --git a/lib/libssl/src/apps/openssl.c b/lib/libssl/src/apps/openssl.c index a12dc98f5e1..a7d1c9ba06a 100644 --- a/lib/libssl/src/apps/openssl.c +++ b/lib/libssl/src/apps/openssl.c @@ -228,7 +228,10 @@ openssl_shutdown(void) ERR_remove_thread_state(NULL); RAND_cleanup(); ERR_free_strings(); - zlib_cleanup(); + +#ifndef OPENSSL_NO_COMP + COMP_zlib_cleanup(); +#endif } int |