diff options
37 files changed, 114 insertions, 114 deletions
diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c index ded5d018b4..805705056a 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) { - obj_cleanup_intern(); + int_obj_cleanup(); } void ASN1_add_oid_module(void) diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index e0038f0188..caf890780e 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 bio_sock_cleanup_intern(void) +void int_bio_sock_cleanup(void) { # ifdef OPENSSL_SYS_WINDOWS if (wsa_init_done) { diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c index e16fbbb4ef..43d70ce876 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)) { - comp_zlib_cleanup_internal(); + int_comp_zlib_cleanup(); return meth; } if (zlib_loaded) @@ -297,7 +297,7 @@ COMP_METHOD *COMP_zlib(void) return (meth); } -void comp_zlib_cleanup_internal(void) +void int_comp_zlib_cleanup(void) { #ifdef ZLIB_SHARED if (zlib_dso != NULL) diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index 99f552ce61..101d1f1e75 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 conf_modules_free_intern(void) +void int_conf_modules_free(void) { CONF_modules_finish(); CONF_modules_unload(1); diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index 2198c2fe17..929c2a32de 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 openssl_config_internal(const char *config_name) +void int_openssl_config(const char *config_name) { if (openssl_configured) return; @@ -103,7 +103,7 @@ void openssl_config_internal(const char *config_name) openssl_configured = 1; } -void openssl_no_config_internal(void) +void int_openssl_no_config(void) { openssl_configured = 1; } diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c index bb2ce9efa9..ab896d775a 100644 --- a/crypto/engine/eng_cryptodev.c +++ b/crypto/engine/eng_cryptodev.c @@ -63,7 +63,7 @@ #ifndef HAVE_CRYPTODEV -void engine_load_cryptodev_internal(void) +void int_engine_load_cryptodev(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 engine_load_cryptodev_internal(void); +void int_engine_load_cryptodev(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 engine_load_cryptodev_internal(void) +void int_engine_load_cryptodev(void) { ENGINE *engine = ENGINE_new(); int fd; diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c index c7553e1c47..33c9f666a9 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 engine_load_dynamic_internal(void) +void int_engine_load_dynamic(void) { ENGINE *toadd = engine_dynamic(); if (!toadd) diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h index 70b9517b7e..ca9733c7a6 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. engine_cleanup_intern() will call all registered + * register callbacks. int_engine_cleanup() 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 492a249361..64c3b374f6 100644 --- a/crypto/engine/eng_lib.c +++ b/crypto/engine/eng_lib.c @@ -148,7 +148,7 @@ int ENGINE_free(ENGINE *e) /* Cleanup stuff */ /* - * engine_cleanup_intern() is coded such that anything that does work that will + * int_engine_cleanup() 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 engine_cleanup_intern(void) +void int_engine_cleanup(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 26c6a6b077..a66be7f17c 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 "engine_cleanup_intern()" stack to be called during + * we register it with the "int_engine_cleanup()" stack to be called during * cleanup. */ diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index fc0784f413..40290e3f5a 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 engine_load_openssl_internal(void) +void int_engine_load_openssl(void) { ENGINE *toadd = engine_openssl(); if (!toadd) diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c index 1be10dbeae..093b7f6312 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 engine_load_rdrand_internal(void) +void int_engine_load_rdrand(void) { extern unsigned int OPENSSL_ia32cap_P[]; @@ -144,7 +144,7 @@ void engine_load_rdrand_internal(void) } } #else -void engine_load_rdrand_internal(void) +void int_engine_load_rdrand(void) { } #endif diff --git a/crypto/err/err.c b/crypto/err/err.c index b937155c98..bb9d5c9997 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 err_free_strings_intern(void) +void int_err_free_strings(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 f939db702e..3c8e285588 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 err_load_crypto_strings_intern(void) +void int_err_load_crypto_strings(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 be6baf63f7..fe28a3aa27 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 openssl_add_all_ciphers_internal(void) +void int_openssl_add_all_ciphers(void) { #ifndef OPENSSL_NO_DES diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c index ad261b3033..b8fa0b57b2 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 openssl_add_all_digests_internal(void) +void int_openssl_add_all_digests(void) { #ifndef OPENSSL_NO_MD4 EVP_add_digest(EVP_md4()); diff --git a/crypto/evp/names.c b/crypto/evp/names.c index 5ef52b43df..97f92b64ab 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 evp_cleanup_intern(void) +void int_evp_cleanup(void) { OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH); OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH); @@ -142,7 +142,7 @@ void evp_cleanup_intern(void) EVP_PBE_cleanup(); if (obj_cleanup_defer == 2) { obj_cleanup_defer = 0; - obj_cleanup_intern(); + int_obj_cleanup(); } OBJ_sigid_free(); } diff --git a/crypto/ex_data.c b/crypto/ex_data.c index 573aa48106..9cca28c029 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 crypto_cleanup_all_ex_data_intern(void) +void int_crypto_cleanup_all_ex_data(void) { int i; diff --git a/crypto/include/internal/cryptlib.h b/crypto/include/internal/cryptlib.h index 86adaea734..31464eb263 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 crypto_cleanup_all_ex_data_intern(void); +void int_crypto_cleanup_all_ex_data(void); #ifdef __cplusplus } diff --git a/crypto/include/internal/engine.h b/crypto/include/internal/engine.h index ee5394e96b..ace47f72d7 100644 --- a/crypto/include/internal/engine.h +++ b/crypto/include/internal/engine.h @@ -54,12 +54,12 @@ #include <openssl/engine.h> -void engine_load_openssl_internal(void); -void engine_load_cryptodev_internal(void); -void engine_load_rdrand_internal(void); -void engine_load_dynamic_internal(void); -void engine_load_padlock_internal(void); -void engine_load_capi_internal(void); -void engine_load_dasync_internal(void); -void engine_load_afalg_internal(void); -void engine_cleanup_intern(void); +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); diff --git a/crypto/include/internal/evp_int.h b/crypto/include/internal/evp_int.h index 972f58994d..37ae985f5c 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 openssl_add_all_ciphers_internal(void); -void openssl_add_all_digests_internal(void); -void evp_cleanup_intern(void); +void int_openssl_add_all_ciphers(void); +void int_openssl_add_all_digests(void); +void int_evp_cleanup(void); diff --git a/crypto/include/internal/objects.h b/crypto/include/internal/objects.h index 601294f3f2..b69576d2b9 100644 --- a/crypto/include/internal/objects.h +++ b/crypto/include/internal/objects.h @@ -8,4 +8,4 @@ #include <openssl/objects.h> -void obj_cleanup_intern(void); +void int_obj_cleanup(void); diff --git a/crypto/include/internal/rand.h b/crypto/include/internal/rand.h index f1a9389425..ec2bb98027 100644 --- a/crypto/include/internal/rand.h +++ b/crypto/include/internal/rand.h @@ -8,4 +8,4 @@ #include <openssl/rand.h> -void rand_cleanup_intern(void); +void int_rand_cleanup(void); diff --git a/crypto/init.c b/crypto/init.c index f5473ecfe3..1802d0029c 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: " - "err_load_crypto_strings_intern()\n"); + "int_err_load_crypto_strings()\n"); # endif - err_load_crypto_strings_intern(); + int_err_load_crypto_strings(); #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: " - "openssl_add_all_ciphers_internal()\n"); + "int_openssl_add_all_ciphers()\n"); # endif - openssl_add_all_ciphers_internal(); + int_openssl_add_all_ciphers(); # 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: " - "openssl_add_all_digests_internal()\n"); + "int_openssl_add_all_digests()\n"); # endif - openssl_add_all_digests_internal(); + int_openssl_add_all_digests(); # 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: openssl_config_internal(%s)\n", + "OPENSSL_INIT: ossl_init_config: int_openssl_config(%s)\n", config_filename==NULL?"NULL":config_filename); #endif - openssl_config_internal(config_filename); + int_openssl_config(config_filename); config_inited = 1; } static void ossl_init_no_config(void) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, - "OPENSSL_INIT: ossl_init_config: openssl_no_config_internal()\n"); + "OPENSSL_INIT: ossl_init_config: int_openssl_no_config()\n"); #endif - openssl_no_config_internal(); + int_openssl_no_config(); 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: " - "engine_load_openssl_internal()\n"); + "int_engine_load_openssl()\n"); # endif - engine_load_openssl_internal(); + int_engine_load_openssl(); } # 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: " - "engine_load_cryptodev_internal()\n"); + "int_engine_load_cryptodev()\n"); # endif - engine_load_cryptodev_internal(); + int_engine_load_cryptodev(); } # endif @@ -262,9 +262,9 @@ static void ossl_init_engine_rdrand(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_rdrand: " - "engine_load_rdrand_internal()\n"); + "int_engine_load_rdrand()\n"); # endif - engine_load_rdrand_internal(); + int_engine_load_rdrand(); } # 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: " - "engine_load_dynamic_internal()\n"); + "int_engine_load_dynamic()\n"); # endif - engine_load_dynamic_internal(); + int_engine_load_dynamic(); } # 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: " - "engine_load_padlock_internal()\n"); + "int_engine_load_padlock()\n"); # endif - engine_load_padlock_internal(); + int_engine_load_padlock(); } # 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: " - "engine_load_capi_internal()\n"); + "int_engine_load_capi()\n"); # endif - engine_load_capi_internal(); + int_engine_load_capi(); } # 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: " - "engine_load_dasync_internal()\n"); + "int_engine_load_dasync()\n"); # endif - engine_load_dasync_internal(); + int_engine_load_dasync(); } # 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: " - "engine_load_afalg_internal()\n"); + "int_engine_load_afalg()\n"); # endif - engine_load_afalg_internal(); + int_engine_load_afalg(); } # endif # endif @@ -429,9 +429,9 @@ void OPENSSL_cleanup(void) if (zlib_inited) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "comp_zlib_cleanup_internal()\n"); + "int_comp_zlib_cleanup()\n"); #endif - comp_zlib_cleanup_internal(); + int_comp_zlib_cleanup(); } #endif @@ -446,51 +446,51 @@ void OPENSSL_cleanup(void) if (load_crypto_strings_inited) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "err_free_strings_intern()\n"); + "int_err_free_strings()\n"); #endif - err_free_strings_intern(); + int_err_free_strings(); } CRYPTO_THREAD_cleanup_local(&threadstopkey); #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "rand_cleanup_intern()\n"); + "int_rand_cleanup()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "conf_modules_free_intern()\n"); + "int_conf_modules_free()\n"); #ifndef OPENSSL_NO_ENGINE fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "engine_cleanup_intern()\n"); + "int_engine_cleanup()\n"); #endif fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "crypto_cleanup_all_ex_data_intern()\n"); + "int_crypto_cleanup_all_ex_data()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "bio_sock_cleanup_intern()\n"); + "int_bio_sock_cleanup()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "evp_cleanup_intern()\n"); + "int_evp_cleanup()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "obj_cleanup_intern()\n"); + "int_obj_cleanup()\n"); #endif /* * Note that cleanup order is important: * - rand_cleanup_intern could call an ENINGE's RAND cleanup function so - * must be called before engine_cleanup_intern() + * must be called before int_engine_cleanup() * - 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_intern() can end up in ENGINE code so must be called - * before engine_cleanup_intern() + * - int_conf_modules_free() can end up in ENGINE code so must be called + * before int_engine_cleanup() */ - rand_cleanup_intern(); - conf_modules_free_intern(); + int_rand_cleanup(); + int_conf_modules_free(); #ifndef OPENSSL_NO_ENGINE - engine_cleanup_intern(); + int_engine_cleanup(); #endif - crypto_cleanup_all_ex_data_intern(); + int_crypto_cleanup_all_ex_data(); #ifndef OPENSSL_NO_SOCK - bio_sock_cleanup_intern(); + int_bio_sock_cleanup(); #endif - evp_cleanup_intern(); - obj_cleanup_intern(); + int_evp_cleanup(); + int_obj_cleanup(); base_inited = 0; } diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index 90db56bbd8..48dbcde8cc 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -199,7 +199,7 @@ static void cleanup3_doall(ADDED_OBJ *a) } /* - * The purpose of obj_cleanup_defer is to avoid evp_cleanup_intern() attempting + * The purpose of obj_cleanup_defer is to avoid int_evp_cleanup() attempting * to use freed up OIDs. If necessary the actual freeing up of OIDs is delayed. */ int obj_cleanup_defer = 0; @@ -210,7 +210,7 @@ void check_defer(int nid) obj_cleanup_defer = 1; } -void obj_cleanup_intern(void) +void int_obj_cleanup(void) { if (obj_cleanup_defer) { obj_cleanup_defer = 2; diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c index f5998f80aa..b19074c1d8 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 rand_cleanup_intern(void) +void int_rand_cleanup(void) { const RAND_METHOD *meth = RAND_get_rand_method(); if (meth && meth->cleanup) diff --git a/engines/afalg/e_afalg.c b/engines/afalg/e_afalg.c index 3ccf9d517c..18daa6e7f8 100644 --- a/engines/afalg/e_afalg.c +++ b/engines/afalg/e_afalg.c @@ -104,7 +104,7 @@ #define ALG_MAX_SALG_TYPE 14 # ifdef OPENSSL_NO_DYNAMIC_ENGINE -void engine_load_afalg_internal(void); +void int_engine_load_afalg(void); # endif /* Local Linkage Functions */ @@ -816,7 +816,7 @@ static ENGINE *engine_afalg(void) return ret; } -void engine_load_afalg_internal(void) +void int_engine_load_afalg(void) { ENGINE *toadd; diff --git a/engines/e_capi.c b/engines/e_capi.c index ed136e7b9e..20d551895a 100644 --- a/engines/e_capi.c +++ b/engines/e_capi.c @@ -191,7 +191,7 @@ static int cert_select_simple(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs); static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs); # endif -void engine_load_capi_internal(void); +void int_engine_load_capi(void); typedef PCCERT_CONTEXT(WINAPI *CERTDLG) (HCERTSTORE, HWND, LPCWSTR, LPCWSTR, DWORD, DWORD, void *); @@ -613,7 +613,7 @@ static ENGINE *engine_capi(void) return ret; } -void engine_load_capi_internal(void) +void int_engine_load_capi(void) { /* Copied from eng_[openssl|dyn].c */ ENGINE *toadd = engine_capi(); @@ -1911,8 +1911,8 @@ OPENSSL_EXPORT IMPLEMENT_DYNAMIC_CHECK_FN() # else -void engine_load_capi_internal(void); -void engine_load_capi_internal(void) +void int_engine_load_capi(void); +void int_engine_load_capi(void) { } # endif diff --git a/engines/e_dasync.c b/engines/e_dasync.c index 2ee7d6363d..61559544d8 100644 --- a/engines/e_dasync.c +++ b/engines/e_dasync.c @@ -86,7 +86,7 @@ static const char *engine_dasync_name = "Dummy Async engine support"; static int dasync_destroy(ENGINE *e); static int dasync_init(ENGINE *e); static int dasync_finish(ENGINE *e); -void engine_load_dasync_internal(void); +void int_engine_load_dasync(void); /* Set up digests. Just SHA1 for now */ @@ -347,7 +347,7 @@ static ENGINE *engine_dasync(void) return ret; } -void engine_load_dasync_internal(void) +void int_engine_load_dasync(void) { ENGINE *toadd = engine_dasync(); if (!toadd) diff --git a/engines/e_padlock.c b/engines/e_padlock.c index f474f50ca7..d8f90a7f37 100644 --- a/engines/e_padlock.c +++ b/engines/e_padlock.c @@ -111,8 +111,8 @@ static ENGINE *ENGINE_padlock(void); # endif # ifdef OPENSSL_NO_DYNAMIC_ENGINE -void engine_load_padlock_internal(void); -void engine_load_padlock_internal(void) +void int_engine_load_padlock(void); +void int_engine_load_padlock(void) { /* On non-x86 CPUs it just returns. */ # ifdef COMPILE_HW_PADLOCK diff --git a/include/internal/bio.h b/include/internal/bio.h index bf5bc18c7a..521285a7b6 100644 --- a/include/internal/bio.h +++ b/include/internal/bio.h @@ -67,4 +67,4 @@ struct bio_method_st { long (*callback_ctrl) (BIO *, int, bio_info_cb *); }; -void bio_sock_cleanup_intern(void); +void int_bio_sock_cleanup(void); diff --git a/include/internal/comp.h b/include/internal/comp.h index 8232574635..e5de19708e 100644 --- a/include/internal/comp.h +++ b/include/internal/comp.h @@ -8,4 +8,4 @@ #include <openssl/comp.h> -void comp_zlib_cleanup_internal(void); +void int_comp_zlib_cleanup(void); diff --git a/include/internal/conf.h b/include/internal/conf.h index e21f22f9d0..4c3946d920 100644 --- a/include/internal/conf.h +++ b/include/internal/conf.h @@ -51,9 +51,9 @@ struct ossl_init_settings_st { char *config_name; }; -void openssl_config_internal(const char *config_name); -void openssl_no_config_internal(void); -void conf_modules_free_intern(void); +void int_openssl_config(const char *config_name); +void int_openssl_no_config(void); +void int_conf_modules_free(void); #ifdef __cplusplus } diff --git a/include/internal/err.h b/include/internal/err.h index d1a413f091..dbb47967b4 100644 --- a/include/internal/err.h +++ b/include/internal/err.h @@ -55,5 +55,5 @@ * */ -void err_load_crypto_strings_intern(void); -void err_free_strings_intern(void); +void int_err_load_crypto_strings(void); +void int_err_free_strings(void); diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 1faa2ea160..100e95e30e 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1908,7 +1908,7 @@ static void cmeth_free(SSL_COMP *cm) OPENSSL_free(cm); } -void ssl_comp_free_compression_methods_intern(void) +void int_ssl_comp_free_compression_methods(void) { STACK_OF(SSL_COMP) *old_meths = ssl_comp_methods; ssl_comp_methods = NULL; diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c index 2f8034a7d3..c52d48b543 100644 --- a/ssl/ssl_init.c +++ b/ssl/ssl_init.c @@ -198,24 +198,24 @@ static void ssl_library_stop(void) #ifndef OPENSSL_NO_COMP #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ssl_library_stop: " - "ssl_comp_free_compression_methods_intern()\n"); + "int_ssl_comp_free_compression_methods()\n"); #endif - ssl_comp_free_compression_methods_intern(); + int_ssl_comp_free_compression_methods(); #endif } if (ssl_strings_inited) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ssl_library_stop: " - "err_free_strings_intern()\n"); + "int_err_free_strings()\n"); #endif /* * If both crypto and ssl error strings are inited we will end up - * calling err_free_strings_intern() twice - but that's ok. The second + * calling int_err_free_strings() twice - but that's ok. The second * time will be a no-op. It's easier to do that than to try and track * between the two libraries whether they have both been inited. */ - err_free_strings_intern(); + int_err_free_strings(); } } diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 1596091e81..adc5924785 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -2195,7 +2195,7 @@ __owur int custom_ext_add(SSL *s, int server, __owur int custom_exts_copy(custom_ext_methods *dst, const custom_ext_methods *src); void custom_exts_free(custom_ext_methods *exts); -void ssl_comp_free_compression_methods_intern(void); +void int_ssl_comp_free_compression_methods(void); # else |