From: Matt Caswell <matt@openssl.org>
Date: Mon, 14 Mar 2016 10:26:28 +0000 (+0000)
Subject: Add some missing cleanup calls to de-init
X-Git-Tag: OpenSSL_1_1_0-pre4~29
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=b10cdcce005780d9a5ac0398fb0cb4194c0d991b

Add some missing cleanup calls to de-init

OBJ_cleanup() doesn't always get called from EVP_cleanup() so needs to be
explicitly called in de-init. Also BIO_sock_cleanup() also needs to be
called.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/crypto/init.c b/crypto/init.c
index d50d7f19e8..dc15b1d83a 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -483,7 +483,9 @@ void OPENSSL_cleanup(void)
     ENGINE_cleanup();
 #endif
     CRYPTO_cleanup_all_ex_data();
+    BIO_sock_cleanup();
     EVP_cleanup();
+    OBJ_cleanup();
     CONF_modules_free();
     RAND_cleanup();
     base_inited = 0;