projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sparcv9cap.c: add Fujitsu SPARC64 X AES capability detection.
[openssl.git]
/
crypto
/
init.c
diff --git
a/crypto/init.c
b/crypto/init.c
index f5473ecfe3417676ab75e39de5c7eb42269b04a1..48f74c496c0c73b9490fe2f8aca140cd122824e3 100644
(file)
--- a/
crypto/init.c
+++ b/
crypto/init.c
@@
-67,6
+67,7
@@
#include <internal/engine.h>
#include <internal/comp.h>
#include <internal/err.h>
#include <internal/engine.h>
#include <internal/comp.h>
#include <internal/err.h>
+#include <internal/err_int.h>
#include <internal/objects.h>
#include <stdlib.h>
#include <assert.h>
#include <internal/objects.h>
#include <stdlib.h>
#include <assert.h>
@@
-144,9
+145,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: "
#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_int
ern
()\n");
+ "err_load_crypto_strings_int()\n");
# endif
# endif
- err_load_crypto_strings_int
ern
();
+ err_load_crypto_strings_int();
#endif
load_crypto_strings_inited = 1;
}
#endif
load_crypto_strings_inited = 1;
}
@@
-161,9
+162,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: "
#ifndef OPENSSL_NO_AUTOALGINIT
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_add_all_ciphers: "
- "openssl_add_all_ciphers_int
ernal
()\n");
+ "openssl_add_all_ciphers_int()\n");
# endif
# endif
- openssl_add_all_ciphers_int
ernal
();
+ openssl_add_all_ciphers_int();
# ifndef OPENSSL_NO_ENGINE
# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
ENGINE_setup_bsd_cryptodev();
# ifndef OPENSSL_NO_ENGINE
# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
ENGINE_setup_bsd_cryptodev();
@@
-182,9
+183,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: "
#ifndef OPENSSL_NO_AUTOALGINIT
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_add_all_digests: "
- "openssl_add_all_digests
_internal
()\n");
+ "openssl_add_all_digests()\n");
# endif
# endif
- openssl_add_all_digests_int
ernal
();
+ openssl_add_all_digests_int();
# ifndef OPENSSL_NO_ENGINE
# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
ENGINE_setup_bsd_cryptodev();
# ifndef OPENSSL_NO_ENGINE
# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
ENGINE_setup_bsd_cryptodev();
@@
-206,19
+207,19
@@
static void ossl_init_config(void)
{
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr,
{
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr,
- "OPENSSL_INIT: ossl_init_config: openssl_config
_internal
(%s)\n",
+ "OPENSSL_INIT: ossl_init_config: openssl_config(%s)\n",
config_filename==NULL?"NULL":config_filename);
#endif
config_filename==NULL?"NULL":config_filename);
#endif
- openssl_config_int
ernal
(config_filename);
+ openssl_config_int(config_filename);
config_inited = 1;
}
static void ossl_init_no_config(void)
{
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr,
config_inited = 1;
}
static void ossl_init_no_config(void)
{
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr,
- "OPENSSL_INIT: ossl_init_config: openssl_no_config_int
ernal
()\n");
+ "OPENSSL_INIT: ossl_init_config: openssl_no_config_int()\n");
#endif
#endif
- openssl_no_config_int
ernal
();
+ openssl_no_config_int();
config_inited = 1;
}
config_inited = 1;
}
@@
-239,9
+240,9
@@
static void ossl_init_engine_openssl(void)
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_openssl: "
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_openssl: "
- "engine_load_openssl_int
ernal
()\n");
+ "engine_load_openssl_int()\n");
# endif
# endif
- engine_load_openssl_int
ernal
();
+ engine_load_openssl_int();
}
# if !defined(OPENSSL_NO_HW) && \
(defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
}
# if !defined(OPENSSL_NO_HW) && \
(defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
@@
-250,9
+251,9
@@
static void ossl_init_engine_cryptodev(void)
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_cryptodev: "
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_cryptodev: "
- "engine_load_cryptodev_int
ernal
()\n");
+ "engine_load_cryptodev_int()\n");
# endif
# endif
- engine_load_cryptodev_int
ernal
();
+ engine_load_cryptodev_int();
}
# endif
}
# endif
@@
-262,9
+263,9
@@
static void ossl_init_engine_rdrand(void)
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_rdrand: "
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_rdrand: "
- "engine_load_rdrand_int
ernal
()\n");
+ "engine_load_rdrand_int()\n");
# endif
# endif
- engine_load_rdrand_int
ernal
();
+ engine_load_rdrand_int();
}
# endif
static CRYPTO_ONCE engine_dynamic = CRYPTO_ONCE_STATIC_INIT;
}
# endif
static CRYPTO_ONCE engine_dynamic = CRYPTO_ONCE_STATIC_INIT;
@@
-272,9
+273,9
@@
static void ossl_init_engine_dynamic(void)
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_dynamic: "
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_dynamic: "
- "engine_load_dynamic_int
ernal
()\n");
+ "engine_load_dynamic_int()\n");
# endif
# endif
- engine_load_dynamic_int
ernal
();
+ engine_load_dynamic_int();
}
# ifndef OPENSSL_NO_STATIC_ENGINE
# if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
}
# ifndef OPENSSL_NO_STATIC_ENGINE
# if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
@@
-283,9
+284,9
@@
static void ossl_init_engine_padlock(void)
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_padlock: "
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_padlock: "
- "engine_load_padlock_int
ernal
()\n");
+ "engine_load_padlock_int()\n");
# endif
# endif
- engine_load_padlock_int
ernal
();
+ engine_load_padlock_int();
}
# endif
# if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
}
# endif
# if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
@@
-294,9
+295,9
@@
static void ossl_init_engine_capi(void)
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_capi: "
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_capi: "
- "engine_load_capi_int
ernal
()\n");
+ "engine_load_capi_int()\n");
# endif
# endif
- engine_load_capi_int
ernal
();
+ engine_load_capi_int();
}
# endif
static CRYPTO_ONCE engine_dasync = CRYPTO_ONCE_STATIC_INIT;
}
# endif
static CRYPTO_ONCE engine_dasync = CRYPTO_ONCE_STATIC_INIT;
@@
-304,9
+305,9
@@
static void ossl_init_engine_dasync(void)
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_dasync: "
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_dasync: "
- "engine_load_dasync_int
ernal
()\n");
+ "engine_load_dasync_int()\n");
# endif
# endif
- engine_load_dasync_int
ernal
();
+ engine_load_dasync_int();
}
# if !defined(OPENSSL_NO_AFALGENG)
static CRYPTO_ONCE engine_afalg = CRYPTO_ONCE_STATIC_INIT;
}
# if !defined(OPENSSL_NO_AFALGENG)
static CRYPTO_ONCE engine_afalg = CRYPTO_ONCE_STATIC_INIT;
@@
-314,9
+315,9
@@
static void ossl_init_engine_afalg(void)
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_afalg: "
{
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_afalg: "
- "engine_load_afalg_int
ernal
()\n");
+ "engine_load_afalg_int()\n");
# endif
# endif
- engine_load_afalg_int
ernal
();
+ engine_load_afalg_int();
}
# endif
# endif
}
# endif
# endif
@@
-429,9
+430,9
@@
void OPENSSL_cleanup(void)
if (zlib_inited) {
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
if (zlib_inited) {
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "comp_zlib_cleanup_int
ernal
()\n");
+ "comp_zlib_cleanup_int()\n");
#endif
#endif
- comp_zlib_cleanup_int
ernal
();
+ comp_zlib_cleanup_int();
}
#endif
}
#endif
@@
-446,51
+447,57
@@
void OPENSSL_cleanup(void)
if (load_crypto_strings_inited) {
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
if (load_crypto_strings_inited) {
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "err_free_strings_int
ern
()\n");
+ "err_free_strings_int()\n");
#endif
#endif
- err_free_strings_int
ern
();
+ err_free_strings_int();
}
CRYPTO_THREAD_cleanup_local(&threadstopkey);
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
}
CRYPTO_THREAD_cleanup_local(&threadstopkey);
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "rand_cleanup_int
ern
()\n");
+ "rand_cleanup_int()\n");
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "conf_modules_free_int
ern
()\n");
+ "conf_modules_free_int()\n");
#ifndef OPENSSL_NO_ENGINE
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
#ifndef OPENSSL_NO_ENGINE
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "engine_cleanup_int
ern
()\n");
+ "engine_cleanup_int()\n");
#endif
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
#endif
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "crypto_cleanup_all_ex_data_int
ern
()\n");
+ "crypto_cleanup_all_ex_data_int()\n");
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "bio_sock_cleanup_int
ern
()\n");
+ "bio_sock_cleanup_int()\n");
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "
evp_cleanup_intern
()\n");
+ "
bio_cleanup
()\n");
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "obj_cleanup_intern()\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:
#endif
/*
* Note that cleanup order is important:
- * - rand_cleanup_int
ern could call an ENING
E's RAND cleanup function so
- * must be called before engine_cleanup_int
ern
()
+ * - rand_cleanup_int
could call an ENGIN
E'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().
* - 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()
+ * - 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_int
ern
();
- conf_modules_free_int
ern
();
+ rand_cleanup_int();
+ conf_modules_free_int();
#ifndef OPENSSL_NO_ENGINE
#ifndef OPENSSL_NO_ENGINE
- engine_cleanup_int
ern
();
+ engine_cleanup_int();
#endif
#endif
- crypto_cleanup_all_ex_data_int
ern
();
-#ifndef OPENSSL_NO_SOCK
-
bio_sock_cleanup_intern
();
-#endif
- e
vp_cleanup_intern
();
- obj_cleanup_intern();
+ crypto_cleanup_all_ex_data_int();
+ bio_cleanup();
+
evp_cleanup_int
();
+ obj_cleanup_int();
+ e
rr_cleanup
();
+
base_inited = 0;
}
base_inited = 0;
}