X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=crypto%2Finit.c;h=f38129fa20e8c62de15c4a255956ab1fba3f7d8b;hb=5534c16a871523e385f328abe5f1fc520329e6e4;hp=fe1ecd876c795f40e41b155988a740ea5aa305b7;hpb=02a247e0fa23f2caa9c10df3adf3476eb9813c95;p=openssl.git diff --git a/crypto/init.c b/crypto/init.c index fe1ecd876c..f38129fa20 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -1,64 +1,16 @@ /* - * Written by Matt Caswell for the OpenSSL project. - */ -/* ==================================================================== - * 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 - * 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 - * 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 - * 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). + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html */ -#include #include #include -#include +#include +#include #include #include #include @@ -66,6 +18,8 @@ #include #include #include +#include +#include #include #include @@ -142,9 +96,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"); + "err_load_crypto_strings_int()\n"); # endif - err_load_crypto_strings_intern(); + err_load_crypto_strings_int(); #endif load_crypto_strings_inited = 1; } @@ -159,14 +113,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"); -# endif - openssl_add_all_ciphers_internal(); -# ifndef OPENSSL_NO_ENGINE -# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) - ENGINE_setup_bsd_cryptodev(); -# endif + "openssl_add_all_ciphers_int()\n"); # endif + openssl_add_all_ciphers_int(); #endif } @@ -180,14 +129,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"); -# endif - openssl_add_all_digests_internal(); -# ifndef OPENSSL_NO_ENGINE -# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) - ENGINE_setup_bsd_cryptodev(); -# endif + "openssl_add_all_digests()\n"); # endif + openssl_add_all_digests_int(); #endif } @@ -199,24 +143,24 @@ static void ossl_init_no_add_algs(void) static CRYPTO_ONCE config = CRYPTO_ONCE_STATIC_INIT; static int config_inited = 0; -static const char *config_filename; +static const char *appname; static void ossl_init_config(void) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, - "OPENSSL_INIT: ossl_init_config: openssl_config_internal(%s)\n", - config_filename==NULL?"NULL":config_filename); + "OPENSSL_INIT: ossl_init_config: openssl_config(%s)\n", + appname == NULL ? "NULL" : appname); #endif - openssl_config_internal(config_filename); + openssl_config_int(appname); 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: openssl_no_config_int()\n"); #endif - openssl_no_config_internal(); + openssl_no_config_int(); config_inited = 1; } @@ -237,9 +181,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"); + "engine_load_openssl_int()\n"); # endif - engine_load_openssl_internal(); + engine_load_openssl_int(); } # if !defined(OPENSSL_NO_HW) && \ (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)) @@ -248,9 +192,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"); + "engine_load_cryptodev_int()\n"); # endif - engine_load_cryptodev_internal(); + engine_load_cryptodev_int(); } # endif @@ -260,9 +204,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"); + "engine_load_rdrand_int()\n"); # endif - engine_load_rdrand_internal(); + engine_load_rdrand_int(); } # endif static CRYPTO_ONCE engine_dynamic = CRYPTO_ONCE_STATIC_INIT; @@ -270,9 +214,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"); + "engine_load_dynamic_int()\n"); # endif - engine_load_dynamic_internal(); + engine_load_dynamic_int(); } # ifndef OPENSSL_NO_STATIC_ENGINE # if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK) @@ -281,9 +225,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"); + "engine_load_padlock_int()\n"); # endif - engine_load_padlock_internal(); + engine_load_padlock_int(); } # endif # if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) @@ -292,9 +236,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"); + "engine_load_capi_int()\n"); # endif - engine_load_capi_internal(); + engine_load_capi_int(); } # endif static CRYPTO_ONCE engine_dasync = CRYPTO_ONCE_STATIC_INIT; @@ -302,9 +246,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"); + "engine_load_dasync_int()\n"); # endif - engine_load_dasync_internal(); + engine_load_dasync_int(); } # if !defined(OPENSSL_NO_AFALGENG) static CRYPTO_ONCE engine_afalg = CRYPTO_ONCE_STATIC_INIT; @@ -312,9 +256,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"); + "engine_load_afalg_int()\n"); # endif - engine_load_afalg_internal(); + engine_load_afalg_int(); } # endif # endif @@ -348,9 +292,9 @@ static void ossl_init_thread_stop(struct thread_local_inits_st *locals) if (locals->err_state) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_thread_stop: " - "ERR_remove_thread_state()\n"); + "err_delete_thread_state()\n"); #endif - ERR_remove_thread_state(); + err_delete_thread_state(); } OPENSSL_free(locals); @@ -427,9 +371,9 @@ void OPENSSL_cleanup(void) if (zlib_inited) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "comp_zlib_cleanup_internal()\n"); + "comp_zlib_cleanup_int()\n"); #endif - comp_zlib_cleanup_internal(); + comp_zlib_cleanup_int(); } #endif @@ -444,51 +388,57 @@ void OPENSSL_cleanup(void) if (load_crypto_strings_inited) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "ERR_free_strings()\n"); + "err_free_strings_int()\n"); #endif - ERR_free_strings(); + err_free_strings_int(); } CRYPTO_THREAD_cleanup_local(&threadstopkey); #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "RAND_cleanup()\n"); + "rand_cleanup_int()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "CONF_modules_free()\n"); + "conf_modules_free_int()\n"); #ifndef OPENSSL_NO_ENGINE fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "ENGINE_cleanup()\n"); + "engine_cleanup_int()\n"); #endif fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "CRYPTO_cleanup_all_ex_data()\n"); + "crypto_cleanup_all_ex_data_int()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "BIO_sock_cleanup()\n"); + "bio_sock_cleanup_int()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "EVP_cleanup()\n"); + "bio_cleanup()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "OBJ_cleanup()\n"); + "evp_cleanup_int()\n"); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "obj_cleanup_int()\n"); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "err_cleanup()\n"); #endif /* * Note that cleanup order is important: - * - RAND_cleanup could call an ENINGE's RAND cleanup function so must be - * called before ENGINE_cleanup() + * - rand_cleanup_int could call an ENGINE'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(). - * - CONF_modules_free() can end up in ENGINE code so must be called before - * ENGINE_cleanup() + * - conf_modules_free_int() can end up in ENGINE code so must be called + * before engine_cleanup_int() + * - ENGINEs and additional EVP algorithms might use added OIDs names so + * obj_cleanup_int() must be called last */ - RAND_cleanup(); - CONF_modules_free(); + rand_cleanup_int(); + conf_modules_free_int(); #ifndef OPENSSL_NO_ENGINE - ENGINE_cleanup(); + engine_cleanup_int(); #endif - CRYPTO_cleanup_all_ex_data(); -#ifndef OPENSSL_NO_SOCK - BIO_sock_cleanup(); -#endif - EVP_cleanup(); - OBJ_cleanup(); + crypto_cleanup_all_ex_data_int(); + bio_cleanup(); + evp_cleanup_int(); + obj_cleanup_int(); + err_cleanup(); + base_inited = 0; } @@ -552,7 +502,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) if (opts & OPENSSL_INIT_LOAD_CONFIG) { int ret; CRYPTO_THREAD_write_lock(init_lock); - config_filename = (settings == NULL) ? NULL : settings->config_name; + appname = (settings == NULL) ? NULL : settings->appname; ret = CRYPTO_THREAD_run_once(&config, ossl_init_config); CRYPTO_THREAD_unlock(init_lock); if (!ret)