static void oid_module_finish(CONF_IMODULE *md)
{
- obj_cleanup_intern();
+ int_obj_cleanup();
}
void ASN1_add_oid_module(void)
return (1);
}
-void bio_sock_cleanup_intern(void)
+void int_bio_sock_cleanup(void)
{
# ifdef OPENSSL_SYS_WINDOWS
if (wsa_init_done) {
zlib_loaded++;
if (!OPENSSL_init_crypto(OPENSSL_INIT_ZLIB, NULL)) {
- comp_zlib_cleanup_internal();
+ int_comp_zlib_cleanup();
return meth;
}
if (zlib_loaded)
return (meth);
}
-void comp_zlib_cleanup_internal(void)
+void int_comp_zlib_cleanup(void)
{
#ifdef ZLIB_SHARED
if (zlib_dso != NULL)
return 0;
}
-void conf_modules_free_intern(void)
+void int_conf_modules_free(void)
{
CONF_modules_finish();
CONF_modules_unload(1);
}
#endif
-void openssl_config_internal(const char *config_name)
+void int_openssl_config(const char *config_name)
{
if (openssl_configured)
return;
openssl_configured = 1;
}
-void openssl_no_config_internal(void)
+void int_openssl_no_config(void)
{
openssl_configured = 1;
}
#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;
#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}
return (1);
}
-void engine_load_cryptodev_internal(void)
+void int_engine_load_cryptodev(void)
{
ENGINE *engine = ENGINE_new();
int fd;
return ret;
}
-void engine_load_dynamic_internal(void)
+void int_engine_load_dynamic(void)
{
ENGINE *toadd = engine_dynamic();
if (!toadd)
/*
* 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).
*/
/* 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.
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,
/*
* 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.
*/
return ret;
}
-void engine_load_openssl_internal(void)
+void int_engine_load_openssl(void)
{
ENGINE *toadd = engine_openssl();
if (!toadd)
return ret;
}
-void engine_load_rdrand_internal(void)
+void int_engine_load_rdrand(void)
{
extern unsigned int OPENSSL_ia32cap_P[];
}
}
#else
-void engine_load_rdrand_internal(void)
+void int_engine_load_rdrand(void)
{
}
#endif
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);
#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);
#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
#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());
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);
EVP_PBE_cleanup();
if (obj_cleanup_defer == 2) {
obj_cleanup_defer = 0;
- obj_cleanup_intern();
+ int_obj_cleanup();
}
OBJ_sigid_free();
}
* 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;
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
}
#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);
} /* 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);
#include <openssl/objects.h>
-void obj_cleanup_intern(void);
+void int_obj_cleanup(void);
#include <openssl/rand.h>
-void rand_cleanup_intern(void);
+void int_rand_cleanup(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;
}
#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();
#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();
{
#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;
}
{
# 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))
{
# 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
{
# 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;
{
# 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)
{
# 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)
{
# 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;
{
# 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;
{
# 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
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
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;
}
}
/*
- * 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;
obj_cleanup_defer = 1;
}
-void obj_cleanup_intern(void)
+void int_obj_cleanup(void)
{
if (obj_cleanup_defer) {
obj_cleanup_defer = 2;
}
#endif
-void rand_cleanup_intern(void)
+void int_rand_cleanup(void)
{
const RAND_METHOD *meth = RAND_get_rand_method();
if (meth && meth->cleanup)
#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 */
return ret;
}
-void engine_load_afalg_internal(void)
+void int_engine_load_afalg(void)
{
ENGINE *toadd;
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 *);
return ret;
}
-void engine_load_capi_internal(void)
+void int_engine_load_capi(void)
{
/* Copied from eng_[openssl|dyn].c */
ENGINE *toadd = engine_capi();
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
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 */
return ret;
}
-void engine_load_dasync_internal(void)
+void int_engine_load_dasync(void)
{
ENGINE *toadd = engine_dasync();
if (!toadd)
# 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
long (*callback_ctrl) (BIO *, int, bio_info_cb *);
};
-void bio_sock_cleanup_intern(void);
+void int_bio_sock_cleanup(void);
#include <openssl/comp.h>
-void comp_zlib_cleanup_internal(void);
+void int_comp_zlib_cleanup(void);
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
}
*
*/
-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);
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;
#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();
}
}
__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