Auto init/deinit libcrypto This builds on the previous commit to auto initialise/deinitialise libcrypto. Reviewed-by: Richard Levitte <levitte@openssl.org>
diff --git a/crypto/async/arch/async_null.c b/crypto/async/arch/async_null.c index d3f686f..2b1d28e 100644 --- a/crypto/async/arch/async_null.c +++ b/crypto/async/arch/async_null.c
@@ -80,11 +80,6 @@ return 0; } -int async_local_init(void) -{ - return 0; -} - void async_local_cleanup(void) { }
diff --git a/crypto/async/arch/async_null.h b/crypto/async/arch/async_null.h index 93887ae..4cd0a8b 100644 --- a/crypto/async/arch/async_null.h +++ b/crypto/async/arch/async_null.h
@@ -66,7 +66,7 @@ # define async_set_ctx(nctx) 0 -# define async_get_ctx() ((async_ctx *)NULL) +# define async_arch_get_ctx() ((async_ctx *)NULL) # define async_fibre_swapcontext(o,n,r) 0 # define async_fibre_makecontext(c) 0 # define async_fibre_free(f)
diff --git a/crypto/async/arch/async_posix.c b/crypto/async/arch/async_posix.c index 1df77cc..57cce7b 100644 --- a/crypto/async/arch/async_posix.c +++ b/crypto/async/arch/async_posix.c
@@ -72,14 +72,6 @@ return 1; } -int async_local_init(void) -{ - if (!async_set_ctx(NULL) || ! async_set_pool(NULL)) - return 0; - - return 1; -} - void async_local_cleanup(void) { }
diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h index 85d033f..7f1bdd1 100644 --- a/crypto/async/arch/async_posix.h +++ b/crypto/async/arch/async_posix.h
@@ -78,7 +78,7 @@ } async_fibre; # define async_set_ctx(nctx) (pthread_setspecific(posixctx , (nctx)) == 0) -# define async_get_ctx() ((async_ctx *)pthread_getspecific(posixctx)) +# define async_arch_get_ctx() ((async_ctx *)pthread_getspecific(posixctx)) # define async_set_pool(p) (pthread_setspecific(posixpool , (p)) == 0) # define async_get_pool() ((async_pool *)pthread_getspecific(posixpool))
diff --git a/crypto/async/arch/async_win.c b/crypto/async/arch/async_win.c index f3de79a..3f3a005 100644 --- a/crypto/async/arch/async_win.c +++ b/crypto/async/arch/async_win.c
@@ -66,7 +66,6 @@ static DWORD asyncwinpool = 0; static DWORD asyncwinctx = 0; -static DWORD asyncwindispatch = 0; void async_start_func(void); @@ -75,33 +74,22 @@ { asyncwinpool = TlsAlloc(); asyncwinctx = TlsAlloc(); - asyncwindispatch = TlsAlloc(); - if (asyncwinpool == TLS_OUT_OF_INDEXES || asyncwinctx == TLS_OUT_OF_INDEXES - || asyncwindispatch == TLS_OUT_OF_INDEXES) { + if (asyncwinpool == TLS_OUT_OF_INDEXES + || asyncwinctx == TLS_OUT_OF_INDEXES) { if (asyncwinpool != TLS_OUT_OF_INDEXES) { TlsFree(asyncwinpool); } if (asyncwinctx != TLS_OUT_OF_INDEXES) { TlsFree(asyncwinctx); } - if (asyncwindispatch != TLS_OUT_OF_INDEXES) { - TlsFree(asyncwindispatch); - } return 0; } return 1; } -int async_local_init(void) -{ - return (TlsSetValue(asyncwinpool, NULL) != 0) - && (TlsSetValue(asyncwinctx, NULL) != 0) - && (TlsSetValue(asyncwindispatch, NULL) != 0); -} - void async_local_cleanup(void) { - async_ctx *ctx = async_get_ctx(); + async_ctx *ctx = async_arch_get_ctx(); if (ctx != NULL) { async_fibre *fibre = &ctx->dispatcher; if(fibre != NULL && fibre->fibre != NULL && fibre->converted) { @@ -115,32 +103,24 @@ { TlsFree(asyncwinpool); TlsFree(asyncwinctx); - TlsFree(asyncwindispatch); asyncwinpool = 0; asyncwinctx = 0; - asyncwindispatch = 0; } int async_fibre_init_dispatcher(async_fibre *fibre) { LPVOID dispatcher; - dispatcher = (LPVOID)TlsGetValue(asyncwindispatch); - if (dispatcher == NULL) { - fibre->fibre = ConvertThreadToFiber(NULL); - if (fibre->fibre == NULL) { - fibre->converted = 0; - fibre->fibre = GetCurrentFiber(); - if (fibre->fibre == NULL) - return 0; - } else { - fibre->converted = 1; - } - if (TlsSetValue(asyncwindispatch, (LPVOID)fibre->fibre) == 0) + fibre->fibre = ConvertThreadToFiber(NULL); + if (fibre->fibre == NULL) { + fibre->converted = 0; + fibre->fibre = GetCurrentFiber(); + if (fibre->fibre == NULL) return 0; } else { - fibre->fibre = dispatcher; + fibre->converted = 1; } + return 1; } @@ -196,7 +176,7 @@ return TlsSetValue(asyncwinpool, (LPVOID)pool) != 0; } -async_ctx *async_get_ctx(void) +async_ctx *async_arch_get_ctx(void) { return (async_ctx *)TlsGetValue(asyncwinctx); }
diff --git a/crypto/async/arch/async_win.h b/crypto/async/arch/async_win.h index fa345cb..87e30a4 100644 --- a/crypto/async/arch/async_win.h +++ b/crypto/async/arch/async_win.h
@@ -73,7 +73,7 @@ ((c)->fibre = CreateFiber(0, async_start_func_win, 0)) # define async_fibre_free(f) (DeleteFiber((f)->fibre)) -async_ctx *async_get_ctx(void); +async_ctx *async_arch_get_ctx(void); int async_set_ctx(async_ctx *ctx); int async_fibre_init_dispatcher(async_fibre *fibre);
diff --git a/crypto/async/async.c b/crypto/async/async.c index 9d68a7c..024aaf6 100644 --- a/crypto/async/async.c +++ b/crypto/async/async.c
@@ -62,6 +62,7 @@ #include "async_locl.h" #include <openssl/err.h> +#include <internal/cryptlib_int.h> #include <string.h> #define ASYNC_JOB_RUNNING 0 @@ -94,6 +95,12 @@ return NULL; } +static async_ctx *async_get_ctx(void) +{ + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ASYNC, NULL); + return async_arch_get_ctx(); +} + static int async_ctx_free(void) { async_ctx *ctx; @@ -191,16 +198,17 @@ void async_start_func(void) { ASYNC_JOB *job; + async_ctx *ctx = async_get_ctx(); while (1) { /* Run the job */ - job = async_get_ctx()->currjob; + job = ctx->currjob; job->ret = job->func(job->funcargs); /* Stop the job */ job->status = ASYNC_JOB_STOPPING; if (!async_fibre_swapcontext(&job->fibrectx, - &async_get_ctx()->dispatcher, 1)) { + &ctx->dispatcher, 1)) { /* * Should not happen. Getting here will close the thread...can't do * much about it @@ -213,36 +221,39 @@ int ASYNC_start_job(ASYNC_JOB **job, int *ret, int (*func)(void *), void *args, size_t size) { - if (async_get_ctx() == NULL && async_ctx_new() == NULL) { + async_ctx *ctx = async_get_ctx(); + if (ctx == NULL) + ctx = async_ctx_new(); + if (ctx == NULL) { return ASYNC_ERR; } if (*job) { - async_get_ctx()->currjob = *job; + ctx->currjob = *job; } for (;;) { - if (async_get_ctx()->currjob != NULL) { - if (async_get_ctx()->currjob->status == ASYNC_JOB_STOPPING) { - *ret = async_get_ctx()->currjob->ret; - async_release_job(async_get_ctx()->currjob); - async_get_ctx()->currjob = NULL; + if (ctx->currjob != NULL) { + if (ctx->currjob->status == ASYNC_JOB_STOPPING) { + *ret = ctx->currjob->ret; + async_release_job(ctx->currjob); + ctx->currjob = NULL; *job = NULL; return ASYNC_FINISH; } - if (async_get_ctx()->currjob->status == ASYNC_JOB_PAUSING) { - *job = async_get_ctx()->currjob; - async_get_ctx()->currjob->status = ASYNC_JOB_PAUSED; - async_get_ctx()->currjob = NULL; + if (ctx->currjob->status == ASYNC_JOB_PAUSING) { + *job = ctx->currjob; + ctx->currjob->status = ASYNC_JOB_PAUSED; + ctx->currjob = NULL; return ASYNC_PAUSE; } - if (async_get_ctx()->currjob->status == ASYNC_JOB_PAUSED) { - async_get_ctx()->currjob = *job; + if (ctx->currjob->status == ASYNC_JOB_PAUSED) { + ctx->currjob = *job; /* Resume previous job */ - if (!async_fibre_swapcontext(&async_get_ctx()->dispatcher, - &async_get_ctx()->currjob->fibrectx, 1)) { + if (!async_fibre_swapcontext(&ctx->dispatcher, + &ctx->currjob->fibrectx, 1)) { ASYNCerr(ASYNC_F_ASYNC_START_JOB, ASYNC_R_FAILED_TO_SWAP_CONTEXT); goto err; @@ -252,41 +263,41 @@ /* Should not happen */ ASYNCerr(ASYNC_F_ASYNC_START_JOB, ERR_R_INTERNAL_ERROR); - async_release_job(async_get_ctx()->currjob); - async_get_ctx()->currjob = NULL; + async_release_job(ctx->currjob); + ctx->currjob = NULL; *job = NULL; return ASYNC_ERR; } /* Start a new job */ - if ((async_get_ctx()->currjob = async_get_pool_job()) == NULL) { + if ((ctx->currjob = async_get_pool_job()) == NULL) { return ASYNC_NO_JOBS; } if (args != NULL) { - async_get_ctx()->currjob->funcargs = OPENSSL_malloc(size); - if (async_get_ctx()->currjob->funcargs == NULL) { + ctx->currjob->funcargs = OPENSSL_malloc(size); + if (ctx->currjob->funcargs == NULL) { ASYNCerr(ASYNC_F_ASYNC_START_JOB, ERR_R_MALLOC_FAILURE); - async_release_job(async_get_ctx()->currjob); - async_get_ctx()->currjob = NULL; + async_release_job(ctx->currjob); + ctx->currjob = NULL; return ASYNC_ERR; } - memcpy(async_get_ctx()->currjob->funcargs, args, size); + memcpy(ctx->currjob->funcargs, args, size); } else { - async_get_ctx()->currjob->funcargs = NULL; + ctx->currjob->funcargs = NULL; } - async_get_ctx()->currjob->func = func; - if (!async_fibre_swapcontext(&async_get_ctx()->dispatcher, - &async_get_ctx()->currjob->fibrectx, 1)) { + ctx->currjob->func = func; + if (!async_fibre_swapcontext(&ctx->dispatcher, + &ctx->currjob->fibrectx, 1)) { ASYNCerr(ASYNC_F_ASYNC_START_JOB, ASYNC_R_FAILED_TO_SWAP_CONTEXT); goto err; } } err: - async_release_job(async_get_ctx()->currjob); - async_get_ctx()->currjob = NULL; + async_release_job(ctx->currjob); + ctx->currjob = NULL; *job = NULL; return ASYNC_ERR; } @@ -295,10 +306,11 @@ int ASYNC_pause_job(void) { ASYNC_JOB *job; + async_ctx *ctx = async_get_ctx(); - if (async_get_ctx() == NULL - || async_get_ctx()->currjob == NULL - || async_get_ctx()->blocked) { + if (ctx == NULL + || ctx->currjob == NULL + || ctx->blocked) { /* * Could be we've deliberately not been started within a job so this is * counted as success. @@ -306,11 +318,11 @@ return 1; } - job = async_get_ctx()->currjob; + job = ctx->currjob; job->status = ASYNC_JOB_PAUSING; if (!async_fibre_swapcontext(&job->fibrectx, - &async_get_ctx()->dispatcher, 1)) { + &ctx->dispatcher, 1)) { ASYNCerr(ASYNC_F_ASYNC_PAUSE_JOB, ASYNC_R_FAILED_TO_SWAP_CONTEXT); return 0; } @@ -331,14 +343,11 @@ } while (job); } -int ASYNC_init(int init_thread, size_t max_size, size_t init_size) +int async_init(void) { if (!async_global_init()) return 0; - if (init_thread) - return ASYNC_init_thread(max_size, init_size); - return 1; } @@ -352,10 +361,12 @@ return 0; } - if (!async_local_init()) { - ASYNCerr(ASYNC_F_ASYNC_INIT_THREAD, ASYNC_R_INIT_FAILED); + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ASYNC, NULL); + if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC)) { + ASYNCerr(ASYNC_F_ASYNC_INIT_THREAD, ERR_R_MALLOC_FAILURE); return 0; } + pool = OPENSSL_zalloc(sizeof *pool); if (pool == NULL) { ASYNCerr(ASYNC_F_ASYNC_INIT_THREAD, ERR_R_MALLOC_FAILURE); @@ -417,16 +428,6 @@ async_free_pool_internal(async_get_pool()); } -void ASYNC_cleanup(int cleanupthread) -{ - /* - * We don't actually have any global cleanup at the moment so just cleanup - * the thread - */ - if (cleanupthread) - ASYNC_cleanup_thread(); -} - ASYNC_JOB *ASYNC_get_current_job(void) { async_ctx *ctx; @@ -464,25 +465,25 @@ void ASYNC_block_pause(void) { - if (async_get_ctx() == NULL - || async_get_ctx()->currjob == NULL) { + async_ctx *ctx = async_get_ctx(); + if (ctx == NULL || ctx->currjob == NULL) { /* * We're not in a job anyway so ignore this */ return; } - async_get_ctx()->blocked++; + ctx->blocked++; } void ASYNC_unblock_pause(void) { - if (async_get_ctx() == NULL - || async_get_ctx()->currjob == NULL) { + async_ctx *ctx = async_get_ctx(); + if (ctx == NULL || ctx->currjob == NULL) { /* * We're not in a job anyway so ignore this */ return; } - if(async_get_ctx()->blocked > 0) - async_get_ctx()->blocked--; + if(ctx->blocked > 0) + ctx->blocked--; }
diff --git a/crypto/async/async_locl.h b/crypto/async/async_locl.h index 0710f9e..53a192b 100644 --- a/crypto/async/async_locl.h +++ b/crypto/async/async_locl.h
@@ -59,7 +59,7 @@ # pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif -#include <openssl/async.h> +#include <internal/async.h> #include <openssl/crypto.h> typedef struct async_ctx_st async_ctx; @@ -95,7 +95,6 @@ }; int async_global_init(void); -int async_local_init(void); void async_local_cleanup(void); void async_global_cleanup(void); void async_start_func(void);
diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c index a2a811d..899dadf 100644 --- a/crypto/comp/c_zlib.c +++ b/crypto/comp/c_zlib.c
@@ -58,6 +58,7 @@ #include <openssl/objects.h> #include <openssl/comp.h> #include <openssl/err.h> +#include <internal/cryptlib_int.h> #include "comp_lcl.h" COMP_METHOD *COMP_zlib(void); @@ -290,6 +291,7 @@ zlib_loaded++; if (zlib_loaded) meth = &zlib_stateful_method; + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ZLIB, NULL); } } #endif
diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index fead451..bb1dcc5 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c
@@ -59,7 +59,7 @@ #include <stdio.h> #include <openssl/crypto.h> #include "internal/cryptlib.h" -#include <openssl/conf.h> +#include <internal/conf.h> #include <openssl/dso.h> #include <openssl/x509.h> #include <openssl/asn1.h> @@ -77,6 +77,16 @@ void OPENSSL_config(const char *config_name) { + const OPENSSL_INIT_SETTINGS settings[2] = { + { OPENSSL_INIT_SET_CONF_FILENAME, .value.type_string = config_name }, + { OPENSSL_INIT_SET_END, .value.type_int = 0 } + }; + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_LOAD_CONFIG, + (const OPENSSL_INIT_SETTINGS *)&settings); +} + +void openssl_config_internal(const char *config_name) +{ if (openssl_configured) return; @@ -94,7 +104,7 @@ openssl_configured = 1; } -void OPENSSL_no_config() +void openssl_no_config_internal(void) { openssl_configured = 1; }
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index bd58d35..138708b 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c
@@ -113,7 +113,7 @@ * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. */ -#include "internal/cryptlib.h" +#include "internal/cryptlib_int.h" #include <openssl/safestack.h> #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ @@ -234,6 +234,8 @@ case DLL_THREAD_ATTACH: break; case DLL_THREAD_DETACH: + ossl_init_thread_stop( + (struct thread_local_inits_st *)ossl_init_get_thread_local(0)); break; case DLL_PROCESS_DETACH: break;
diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c index eb8a8bb..eb25790 100644 --- a/crypto/engine/eng_cryptodev.c +++ b/crypto/engine/eng_cryptodev.c
@@ -27,9 +27,10 @@ */ #include <openssl/objects.h> -#include <openssl/engine.h> +#include <internal/engine.h> #include <openssl/evp.h> #include <openssl/bn.h> +#include <openssl/crypto.h> #if (defined(__unix__) || defined(unix)) && !defined(USG) && \ (defined(OpenBSD) || defined(__FreeBSD__)) @@ -64,7 +65,7 @@ #ifndef HAVE_CRYPTODEV -void ENGINE_load_cryptodev(void) +void engine_load_cryptodev_internal(void) { /* This is a NOP on platforms without /dev/crypto */ return; @@ -136,7 +137,7 @@ #endif static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void)); -void ENGINE_load_cryptodev(void); +void engine_load_cryptodev_internal(void); static const ENGINE_CMD_DEFN cryptodev_defns[] = { {0, NULL, NULL, 0} @@ -1619,7 +1620,7 @@ return (1); } -void ENGINE_load_cryptodev(void) +void engine_load_cryptodev_internal(void) { ENGINE *engine = ENGINE_new(); int fd;
diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c index 607317b..3ca2480 100644 --- a/crypto/engine/eng_dyn.c +++ b/crypto/engine/eng_dyn.c
@@ -58,6 +58,7 @@ #include "eng_int.h" #include <openssl/dso.h> +#include <openssl/crypto.h> /* * Shared libraries implementing ENGINEs for use by the "dynamic" ENGINE @@ -294,7 +295,7 @@ return ret; } -void ENGINE_load_dynamic(void) +void engine_load_dynamic_internal(void) { ENGINE *toadd = engine_dynamic(); if (!toadd)
diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h index 804214d..9d58d93 100644 --- a/crypto/engine/eng_int.h +++ b/crypto/engine/eng_int.h
@@ -65,8 +65,7 @@ # define HEADER_ENGINE_INT_H # include "internal/cryptlib.h" -/* Take public definitions from engine.h */ -# include <openssl/engine.h> +# include <internal/engine.h> #ifdef __cplusplus extern "C" {
diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index 8540673..152c188 100644 --- a/crypto/engine/eng_openssl.c +++ b/crypto/engine/eng_openssl.c
@@ -64,7 +64,7 @@ #include <stdio.h> #include <openssl/crypto.h> #include "internal/cryptlib.h" -#include <openssl/engine.h> +#include <internal/engine.h> #include <openssl/dso.h> #include <openssl/pem.h> #include <openssl/evp.h> @@ -196,7 +196,7 @@ return ret; } -void ENGINE_load_openssl(void) +void engine_load_openssl_internal(void) { ENGINE *toadd = engine_openssl(); if (!toadd)
diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c index 48726e2..1be10db 100644 --- a/crypto/engine/eng_rdrand.c +++ b/crypto/engine/eng_rdrand.c
@@ -51,9 +51,10 @@ #include <stdio.h> #include <string.h> -#include <openssl/engine.h> +#include <internal/engine.h> #include <openssl/rand.h> #include <openssl/err.h> +#include <openssl/crypto.h> #if (defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__x86_64) || defined(__x86_64__) || \ @@ -129,7 +130,7 @@ return ret; } -void ENGINE_load_rdrand(void) +void engine_load_rdrand_internal(void) { extern unsigned int OPENSSL_ia32cap_P[]; @@ -143,7 +144,7 @@ } } #else -void ENGINE_load_rdrand(void) +void engine_load_rdrand_internal(void) { } #endif
diff --git a/crypto/err/err.c b/crypto/err/err.c index 64f8adc..7e8bcc1 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c
@@ -111,7 +111,7 @@ #include <stdio.h> #include <stdarg.h> #include <string.h> -#include "internal/cryptlib.h" +#include <internal/cryptlib_int.h> #include <openssl/lhash.h> #include <openssl/crypto.h> #include <openssl/buffer.h> @@ -894,6 +894,10 @@ * the first one that we just replaced. */ ERR_STATE_free(tmpp); + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, + NULL); + /* Ignore failures from this */ + ossl_init_thread_start(OPENSSL_INIT_THREAD_ERR_STATE); } return ret; }
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 6309733..ffb1b83 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c
@@ -56,6 +56,7 @@ */ #include <stdio.h> +#include <internal/err.h> #include <openssl/asn1.h> #include <openssl/bn.h> #ifndef OPENSSL_NO_EC @@ -103,7 +104,7 @@ #include <internal/ct_int.h> #include <openssl/async.h> -void ERR_load_crypto_strings(void) +void err_load_crypto_strings_intern(void) { #ifdef OPENSSL_FIPS FIPS_set_error_callbacks(ERR_put_error, ERR_add_error_vdata);
diff --git a/crypto/evp/Makefile.in b/crypto/evp/Makefile.in index 8771a20..61e8929 100644 --- a/crypto/evp/Makefile.in +++ b/crypto/evp/Makefile.in
@@ -15,7 +15,7 @@ GENERAL=Makefile LIB=$(TOP)/libcrypto.a -LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c evp_cnf.c \ +LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_cnf.c \ e_des.c e_bf.c e_idea.c e_des3.c e_camellia.c\ e_rc4.c e_aes.c names.c e_seed.c \ e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \ @@ -23,13 +23,13 @@ m_md5_sha1.c m_mdc2.c m_ripemd.c \ p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \ bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \ - c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \ + c_allc.c c_alld.c evp_lib.c bio_ok.c \ evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c scrypt.c \ e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c \ e_aes_cbc_hmac_sha1.c e_aes_cbc_hmac_sha256.c e_rc4_hmac_md5.c \ e_chacha20_poly1305.c cmeth_lib.c -LIBOBJ= encode.o digest.o evp_enc.o evp_key.o evp_acnf.o evp_cnf.o \ +LIBOBJ= encode.o digest.o evp_enc.o evp_key.o evp_cnf.o \ e_des.o e_bf.o e_idea.o e_des3.o e_camellia.o\ e_rc4.o e_aes.o names.o e_seed.o \ e_xcbc_d.o e_rc2.o e_cast.o e_rc5.o \ @@ -37,7 +37,7 @@ m_md5_sha1.o m_mdc2.o m_ripemd.o \ p_open.o p_seal.o p_sign.o p_verify.o p_lib.o p_enc.o p_dec.o \ bio_md.o bio_b64.o bio_enc.o evp_err.o e_null.o \ - c_all.o c_allc.o c_alld.o evp_lib.o bio_ok.o \ + c_allc.o c_alld.o evp_lib.o bio_ok.o \ evp_pkey.o evp_pbe.o p5_crpt.o p5_crpt2.o scrypt.o \ e_old.o pmeth_lib.o pmeth_fn.o pmeth_gn.o m_sigver.o \ e_aes_cbc_hmac_sha1.o e_aes_cbc_hmac_sha256.o e_rc4_hmac_md5.o \
diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c deleted file mode 100644 index 6dd2bc7..0000000 --- a/crypto/evp/c_all.c +++ /dev/null
@@ -1,80 +0,0 @@ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include <stdio.h> -#include "internal/cryptlib.h" -#include <openssl/evp.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif - -void OPENSSL_add_all_algorithms_noconf(void) -{ - /* - * For the moment OPENSSL_cpuid_setup does something - * only on IA-32, but we reserve the option for all - * platforms... - */ - OPENSSL_cpuid_setup(); - OpenSSL_add_all_ciphers(); - OpenSSL_add_all_digests(); -#ifndef OPENSSL_NO_ENGINE -# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) - ENGINE_setup_bsd_cryptodev(); -# endif -#endif -}
diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c index b59c33e..be6baf6 100644 --- a/crypto/evp/c_allc.c +++ b/crypto/evp/c_allc.c
@@ -58,10 +58,11 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/evp.h> +#include <internal/evp_int.h> #include <openssl/pkcs12.h> #include <openssl/objects.h> -void OpenSSL_add_all_ciphers(void) +void openssl_add_all_ciphers_internal(void) { #ifndef OPENSSL_NO_DES
diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c index 4309a0c..e28ba3d 100644 --- a/crypto/evp/c_alld.c +++ b/crypto/evp/c_alld.c
@@ -58,10 +58,11 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/evp.h> +#include <internal/evp_int.h> #include <openssl/pkcs12.h> #include <openssl/objects.h> -void OpenSSL_add_all_digests(void) +void openssl_add_all_digests_internal(void) { #ifndef OPENSSL_NO_MD4 EVP_add_digest(EVP_md4());
diff --git a/crypto/evp/names.c b/crypto/evp/names.c index 610e0f5..97a37a5 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c
@@ -110,6 +110,8 @@ { const EVP_CIPHER *cp; + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL); + cp = (const EVP_CIPHER *)OBJ_NAME_get(name, OBJ_NAME_TYPE_CIPHER_METH); return (cp); } @@ -118,6 +120,8 @@ { const EVP_MD *cp; + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); + cp = (const EVP_MD *)OBJ_NAME_get(name, OBJ_NAME_TYPE_MD_METH); return (cp); } @@ -161,6 +165,9 @@ void *arg) { struct doall_cipher dc; + + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL); + dc.fn = fn; dc.arg = arg; OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc); @@ -171,6 +178,9 @@ void *x), void *arg) { struct doall_cipher dc; + + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL); + dc.fn = fn; dc.arg = arg; OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc); @@ -196,6 +206,9 @@ void *arg) { struct doall_md dc; + + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); + dc.fn = fn; dc.arg = arg; OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc); @@ -206,6 +219,9 @@ void *x), void *arg) { struct doall_md dc; + + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); + dc.fn = fn; dc.arg = arg; OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc);
diff --git a/crypto/evp/evp_acnf.c b/crypto/include/internal/async.h similarity index 83% copy from crypto/evp/evp_acnf.c copy to crypto/include/internal/async.h index 285be1f..8242800 100644 --- a/crypto/evp/evp_acnf.c +++ b/crypto/include/internal/async.h
@@ -1,9 +1,8 @@ /* - * Written by Stephen Henson (steve@openssl.org) for the OpenSSL project - * 2001. + * Written by Matt Caswell for the OpenSSL project */ /* ==================================================================== - * Copyright (c) 2001 The OpenSSL Project. All rights reserved. + * Copyright (c) 2015 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -56,17 +55,7 @@ * */ -#include "internal/cryptlib.h" -#include <openssl/evp.h> -#include <openssl/conf.h> +#include <openssl/async.h> -/* - * Load all algorithms and configure OpenSSL. This function is called - * automatically when OPENSSL_LOAD_CONF is set. - */ +int async_init(void); -void OPENSSL_add_all_algorithms_conf(void) -{ - OPENSSL_add_all_algorithms_noconf(); - OPENSSL_config(NULL); -}
diff --git a/crypto/evp/evp_acnf.c b/crypto/include/internal/conf.h similarity index 84% rename from crypto/evp/evp_acnf.c rename to crypto/include/internal/conf.h index 285be1f..8feaf62 100644 --- a/crypto/evp/evp_acnf.c +++ b/crypto/include/internal/conf.h
@@ -1,9 +1,8 @@ /* - * Written by Stephen Henson (steve@openssl.org) for the OpenSSL project - * 2001. + * Written by Matt Caswell for the OpenSSL project */ /* ==================================================================== - * Copyright (c) 2001 The OpenSSL Project. All rights reserved. + * Copyright (c) 2015 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -56,17 +55,8 @@ * */ -#include "internal/cryptlib.h" -#include <openssl/evp.h> #include <openssl/conf.h> -/* - * Load all algorithms and configure OpenSSL. This function is called - * automatically when OPENSSL_LOAD_CONF is set. - */ +void openssl_config_internal(const char *config_name); +void openssl_no_config_internal(void); -void OPENSSL_add_all_algorithms_conf(void) -{ - OPENSSL_add_all_algorithms_noconf(); - OPENSSL_config(NULL); -}
diff --git a/crypto/evp/evp_acnf.c b/crypto/include/internal/engine.h similarity index 83% copy from crypto/evp/evp_acnf.c copy to crypto/include/internal/engine.h index 285be1f..4b70e55 100644 --- a/crypto/evp/evp_acnf.c +++ b/crypto/include/internal/engine.h
@@ -1,9 +1,5 @@ -/* - * Written by Stephen Henson (steve@openssl.org) for the OpenSSL project - * 2001. - */ /* ==================================================================== - * Copyright (c) 2001 The OpenSSL Project. All rights reserved. + * Copyright (c) 2016 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -56,17 +52,12 @@ * */ -#include "internal/cryptlib.h" -#include <openssl/evp.h> -#include <openssl/conf.h> +#include <openssl/engine.h> -/* - * Load all algorithms and configure OpenSSL. This function is called - * automatically when OPENSSL_LOAD_CONF is set. - */ - -void OPENSSL_add_all_algorithms_conf(void) -{ - OPENSSL_add_all_algorithms_noconf(); - OPENSSL_config(NULL); -} +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);
diff --git a/crypto/evp/evp_acnf.c b/crypto/include/internal/err.h similarity index 78% copy from crypto/evp/evp_acnf.c copy to crypto/include/internal/err.h index 285be1f..aa48019 100644 --- a/crypto/evp/evp_acnf.c +++ b/crypto/include/internal/err.h
@@ -1,9 +1,8 @@ /* - * Written by Stephen Henson (steve@openssl.org) for the OpenSSL project - * 2001. + * Written by Matt Caswell for the OpenSSL project. */ /* ==================================================================== - * Copyright (c) 2001 The OpenSSL Project. All rights reserved. + * Copyright (c) 2016 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -20,12 +19,12 @@ * 3. All advertising materials mentioning features or use of this * software must display the following acknowledgment: * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" + * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" * * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to * endorse or promote products derived from this software without * prior written permission. For written permission, please contact - * licensing@OpenSSL.org. + * openssl-core@openssl.org. * * 5. Products derived from this software may not be called "OpenSSL" * nor may "OpenSSL" appear in their names without prior written @@ -34,7 +33,7 @@ * 6. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" + * for use in the OpenSSL Toolkit (http://www.openssl.org/)" * * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -56,17 +55,4 @@ * */ -#include "internal/cryptlib.h" -#include <openssl/evp.h> -#include <openssl/conf.h> - -/* - * Load all algorithms and configure OpenSSL. This function is called - * automatically when OPENSSL_LOAD_CONF is set. - */ - -void OPENSSL_add_all_algorithms_conf(void) -{ - OPENSSL_add_all_algorithms_noconf(); - OPENSSL_config(NULL); -} +void err_load_crypto_strings_intern(void);
diff --git a/crypto/include/internal/evp_int.h b/crypto/include/internal/evp_int.h index 24c6870..2c9b2a3 100644 --- a/crypto/include/internal/evp_int.h +++ b/crypto/include/internal/evp_int.h
@@ -415,3 +415,7 @@ int save_parameters; STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */ } /* EVP_PKEY */ ; + + +void openssl_add_all_ciphers_internal(void); +void openssl_add_all_digests_internal(void);
diff --git a/crypto/init.c b/crypto/init.c index 8950ff6..53ed235 100644 --- a/crypto/init.c +++ b/crypto/init.c
@@ -69,19 +69,12 @@ #include <internal/cryptlib_int.h> #include <openssl/err.h> #include <openssl/evp.h> -#if 0 #include <internal/evp_int.h> #include <internal/conf.h> #include <internal/async.h> #include <internal/engine.h> -#endif -#include <openssl/conf.h> -#include <openssl/async.h> -#include <openssl/engine.h> #include <openssl/comp.h> -#if 0 #include <internal/err.h> -#endif #include <stdlib.h> /* Implement "once" functionality */ @@ -292,10 +285,8 @@ fprintf(stderr, "OPENSSL_INIT: ossl_init_load_crypto_strings: " "err_load_crypto_strings_intern()\n"); # endif -#if 0 err_load_crypto_strings_intern(); #endif -#endif load_crypto_strings_inited = 1; } @@ -311,9 +302,7 @@ fprintf(stderr, "OPENSSL_INIT: ossl_init_add_all_ciphers: " "openssl_add_all_ciphers_internal()\n"); # endif -#if 0 openssl_add_all_ciphers_internal(); -#endif # ifndef OPENSSL_NO_ENGINE # if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) ENGINE_setup_bsd_cryptodev(); @@ -334,9 +323,7 @@ fprintf(stderr, "OPENSSL_INIT: ossl_init_add_all_digests: " "openssl_add_all_digests_internal()\n"); # endif -#if 0 openssl_add_all_digests_internal(); -#endif # ifndef OPENSSL_NO_ENGINE # if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) ENGINE_setup_bsd_cryptodev(); @@ -361,9 +348,7 @@ "OPENSSL_INIT: ossl_init_config: openssl_config_internal(%s)\n", config_filename==NULL?"NULL":config_filename); #endif -#if 0 openssl_config_internal(config_filename); -#endif config_inited = 1; } static void ossl_init_no_config(void) @@ -372,9 +357,7 @@ fprintf(stderr, "OPENSSL_INIT: ossl_init_config: openssl_no_config_internal()\n"); #endif -#if 0 openssl_no_config_internal(); -#endif config_inited = 1; } @@ -385,9 +368,7 @@ #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_async: async_init()\n"); #endif -#if 0 async_init(); -#endif async_inited = 1; } @@ -400,9 +381,7 @@ fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_openssl: " "engine_load_openssl_internal()\n"); # endif -#if 0 engine_load_openssl_internal(); -#endif engine_inited = 1; } # if !defined(OPENSSL_NO_HW) && \ @@ -414,9 +393,7 @@ fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_cryptodev: " "engine_load_cryptodev_internal()\n"); # endif -#if 0 engine_load_cryptodev_internal(); -#endif engine_inited = 1; } # endif @@ -429,9 +406,7 @@ fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_rdrand: " "engine_load_rdrand_internal()\n"); # endif -#if 0 engine_load_rdrand_internal(); -#endif engine_inited = 1; } # endif @@ -442,9 +417,7 @@ fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_dynamic: " "engine_load_dynamic_internal()\n"); # endif -#if 0 engine_load_dynamic_internal(); -#endif engine_inited = 1; } # ifndef OPENSSL_NO_STATIC_ENGINE @@ -456,9 +429,7 @@ fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_padlock: " "engine_load_padlock_internal()\n"); # endif -#if 0 engine_load_padlock_internal(); -#endif engine_inited = 1; } # endif @@ -470,9 +441,7 @@ fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_capi: " "engine_load_capi_internal()\n"); # endif -#if 0 engine_load_capi_internal(); -#endif engine_inited = 1; } # endif @@ -483,9 +452,7 @@ fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_dasync: " "engine_load_dasync_internal()\n"); # endif -#if 0 engine_load_dasync_internal(); -#endif engine_inited = 1; } # endif
diff --git a/crypto/lock.c b/crypto/lock.c index 2ac74b5..0925214 100644 --- a/crypto/lock.c +++ b/crypto/lock.c
@@ -163,7 +163,8 @@ "comp", "fips", "fips2", -#if CRYPTO_NUM_LOCKS != 41 + "init", +#if CRYPTO_NUM_LOCKS != 42 # error "Inconsistency between crypto.h and cryptlib.c" #endif };