diff options
author | Rich Salz <rsalz@akamai.com> | 2016-02-09 11:52:40 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-02-10 09:37:03 -0500 |
commit | f672aee49450e03e7b1a26c8701d0be720e9ae0e (patch) | |
tree | 3f0eacb640d461102a8962d3a663a6e17df70fd6 /crypto | |
parent | ea7736a0930d8c9dd3d4d1a3b3e001ff56364bd6 (diff) |
Rename INIT funtions, deprecate old ones.
Man, there were a lot of renamings :)
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/async/async.c | 4 | ||||
-rw-r--r-- | crypto/comp/c_zlib.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_sap.c | 2 | ||||
-rw-r--r-- | crypto/cryptlib.c | 2 | ||||
-rw-r--r-- | crypto/err/err.c | 3 | ||||
-rw-r--r-- | crypto/evp/names.c | 12 | ||||
-rw-r--r-- | crypto/include/internal/conf.h | 62 | ||||
-rw-r--r-- | crypto/init.c | 17 | ||||
-rw-r--r-- | crypto/mem_dbg.c | 2 |
9 files changed, 21 insertions, 85 deletions
diff --git a/crypto/async/async.c b/crypto/async/async.c index 024aaf6122..db511442ba 100644 --- a/crypto/async/async.c +++ b/crypto/async/async.c @@ -97,7 +97,7 @@ err: static async_ctx *async_get_ctx(void) { - OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ASYNC, NULL); + OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL); return async_arch_get_ctx(); } @@ -361,7 +361,7 @@ int ASYNC_init_thread(size_t max_size, size_t init_size) return 0; } - OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ASYNC, NULL); + OPENSSL_init_crypto(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; diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c index 899dadfe21..619765ceff 100644 --- a/crypto/comp/c_zlib.c +++ b/crypto/comp/c_zlib.c @@ -291,7 +291,7 @@ COMP_METHOD *COMP_zlib(void) zlib_loaded++; if (zlib_loaded) meth = &zlib_stateful_method; - OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ZLIB, NULL); + OPENSSL_init_crypto(OPENSSL_INIT_ZLIB, NULL); } } #endif diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index e0d6c5aad9..3b42993143 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -83,7 +83,7 @@ void OPENSSL_config(const char *config_name) settings[0].value.type_string = config_name; settings[1].name = OPENSSL_INIT_SET_END; settings[1].value.type_int = 0; - OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_LOAD_CONFIG, settings); + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, settings); } void openssl_config_internal(const char *config_name) diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index b53081830f..1b2a365baa 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -234,7 +234,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_THREAD_ATTACH: break; case DLL_THREAD_DETACH: - OPENSSL_INIT_thread_stop(); + OPENSSL_thread_stop(); break; case DLL_PROCESS_DETACH: break; diff --git a/crypto/err/err.c b/crypto/err/err.c index 7e8bcc1cce..d92e41e3e9 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -894,8 +894,7 @@ ERR_STATE *ERR_get_state(void) * the first one that we just replaced. */ ERR_STATE_free(tmpp); - OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, - NULL); + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); /* Ignore failures from this */ ossl_init_thread_start(OPENSSL_INIT_THREAD_ERR_STATE); } diff --git a/crypto/evp/names.c b/crypto/evp/names.c index 97a37a5815..f6e5004471 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -110,7 +110,7 @@ const EVP_CIPHER *EVP_get_cipherbyname(const char *name) { const EVP_CIPHER *cp; - OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL); + OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL); cp = (const EVP_CIPHER *)OBJ_NAME_get(name, OBJ_NAME_TYPE_CIPHER_METH); return (cp); @@ -120,7 +120,7 @@ const EVP_MD *EVP_get_digestbyname(const char *name) { const EVP_MD *cp; - OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); + OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); cp = (const EVP_MD *)OBJ_NAME_get(name, OBJ_NAME_TYPE_MD_METH); return (cp); @@ -166,7 +166,7 @@ void EVP_CIPHER_do_all(void (*fn) (const EVP_CIPHER *ciph, { struct doall_cipher dc; - OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL); + OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL); dc.fn = fn; dc.arg = arg; @@ -179,7 +179,7 @@ void EVP_CIPHER_do_all_sorted(void (*fn) (const EVP_CIPHER *ciph, { struct doall_cipher dc; - OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL); + OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL); dc.fn = fn; dc.arg = arg; @@ -207,7 +207,7 @@ void EVP_MD_do_all(void (*fn) (const EVP_MD *md, { struct doall_md dc; - OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); + OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); dc.fn = fn; dc.arg = arg; @@ -220,7 +220,7 @@ void EVP_MD_do_all_sorted(void (*fn) (const EVP_MD *md, { struct doall_md dc; - OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); + OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); dc.fn = fn; dc.arg = arg; diff --git a/crypto/include/internal/conf.h b/crypto/include/internal/conf.h deleted file mode 100644 index 8feaf62328..0000000000 --- a/crypto/include/internal/conf.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Written by Matt Caswell for the OpenSSL project - */ -/* ==================================================================== - * 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 - * are met: - * - * 1. Redistributions of source code must retain the above 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 acknowledgment: - * "This product includes software developed by the OpenSSL Project - * 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. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 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/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED 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 OpenSSL PROJECT OR - * ITS 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. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - -#include <openssl/conf.h> - -void openssl_config_internal(const char *config_name); -void openssl_no_config_internal(void); - diff --git a/crypto/init.c b/crypto/init.c index e2f3583b45..04191ded62 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -268,7 +268,7 @@ static void ossl_init_base(void) fprintf(stderr, "OPENSSL_INIT: ossl_init_base: Setting up stop handlers\n"); #endif ossl_init_setup_thread_stop(); - atexit(OPENSSL_INIT_library_stop); + atexit(OPENSSL_cleanup); OPENSSL_cpuid_setup(); base_inited = 1; } @@ -499,7 +499,7 @@ static void ossl_init_thread_stop(struct thread_local_inits_st *locals) ossl_init_thread_stop_cleanup(); } -void OPENSSL_INIT_thread_stop(void) +void OPENSSL_thread_stop(void) { ossl_init_thread_stop( (struct thread_local_inits_st *)ossl_init_get_thread_local(0)); @@ -531,7 +531,7 @@ int ossl_init_thread_start(uint64_t opts) return 1; } -void OPENSSL_INIT_library_stop(void) +void OPENSSL_cleanup(void) { OPENSSL_INIT_STOP *currhandler, *lasthandler; @@ -565,7 +565,7 @@ void OPENSSL_INIT_library_stop(void) if (zlib_inited) { #ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "COMP_zlib_cleanup()\n"); #endif COMP_zlib_cleanup(); @@ -574,7 +574,7 @@ void OPENSSL_INIT_library_stop(void) #ifndef OPENSSL_NO_ENGINE if (engine_inited) { # ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "ENGINE_cleanup()\n"); # endif ENGINE_cleanup(); @@ -583,7 +583,7 @@ void OPENSSL_INIT_library_stop(void) if (load_crypto_strings_inited) { #ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "ERR_free_strings()\n"); #endif ERR_free_strings(); @@ -626,8 +626,7 @@ static const OPENSSL_INIT_SETTINGS *ossl_init_get_setting( * called prior to any threads making calls to any OpenSSL functions, * i.e. passing a non-null settings value is assumed to be single-threaded. */ -void OPENSSL_INIT_crypto_library_start(uint64_t opts, - const OPENSSL_INIT_SETTINGS *settings) +void OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) { /* XXX TODO WARNING To be updated to return a value not assert. */ assert(!stopped); @@ -719,7 +718,7 @@ void OPENSSL_INIT_crypto_library_start(uint64_t opts, } } -int OPENSSL_INIT_register_stop_handler(void (*handler)(void)) +int OPENSSL_atexit(void (*handler)(void)) { OPENSSL_INIT_STOP *newhand; diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index c3d98caec9..adabb2db95 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c @@ -640,7 +640,7 @@ int CRYPTO_mem_leaks(BIO *b) return 1; /* Ensure all resources are released */ - OPENSSL_INIT_library_stop(); + OPENSSL_cleanup(); CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE); |