openssl: Properly cleanup OpenSSL library

diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c
index 97d57471d9eaa234f0e63be9f64630c35ec130c7..2371008fddb6acd27ba3c7bfe6ef1fb75c29e07a 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_plugin.c
+++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c
@@ -14,6 +14,7 @@
  * for more details.
  */
 
+#include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/conf.h>
 #include <openssl/rand.h>
@@ -445,11 +446,15 @@ METHOD(plugin_t, get_features, int,
 METHOD(plugin_t, destroy, void,
        private_openssl_plugin_t *this)
 {
+       CONF_modules_free();
+       OBJ_cleanup();
+       EVP_cleanup();
 #ifndef OPENSSL_NO_ENGINE
        ENGINE_cleanup();
 #endif /* OPENSSL_NO_ENGINE */
-       EVP_cleanup();
-       CONF_modules_free();
+       CRYPTO_cleanup_all_ex_data();
+       ERR_remove_thread_state(NULL);
+       ERR_free_strings();
 
        threading_cleanup();
 

diff --git a/src/libstrongswan/utils/leak_detective.c b/src/libstrongswan/utils/leak_detective.c
index 26e3e43fc967d0071daf2c3f9c24a74c33456dcf..4f3c9f78b202cb59548d6c50af1c313c43a0aa9b 100644 (file)
--- a/src/libstrongswan/utils/leak_detective.c
+++ b/src/libstrongswan/utils/leak_detective.c
@@ -475,13 +475,6 @@ char *whitelist[] = {
        "Curl_client_write",
        /* ClearSilver */
        "nerr_init",
-       /* OpenSSL */
-       "RSA_new_method",
-       "DH_new_method",
-       "ENGINE_load_builtin_engines",
-       "OPENSSL_config",
-       "ecdsa_check",
-       "ERR_put_error",
        /* libgcrypt */
        "gcry_control",
        "gcry_check_version",