#include <internal/threads.h>
#include <internal/cryptlib_int.h>
#include <openssl/err.h>
-#include <openssl/rand.h>
+#include <internal/rand.h>
+#include <internal/bio.h>
#include <openssl/evp.h>
#include <internal/evp_int.h>
#include <internal/conf.h>
#include <internal/async.h>
#include <internal/engine.h>
-#include <openssl/comp.h>
+#include <internal/comp.h>
#include <internal/err.h>
+#include <internal/objects.h>
#include <stdlib.h>
#include <assert.h>
if (zlib_inited) {
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "COMP_zlib_cleanup()\n");
+ "comp_zlib_cleanup_internal()\n");
#endif
- COMP_zlib_cleanup();
+ comp_zlib_cleanup_internal();
}
#endif
if (load_crypto_strings_inited) {
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "ERR_free_strings()\n");
+ "err_free_strings_intern()\n");
#endif
- ERR_free_strings();
+ err_free_strings_intern();
}
CRYPTO_THREAD_cleanup_local(&threadstopkey);
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "RAND_cleanup()\n");
+ "rand_cleanup_intern()\n");
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "CONF_modules_free()\n");
+ "conf_modules_free_intern()\n");
#ifndef OPENSSL_NO_ENGINE
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "ENGINE_cleanup()\n");
+ "engine_cleanup_intern()\n");
#endif
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "CRYPTO_cleanup_all_ex_data()\n");
+ "crypto_cleanup_all_ex_data_intern()\n");
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "BIO_sock_cleanup()\n");
+ "bio_sock_cleanup_intern()\n");
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "EVP_cleanup()\n");
+ "evp_cleanup_intern()\n");
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "OBJ_cleanup()\n");
+ "obj_cleanup_intern()\n");
#endif
/*
* Note that cleanup order is important:
- * - RAND_cleanup could call an ENINGE's RAND cleanup function so must be
- * called before ENGINE_cleanup()
+ * - rand_cleanup_intern could call an ENINGE's RAND cleanup function so
+ * must be called before engine_cleanup_intern()
* - ENGINEs use CRYPTO_EX_DATA and therefore, must be cleaned up
* before the ex data handlers are wiped in CRYPTO_cleanup_all_ex_data().
- * - CONF_modules_free() can end up in ENGINE code so must be called before
- * ENGINE_cleanup()
+ * - conf_modules_free_intern() can end up in ENGINE code so must be called
+ * before engine_cleanup_intern()
*/
- RAND_cleanup();
- CONF_modules_free();
+ rand_cleanup_intern();
+ conf_modules_free_intern();
#ifndef OPENSSL_NO_ENGINE
- ENGINE_cleanup();
+ engine_cleanup_intern();
#endif
- CRYPTO_cleanup_all_ex_data();
+ crypto_cleanup_all_ex_data_intern();
#ifndef OPENSSL_NO_SOCK
- BIO_sock_cleanup();
+ bio_sock_cleanup_intern();
#endif
- EVP_cleanup();
- OBJ_cleanup();
+ evp_cleanup_intern();
+ obj_cleanup_intern();
base_inited = 0;
}