From ff2344052bfa0132260ee3154962a2552f3d95f5 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 11 Mar 2016 21:53:18 +0000 Subject: Ensure all locks are properly cleaned up Some locks were not being properly cleaned up during close down. Reviewed-by: Richard Levitte --- crypto/init.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'crypto/init.c') diff --git a/crypto/init.c b/crypto/init.c index f44e3a84f2..48f74c496c 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -467,10 +467,14 @@ void OPENSSL_cleanup(void) "crypto_cleanup_all_ex_data_int()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "bio_sock_cleanup_int()\n"); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "bio_cleanup()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "evp_cleanup_int()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "obj_cleanup_int()\n"); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "err_cleanup()\n"); #endif /* * Note that cleanup order is important: @@ -489,11 +493,11 @@ void OPENSSL_cleanup(void) engine_cleanup_int(); #endif crypto_cleanup_all_ex_data_int(); -#ifndef OPENSSL_NO_SOCK - bio_sock_cleanup_int(); -#endif + bio_cleanup(); evp_cleanup_int(); obj_cleanup_int(); + err_cleanup(); + base_inited = 0; } -- cgit v1.2.3