generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure Async is deinited properly

Browse Source 
The global thread local keys were not being deinited properly in async.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Matt Caswell
2016-03-02 16:52:43 +00:00
parent 224905f8aa
commit ed49f43a03
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/async/async.c
View File

@@ -351,8 +351,6 @@ int async_init(void)
return 1; return 1;
} }
/* TODO: FIXME: This needs to be called by something!!! */
void async_deinit(void);
void async_deinit(void) void async_deinit(void)
{ {
CRYPTO_THREAD_cleanup_local(&ctxkey); CRYPTO_THREAD_cleanup_local(&ctxkey);

1
crypto/include/internal/async.h
View File

@@ -58,4 +58,5 @@
#include <openssl/async.h> #include <openssl/async.h>
int async_init(void); int async_init(void);
void async_deinit(void);

10
crypto/init.c
View File

@@ -580,6 +580,16 @@ void OPENSSL_cleanup(void)
COMP_zlib_cleanup(); COMP_zlib_cleanup();
} }
#ifndef OPENSSL_NO_ASYNC
if (async_inited) {
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
"async_deinit()\n");
# endif
async_deinit();
}
#endif
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
if (engine_inited) { if (engine_inited) {
# ifdef OPENSSL_INIT_DEBUG # ifdef OPENSSL_INIT_DEBUG