diff options
| author | Matt Caswell <matt@openssl.org> | 2018-11-16 17:26:23 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-01-04 20:23:16 +0000 |
| commit | 56806f432b6c0cabbc46ebcdf6a9a6009489c0c0 (patch) | |
| tree | e200c12279face8252ce48be569429bcb984d0ec /crypto | |
| parent | 6b97cc6ec17586ff9c1d96ab5c3e0b6d829074a8 (diff) | |
Support _onexit() in preference to atexit() on Windows
This enables cleanup to happen on DLL unload instead of at process exit.
[extended tests]
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7983)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/init.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/crypto/init.c b/crypto/init.c index 1c50f2994e..46ba67d3e4 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -118,14 +118,28 @@ err: } static CRYPTO_ONCE register_atexit = CRYPTO_ONCE_STATIC_INIT; +#if !defined(OPENSSL_SYS_UEFI) && defined(_WIN32) +static int win32atexit(void) +{ + OPENSSL_cleanup(); + return 0; +} +#endif + DEFINE_RUN_ONCE_STATIC(ossl_init_register_atexit) { -# ifdef OPENSSL_INIT_DEBUG +#ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_register_atexit()\n"); -# endif +#endif #ifndef OPENSSL_SYS_UEFI +# ifdef _WIN32 + /* We use _onexit() in preference because it gets called on DLL unload */ + if (_onexit(win32atexit) == NULL) + return 0; +# else if (atexit(OPENSSL_cleanup) != 0) return 0; +# endif #endif return 1; |