summaryrefslogtreecommitdiffstats
path: root/crypto/engine
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-09-05 14:12:58 +0100
committerMatt Caswell <matt@openssl.org>2016-09-08 12:40:19 +0100
commit135648bcd0e9db029582d3d7627a90a1b566c5d6 (patch)
tree9f27d7c5bc25abe4355872360aa99ffd86358e36 /crypto/engine
parent2d11f5b2ca863d4bd9e20b224932b247ed85842b (diff)
Fix mem leaks during auto-deinit
Certain functions are automatically called during auto-deinit in order to deallocate resources. However, if we have never entered a function which marks lib crypto as inited then they never get called. This can happen if the user only ever makes use of a small sub-set of functions that don't hit the auto-init code. This commit ensures all such resources deallocated by these functions also init libcrypto when they are initially allocated. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Ben Laurie <ben@openssl.org>
Diffstat (limited to 'crypto/engine')
-rw-r--r--crypto/engine/eng_lib.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c
index 67d755a2aa..28de21d73d 100644
--- a/crypto/engine/eng_lib.c
+++ b/crypto/engine/eng_lib.c
@@ -18,6 +18,7 @@ CRYPTO_ONCE engine_lock_init = CRYPTO_ONCE_STATIC_INIT;
DEFINE_RUN_ONCE(do_engine_lock_init)
{
+ OPENSSL_init_crypto(0, NULL);
global_engine_lock = CRYPTO_THREAD_lock_new();
return global_engine_lock != NULL;
}