mirror of
https://github.com/openssl/openssl.git
synced 2025-03-31 20:10:45 +08:00
Can't re-init after stop.
Remoce DYANMIC once-init stuff. After the library is stopped, you can't restart it. Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Rich Salz
Rich Salz
parent
7984f082d5
commit
dd27f16e9a
@ -65,6 +65,9 @@
|
||||
#include <openssl/comp.h>
|
||||
#include <internal/err.h>
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
|
||||
static int stopped = 0;
|
||||
|
||||
static void ossl_init_thread_stop(struct thread_local_inits_st *locals);
|
||||
|
||||
@ -72,7 +75,6 @@ static void ossl_init_thread_stop(struct thread_local_inits_st *locals);
|
||||
#if !defined(OPENSSL_THREADS)
|
||||
typedef int OPENSSL_INIT_ONCE;
|
||||
# define OPENSSL_INIT_ONCE_STATIC_INIT 0
|
||||
# define OPENSSL_INIT_ONCE_DYNAMIC_INIT(once) (*(once) = 0)
|
||||
|
||||
static void ossl_init_once_run(OPENSSL_INIT_ONCE *once, void (*init)(void))
|
||||
{
|
||||
@ -122,7 +124,6 @@ static struct thread_local_inits_st *ossl_init_get_thread_local(int alloc)
|
||||
*/
|
||||
typedef LONG OPENSSL_INIT_ONCE;
|
||||
# define OPENSSL_INIT_ONCE_STATIC_INIT 0
|
||||
# define OPENSSL_INIT_ONCE_DYNAMIC_INIT(once) (*(once) = 0)
|
||||
|
||||
# define ONCE_UNINITED 0
|
||||
# define ONCE_ININIT 1
|
||||
@ -150,8 +151,6 @@ static void ossl_init_once_run(OPENSSL_INIT_ONCE *once, void (*init)(void))
|
||||
|
||||
typedef INIT_ONCE OPENSSL_INIT_ONCE;
|
||||
# define OPENSSL_INIT_ONCE_STATIC_INIT INIT_ONCE_STATIC_INIT
|
||||
# define OPENSSL_INIT_ONCE_DYNAMIC_INIT(once) \
|
||||
InitOnceInitialize((PINIT_ONCE)(once))
|
||||
|
||||
static BOOL CALLBACK once_cb(PINIT_ONCE once, PVOID initfp, PVOID *unused)
|
||||
{
|
||||
@ -212,7 +211,6 @@ static pthread_key_t threadstopkey;
|
||||
|
||||
typedef pthread_once_t OPENSSL_INIT_ONCE;
|
||||
# define OPENSSL_INIT_ONCE_STATIC_INIT PTHREAD_ONCE_INIT
|
||||
# define OPENSSL_INIT_ONCE_DYNAMIC_INIT(once) (*(once) = PTHREAD_ONCE_INIT)
|
||||
|
||||
static void ossl_init_once_run(OPENSSL_INIT_ONCE *once, void (*init)(void))
|
||||
{
|
||||
@ -541,6 +539,11 @@ void OPENSSL_INIT_library_stop(void)
|
||||
if (!base_inited)
|
||||
return;
|
||||
|
||||
/* Might be explicitly called and also by atexit */
|
||||
if (stopped)
|
||||
return;
|
||||
stopped = 1;
|
||||
|
||||
/*
|
||||
* Thread stop may not get automatically called by the thread library for
|
||||
* the very last thread in some situations, so call it directly.
|
||||
@ -566,8 +569,6 @@ void OPENSSL_INIT_library_stop(void)
|
||||
"COMP_zlib_cleanup()\n");
|
||||
#endif
|
||||
COMP_zlib_cleanup();
|
||||
zlib_inited = 0;
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&zlib);
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_ENGINE
|
||||
@ -577,44 +578,15 @@ void OPENSSL_INIT_library_stop(void)
|
||||
"ENGINE_cleanup()\n");
|
||||
# endif
|
||||
ENGINE_cleanup();
|
||||
engine_inited = 0;
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_openssl);
|
||||
# if !defined(OPENSSL_NO_HW) && \
|
||||
(defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_cryptodev);
|
||||
# endif
|
||||
# ifndef OPENSSL_NO_RDRAND
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_rdrand);
|
||||
# endif
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_dynamic);
|
||||
# ifndef OPENSSL_NO_STATIC_ENGINE
|
||||
# if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_padlock);
|
||||
# endif
|
||||
# if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_capi);
|
||||
# endif
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_dasync);
|
||||
# endif
|
||||
}
|
||||
#endif
|
||||
|
||||
async_inited = 0;
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&async);
|
||||
|
||||
config_inited = 0;
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&config);
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&add_all_ciphers);
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&add_all_digests);
|
||||
|
||||
if (load_crypto_strings_inited) {
|
||||
#ifdef OPENSSL_INIT_DEBUG
|
||||
fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: "
|
||||
"ERR_free_strings()\n");
|
||||
#endif
|
||||
ERR_free_strings();
|
||||
load_crypto_strings_inited = 0;
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&load_crypto_strings);
|
||||
}
|
||||
|
||||
#ifdef OPENSSL_INIT_DEBUG
|
||||
@ -658,6 +630,9 @@ static const OPENSSL_INIT_SETTINGS *ossl_init_get_setting(
|
||||
void OPENSSL_INIT_crypto_library_start(uint64_t opts,
|
||||
const OPENSSL_INIT_SETTINGS *settings)
|
||||
{
|
||||
/* XXX TODO WARNING To be updated to return a value not assert. */
|
||||
assert(!stopped);
|
||||
|
||||
ossl_init_once_run(&base, ossl_init_base);
|
||||
|
||||
if (opts & OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS)
|
||||
|
||||
@ -59,13 +59,15 @@
|
||||
|
||||
#include <openssl/crypto.h>
|
||||
#include <openssl/evp.h>
|
||||
#include <assert.h>
|
||||
#include "ssl_locl.h"
|
||||
|
||||
static int stopped;
|
||||
|
||||
/* Implement "once" functionality */
|
||||
#if !defined(OPENSSL_THREADS)
|
||||
typedef int OPENSSL_INIT_ONCE;
|
||||
# define OPENSSL_INIT_ONCE_STATIC_INIT 0
|
||||
# define OPENSSL_INIT_ONCE_DYNAMIC_INIT(once) (*(once) = 0)
|
||||
|
||||
static void ossl_init_once_run(OPENSSL_INIT_ONCE *once, void (*init)(void))
|
||||
{
|
||||
@ -85,7 +87,6 @@ static void ossl_init_once_run(OPENSSL_INIT_ONCE *once, void (*init)(void))
|
||||
*/
|
||||
typedef LONG OPENSSL_INIT_ONCE;
|
||||
# define OPENSSL_INIT_ONCE_STATIC_INIT 0
|
||||
# define OPENSSL_INIT_ONCE_DYNAMIC_INIT(once) (*(once) = 0)
|
||||
|
||||
# define ONCE_UNINITED 0
|
||||
# define ONCE_ININIT 1
|
||||
@ -113,8 +114,6 @@ static void ossl_init_once_run(OPENSSL_INIT_ONCE *once, void (*init)(void))
|
||||
|
||||
typedef INIT_ONCE OPENSSL_INIT_ONCE;
|
||||
# define OPENSSL_INIT_ONCE_STATIC_INIT INIT_ONCE_STATIC_INIT
|
||||
# define OPENSSL_INIT_ONCE_DYNAMIC_INIT(once) \
|
||||
InitOnceInitialize((PINIT_ONCE)(once))
|
||||
|
||||
static BOOL CALLBACK once_cb(PINIT_ONCE once, PVOID initfp, PVOID *unused)
|
||||
{
|
||||
@ -135,7 +134,6 @@ static void ossl_init_once_run(OPENSSL_INIT_ONCE *once, void (*init)(void))
|
||||
|
||||
typedef pthread_once_t OPENSSL_INIT_ONCE;
|
||||
# define OPENSSL_INIT_ONCE_STATIC_INIT PTHREAD_ONCE_INIT
|
||||
# define OPENSSL_INIT_ONCE_DYNAMIC_INIT(once) (*(once) = PTHREAD_ONCE_INIT)
|
||||
|
||||
static void ossl_init_once_run(OPENSSL_INIT_ONCE *once, void (*init)(void))
|
||||
{
|
||||
@ -266,6 +264,11 @@ static void ossl_init_no_load_ssl_strings(void)
|
||||
|
||||
static void ssl_library_stop(void)
|
||||
{
|
||||
/* Might be explicitly called and also by atexit */
|
||||
if (stopped)
|
||||
return;
|
||||
stopped = 1;
|
||||
|
||||
if (ssl_base_inited) {
|
||||
#ifndef OPENSSL_NO_COMP
|
||||
#ifdef OPENSSL_INIT_DEBUG
|
||||
@ -273,8 +276,6 @@ static void ssl_library_stop(void)
|
||||
"SSL_COMP_free_compression_methods()\n");
|
||||
#endif
|
||||
SSL_COMP_free_compression_methods();
|
||||
ssl_base_inited = 0;
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&ssl_base);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -290,8 +291,6 @@ static void ssl_library_stop(void)
|
||||
* between the two libraries whether they have both been inited.
|
||||
*/
|
||||
ERR_free_strings();
|
||||
ssl_strings_inited = 0;
|
||||
OPENSSL_INIT_ONCE_DYNAMIC_INIT(&ssl_strings);
|
||||
}
|
||||
}
|
||||
|
||||
@ -303,6 +302,9 @@ static void ssl_library_stop(void)
|
||||
void OPENSSL_INIT_ssl_library_start(uint64_t opts,
|
||||
const OPENSSL_INIT_SETTINGS *settings)
|
||||
{
|
||||
/* XXX TODO WARNING To be updated to return a value not assert. */
|
||||
assert(!stopped);
|
||||
|
||||
OPENSSL_INIT_crypto_library_start(opts | OPENSSL_INIT_ADD_ALL_CIPHERS
|
||||
| OPENSSL_INIT_ADD_ALL_DIGESTS, settings);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user