diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-09 12:52:50 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-09 12:52:50 +0100 |
| commit | 9749a07a1d9488c2250e5461acec9b8da40762b0 (patch) | |
| tree | 26c516fb54c608c4c2730d70e2073967961374e2 /crypto/init.c | |
| parent | 9ee3a5bb249434167e7ef02a68d3a94944ce66bf (diff) | |
| download | openssl-9749a07a1d9488c2250e5461acec9b8da40762b0.tar.gz | |
Don't call ENGINE_cleanup when configured "no-engine"
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/init.c')
| -rw-r--r-- | crypto/init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/init.c b/crypto/init.c index c19afd09e2..1cac74193f 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -455,8 +455,10 @@ void OPENSSL_cleanup(void) CRYPTO_THREAD_cleanup_local(&threadstopkey); #ifdef OPENSSL_INIT_DEBUG +#ifndef OPENSSL_NO_ENGINE fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "ENGINE_cleanup()\n"); +#endif fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " "CRYPTO_cleanup_all_ex_data()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " @@ -467,7 +469,9 @@ void OPENSSL_cleanup(void) "RAND_cleanup()\n"); #endif +#ifndef OPENSSL_NO_ENGINE ENGINE_cleanup(); +#endif CRYPTO_cleanup_all_ex_data(); EVP_cleanup(); CONF_modules_free(); |