diff options
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/asn1/asn_moid.c | 2 | ||||
-rw-r--r-- | crypto/bio/b_sock.c | 2 | ||||
-rw-r--r-- | crypto/comp/c_zlib.c | 4 | ||||
-rw-r--r-- | crypto/conf/conf_mod.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_sap.c | 4 | ||||
-rw-r--r-- | crypto/engine/eng_cryptodev.c | 6 | ||||
-rw-r--r-- | crypto/engine/eng_dyn.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_int.h | 2 | ||||
-rw-r--r-- | crypto/engine/eng_lib.c | 4 | ||||
-rw-r--r-- | crypto/engine/eng_list.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_openssl.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_rdrand.c | 4 | ||||
-rw-r--r-- | crypto/err/err.c | 2 | ||||
-rw-r--r-- | crypto/err/err_all.c | 2 | ||||
-rw-r--r-- | crypto/evp/c_allc.c | 2 | ||||
-rw-r--r-- | crypto/evp/c_alld.c | 2 | ||||
-rw-r--r-- | crypto/evp/names.c | 4 | ||||
-rw-r--r-- | crypto/ex_data.c | 2 | ||||
-rw-r--r-- | crypto/include/internal/cryptlib.h | 2 | ||||
-rw-r--r-- | crypto/include/internal/engine.h | 18 | ||||
-rw-r--r-- | crypto/include/internal/evp_int.h | 6 | ||||
-rw-r--r-- | crypto/include/internal/objects.h | 2 | ||||
-rw-r--r-- | crypto/include/internal/rand.h | 2 | ||||
-rw-r--r-- | crypto/init.c | 96 | ||||
-rw-r--r-- | crypto/objects/obj_dat.c | 2 | ||||
-rw-r--r-- | crypto/rand/rand_lib.c | 2 |
26 files changed, 90 insertions, 90 deletions
diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c index 805705056a..bebf82a55e 100644 --- a/crypto/asn1/asn_moid.c +++ b/crypto/asn1/asn_moid.c @@ -93,7 +93,7 @@ static int oid_module_init(CONF_IMODULE *md, const CONF *cnf) static void oid_module_finish(CONF_IMODULE *md) { - int_obj_cleanup(); + obj_cleanup_int(); } void ASN1_add_oid_module(void) diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index caf890780e..a2d0100bb3 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -205,7 +205,7 @@ int BIO_sock_init(void) return (1); } -void int_bio_sock_cleanup(void) +void bio_sock_cleanup_int(void) { # ifdef OPENSSL_SYS_WINDOWS if (wsa_init_done) { diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c index 43d70ce876..20376b6451 100644 --- a/crypto/comp/c_zlib.c +++ b/crypto/comp/c_zlib.c @@ -282,7 +282,7 @@ COMP_METHOD *COMP_zlib(void) zlib_loaded++; if (!OPENSSL_init_crypto(OPENSSL_INIT_ZLIB, NULL)) { - int_comp_zlib_cleanup(); + comp_zlib_cleanup_int(); return meth; } if (zlib_loaded) @@ -297,7 +297,7 @@ COMP_METHOD *COMP_zlib(void) return (meth); } -void int_comp_zlib_cleanup(void) +void comp_zlib_cleanup_int(void) { #ifdef ZLIB_SHARED if (zlib_dso != NULL) diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index 101d1f1e75..cef805dfca 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -460,7 +460,7 @@ int CONF_module_add(const char *name, conf_init_func *ifunc, return 0; } -void int_conf_modules_free(void) +void conf_modules_free_int(void) { CONF_modules_finish(); CONF_modules_unload(1); diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index 929c2a32de..ab034c2111 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -84,7 +84,7 @@ void OPENSSL_config(const char *config_name) } #endif -void int_openssl_config(const char *config_name) +void openssl_config_int(const char *config_name) { if (openssl_configured) return; @@ -103,7 +103,7 @@ void int_openssl_config(const char *config_name) openssl_configured = 1; } -void int_openssl_no_config(void) +void openssl_no_config_int(void) { openssl_configured = 1; } diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c index ab896d775a..151529c951 100644 --- a/crypto/engine/eng_cryptodev.c +++ b/crypto/engine/eng_cryptodev.c @@ -63,7 +63,7 @@ #ifndef HAVE_CRYPTODEV -void int_engine_load_cryptodev(void) +void engine_load_cryptodev_int(void) { /* This is a NOP on platforms without /dev/crypto */ return; @@ -141,7 +141,7 @@ static int cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, #endif static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void)); -void int_engine_load_cryptodev(void); +void engine_load_cryptodev_int(void); static const ENGINE_CMD_DEFN cryptodev_defns[] = { {0, NULL, NULL, 0} @@ -1628,7 +1628,7 @@ cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void)) return (1); } -void int_engine_load_cryptodev(void) +void engine_load_cryptodev_int(void) { ENGINE *engine = ENGINE_new(); int fd; diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c index 33c9f666a9..f224255851 100644 --- a/crypto/engine/eng_dyn.c +++ b/crypto/engine/eng_dyn.c @@ -295,7 +295,7 @@ static ENGINE *engine_dynamic(void) return ret; } -void int_engine_load_dynamic(void) +void engine_load_dynamic_int(void) { ENGINE *toadd = engine_dynamic(); if (!toadd) diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h index ca9733c7a6..beaa878e36 100644 --- a/crypto/engine/eng_int.h +++ b/crypto/engine/eng_int.h @@ -99,7 +99,7 @@ extern CRYPTO_RWLOCK *global_engine_lock; /* * Any code that will need cleanup operations should use these functions to - * register callbacks. int_engine_cleanup() will call all registered + * register callbacks. engine_cleanup_int() will call all registered * callbacks in order. NB: both the "add" functions assume the engine lock to * already be held (in "write" mode). */ diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c index 64c3b374f6..d0bc716bb3 100644 --- a/crypto/engine/eng_lib.c +++ b/crypto/engine/eng_lib.c @@ -148,7 +148,7 @@ int ENGINE_free(ENGINE *e) /* Cleanup stuff */ /* - * int_engine_cleanup() is coded such that anything that does work that will + * engine_cleanup_int() is coded such that anything that does work that will * need cleanup can register a "cleanup" callback here. That way we don't get * linker bloat by referring to all *possible* cleanups, but any linker bloat * into code "X" will cause X's cleanup function to end up here. @@ -200,7 +200,7 @@ static void engine_cleanup_cb_free(ENGINE_CLEANUP_ITEM *item) OPENSSL_free(item); } -void int_engine_cleanup(void) +void engine_cleanup_int(void) { if (int_cleanup_check(0)) { sk_ENGINE_CLEANUP_ITEM_pop_free(cleanup_stack, diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c index a66be7f17c..15ba1ca33d 100644 --- a/crypto/engine/eng_list.c +++ b/crypto/engine/eng_list.c @@ -79,7 +79,7 @@ static ENGINE *engine_list_tail = NULL; /* * This cleanup function is only needed internally. If it should be called, - * we register it with the "int_engine_cleanup()" stack to be called during + * we register it with the "engine_cleanup_int()" stack to be called during * cleanup. */ diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index 40290e3f5a..fa26700d1e 100644 --- a/crypto/engine/eng_openssl.c +++ b/crypto/engine/eng_openssl.c @@ -189,7 +189,7 @@ static ENGINE *engine_openssl(void) return ret; } -void int_engine_load_openssl(void) +void engine_load_openssl_int(void) { ENGINE *toadd = engine_openssl(); if (!toadd) diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c index 093b7f6312..b62f9109ed 100644 --- a/crypto/engine/eng_rdrand.c +++ b/crypto/engine/eng_rdrand.c @@ -130,7 +130,7 @@ static ENGINE *ENGINE_rdrand(void) return ret; } -void int_engine_load_rdrand(void) +void engine_load_rdrand_int(void) { extern unsigned int OPENSSL_ia32cap_P[]; @@ -144,7 +144,7 @@ void int_engine_load_rdrand(void) } } #else -void int_engine_load_rdrand(void) +void engine_load_rdrand_int(void) { } #endif diff --git a/crypto/err/err.c b/crypto/err/err.c index bb9d5c9997..3ee4e861d4 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -447,7 +447,7 @@ void ERR_unload_strings(int lib, ERR_STRING_DATA *str) CRYPTO_THREAD_unlock(err_string_lock); } -void int_err_free_strings(void) +void err_free_strings_int(void) { CRYPTO_THREAD_run_once(&err_string_init, do_err_strings_init); diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 3c8e285588..4add7fa3c2 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -88,7 +88,7 @@ #include <openssl/async.h> #include <openssl/kdf.h> -void int_err_load_crypto_strings(void) +void err_load_crypto_strings_int(void) { #ifdef OPENSSL_FIPS FIPS_set_error_callbacks(ERR_put_error, ERR_add_error_vdata); diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c index fe28a3aa27..a36e2c6243 100644 --- a/crypto/evp/c_allc.c +++ b/crypto/evp/c_allc.c @@ -62,7 +62,7 @@ #include <openssl/pkcs12.h> #include <openssl/objects.h> -void int_openssl_add_all_ciphers(void) +void openssl_add_all_ciphers_int(void) { #ifndef OPENSSL_NO_DES diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c index b8fa0b57b2..1612c2f2ac 100644 --- a/crypto/evp/c_alld.c +++ b/crypto/evp/c_alld.c @@ -62,7 +62,7 @@ #include <openssl/pkcs12.h> #include <openssl/objects.h> -void int_openssl_add_all_digests(void) +void openssl_add_all_digests_int(void) { #ifndef OPENSSL_NO_MD4 EVP_add_digest(EVP_md4()); diff --git a/crypto/evp/names.c b/crypto/evp/names.c index 97f92b64ab..501bfeead5 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -128,7 +128,7 @@ const EVP_MD *EVP_get_digestbyname(const char *name) return (cp); } -void int_evp_cleanup(void) +void evp_cleanup_int(void) { OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH); OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH); @@ -142,7 +142,7 @@ void int_evp_cleanup(void) EVP_PBE_cleanup(); if (obj_cleanup_defer == 2) { obj_cleanup_defer = 0; - int_obj_cleanup(); + obj_cleanup_int(); } OBJ_sigid_free(); } diff --git a/crypto/ex_data.c b/crypto/ex_data.c index 9cca28c029..44dc46b782 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -175,7 +175,7 @@ static void cleanup_cb(EX_CALLBACK *funcs) * called under potential race-conditions anyway (it's for program shutdown * after all). */ -void int_crypto_cleanup_all_ex_data(void) +void crypto_cleanup_all_ex_data_int(void) { int i; diff --git a/crypto/include/internal/cryptlib.h b/crypto/include/internal/cryptlib.h index 31464eb263..5fc7f0dd7e 100644 --- a/crypto/include/internal/cryptlib.h +++ b/crypto/include/internal/cryptlib.h @@ -113,7 +113,7 @@ void OPENSSL_cpuid_setup(void); extern unsigned int OPENSSL_ia32cap_P[]; void OPENSSL_showfatal(const char *fmta, ...); extern int OPENSSL_NONPIC_relocated; -void int_crypto_cleanup_all_ex_data(void); +void crypto_cleanup_all_ex_data_int(void); #ifdef __cplusplus } diff --git a/crypto/include/internal/engine.h b/crypto/include/internal/engine.h index ace47f72d7..fffce40140 100644 --- a/crypto/include/internal/engine.h +++ b/crypto/include/internal/engine.h @@ -54,12 +54,12 @@ #include <openssl/engine.h> -void int_engine_load_openssl(void); -void int_engine_load_cryptodev(void); -void int_engine_load_rdrand(void); -void int_engine_load_dynamic(void); -void int_engine_load_padlock(void); -void int_engine_load_capi(void); -void int_engine_load_dasync(void); -void int_engine_load_afalg(void); -void int_engine_cleanup(void); +void engine_load_openssl_int(void); +void engine_load_cryptodev_int(void); +void engine_load_rdrand_int(void); +void engine_load_dynamic_int(void); +void engine_load_padlock_int(void); +void engine_load_capi_int(void); +void engine_load_dasync_int(void); +void engine_load_afalg_int(void); +void engine_cleanup_int(void); diff --git a/crypto/include/internal/evp_int.h b/crypto/include/internal/evp_int.h index 37ae985f5c..ca130c26a4 100644 --- a/crypto/include/internal/evp_int.h +++ b/crypto/include/internal/evp_int.h @@ -420,6 +420,6 @@ struct evp_pkey_st { } /* EVP_PKEY */ ; -void int_openssl_add_all_ciphers(void); -void int_openssl_add_all_digests(void); -void int_evp_cleanup(void); +void openssl_add_all_ciphers_int(void); +void openssl_add_all_digests_int(void); +void evp_cleanup_int(void); diff --git a/crypto/include/internal/objects.h b/crypto/include/internal/objects.h index b69576d2b9..86000b6db2 100644 --- a/crypto/include/internal/objects.h +++ b/crypto/include/internal/objects.h @@ -8,4 +8,4 @@ #include <openssl/objects.h> -void int_obj_cleanup(void); +void obj_cleanup_int(void); diff --git a/crypto/include/internal/rand.h b/crypto/include/internal/rand.h index ec2bb98027..be92fa19ec 100644 --- a/crypto/include/internal/rand.h +++ b/crypto/include/internal/rand.h @@ -8,4 +8,4 @@ #include <openssl/rand.h> -void int_rand_cleanup(void); +void rand_cleanup_int(void); diff --git a/crypto/init.c b/crypto/init.c index 1802d0029c..d9f40001a2 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -144,9 +144,9 @@ static void ossl_init_load_crypto_strings(void) #if !defined(OPENSSL_NO_ERR) && !defined(OPENSSL_NO_AUTOERRINIT) # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_load_crypto_strings: " - "int_err_load_crypto_strings()\n"); + "err_load_crypto_strings_int()\n"); # endif - int_err_load_crypto_strings(); + err_load_crypto_strings_int(); #endif load_crypto_strings_inited = 1; } @@ -161,9 +161,9 @@ static void ossl_init_add_all_ciphers(void) #ifndef OPENSSL_NO_AUTOALGINIT # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_add_all_ciphers: " - "int_openssl_add_all_ciphers()\n"); + "openssl_add_all_ciphers_int()\n"); # endif - int_openssl_add_all_ciphers(); + openssl_add_all_ciphers_int(); # ifndef OPENSSL_NO_ENGINE # if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) ENGINE_setup_bsd_cryptodev(); @@ -182,9 +182,9 @@ static void ossl_init_add_all_digests(void) #ifndef OPENSSL_NO_AUTOALGINIT # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_add_all_digests: " - "int_openssl_add_all_digests()\n"); + "openssl_add_all_digests()\n"); # endif - int_openssl_add_all_digests(); + openssl_add_all_digests_int(); # ifndef OPENSSL_NO_ENGINE # if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) ENGINE_setup_bsd_cryptodev(); @@ -206,19 +206,19 @@ static void ossl_init_config(void) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, - "OPENSSL_INIT: ossl_init_config: int_openssl_config(%s)\n", + "OPENSSL_INIT: ossl_init_config: openssl_config(%s)\n", config_filename==NULL?"NULL":config_filename); #endif - int_openssl_config(config_filename); + openssl_config_int(config_filename); config_inited = 1; } static void ossl_init_no_config(void) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, - "OPENSSL_INIT: ossl_init_config: int_openssl_no_config()\n"); + "OPENSSL_INIT: ossl_init_config: openssl_no_config_int()\n"); #endif - int_openssl_no_config(); + openssl_no_config_int(); config_inited = 1; } @@ -239,9 +239,9 @@ static void ossl_init_engine_openssl(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_openssl: " - "int_engine_load_openssl()\n"); + "engine_load_openssl_int()\n"); # endif - int_engine_load_openssl(); + engine_load_openssl_int(); } # if !defined(OPENSSL_NO_HW) && \ (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)) @@ -250,9 +250,9 @@ static void ossl_init_engine_cryptodev(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_cryptodev: " - "int_engine_load_cryptodev()\n"); + "engine_load_cryptodev_int()\n"); # endif - int_engine_load_cryptodev(); + engine_load_cryptodev_int(); } # endif @@ -262,9 +262,9 @@ static void ossl_init_engine_rdrand(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_rdrand: " - "int_engine_load_rdrand()\n"); + "engine_load_rdrand_int()\n"); # endif - int_engine_load_rdrand(); + engine_load_rdrand_int(); } # endif static CRYPTO_ONCE engine_dynamic = CRYPTO_ONCE_STATIC_INIT; @@ -272,9 +272,9 @@ static void ossl_init_engine_dynamic(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_dynamic: " - "int_engine_load_dynamic()\n"); + "engine_load_dynamic_int()\n"); # endif - int_engine_load_dynamic(); + engine_load_dynamic_int(); } # ifndef OPENSSL_NO_STATIC_ENGINE # if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK) @@ -283,9 +283,9 @@ static void ossl_init_engine_padlock(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_padlock: " - "int_engine_load_padlock()\n"); + "engine_load_padlock_int()\n"); # endif - int_engine_load_padlock(); + engine_load_padlock_int(); } # endif # if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) @@ -294,9 +294,9 @@ static void ossl_init_engine_capi(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_capi: " - "int_engine_load_capi()\n"); + "engine_load_capi_int()\n"); # endif - int_engine_load_capi(); + engine_load_capi_int(); } # endif static CRYPTO_ONCE engine_dasync = CRYPTO_ONCE_STATIC_INIT; @@ -304,9 +304,9 @@ static void ossl_init_engine_dasync(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_dasync: " - "int_engine_load_dasync()\n"); + "engine_load_dasync_int()\n"); # endif - int_engine_load_dasync(); + engine_load_dasync_int(); } # if !defined(OPENSSL_NO_AFALGENG) static CRYPTO_ONCE engine_afalg = CRYPTO_ONCE_STATIC_INIT; @@ -314,9 +314,9 @@ static void ossl_init_engine_afalg(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_afalg: " - "int_engine_load_afalg()\n"); + "engine_load_afalg_int()\n"); # endif - int_engine_load_afalg(); + engine_load_afalg_int(); } # endif # endif @@ -429,9 +429,9 @@ void OPENSSL_cleanup(void) if (zlib_inited) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "int_comp_zlib_cleanup()\n"); + "comp_zlib_cleanup_int()\n"); #endif - int_comp_zlib_cleanup(); + comp_zlib_cleanup_int(); } #endif @@ -446,51 +446,51 @@ void OPENSSL_cleanup(void) if (load_crypto_strings_inited) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "int_err_free_strings()\n"); + "err_free_strings_int()\n"); #endif - int_err_free_strings(); + err_free_strings_int(); } CRYPTO_THREAD_cleanup_local(&threadstopkey); #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "int_rand_cleanup()\n"); + "rand_cleanup_int()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "int_conf_modules_free()\n"); + "conf_modules_free_int()\n"); #ifndef OPENSSL_NO_ENGINE fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "int_engine_cleanup()\n"); + "engine_cleanup_int()\n"); #endif fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "int_crypto_cleanup_all_ex_data()\n"); + "crypto_cleanup_all_ex_data_int()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "int_bio_sock_cleanup()\n"); + "bio_sock_cleanup_int()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "int_evp_cleanup()\n"); + "evp_cleanup_int()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "int_obj_cleanup()\n"); + "obj_cleanup_int()\n"); #endif /* * Note that cleanup order is important: - * - rand_cleanup_intern could call an ENINGE's RAND cleanup function so - * must be called before int_engine_cleanup() + * - rand_cleanup_int could call an ENINGE's RAND cleanup function so + * must be called before engine_cleanup_int() * - ENGINEs use CRYPTO_EX_DATA and therefore, must be cleaned up * before the ex data handlers are wiped in CRYPTO_cleanup_all_ex_data(). - * - int_conf_modules_free() can end up in ENGINE code so must be called - * before int_engine_cleanup() + * - conf_modules_free_int() can end up in ENGINE code so must be called + * before engine_cleanup_int() */ - int_rand_cleanup(); - int_conf_modules_free(); + rand_cleanup_int(); + conf_modules_free_int(); #ifndef OPENSSL_NO_ENGINE - int_engine_cleanup(); + engine_cleanup_int(); #endif - int_crypto_cleanup_all_ex_data(); + crypto_cleanup_all_ex_data_int(); #ifndef OPENSSL_NO_SOCK - int_bio_sock_cleanup(); + bio_sock_cleanup_int(); #endif - int_evp_cleanup(); - int_obj_cleanup(); + evp_cleanup_int(); + obj_cleanup_int(); base_inited = 0; } diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index 48dbcde8cc..24e684acd4 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -210,7 +210,7 @@ void check_defer(int nid) obj_cleanup_defer = 1; } -void int_obj_cleanup(void) +void obj_cleanup_int(void) { if (obj_cleanup_defer) { obj_cleanup_defer = 2; diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c index b19074c1d8..9871113591 100644 --- a/crypto/rand/rand_lib.c +++ b/crypto/rand/rand_lib.c @@ -125,7 +125,7 @@ int RAND_set_rand_engine(ENGINE *engine) } #endif -void int_rand_cleanup(void) +void rand_cleanup_int(void) { const RAND_METHOD *meth = RAND_get_rand_method(); if (meth && meth->cleanup) |