diff options
| author | Matt Caswell <matt@openssl.org> | 2018-11-16 14:05:14 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-01-04 13:19:39 +0000 |
| commit | 41999e7d358c3657a254b34b85fd9e948180529b (patch) | |
| tree | 42267ffc53b96b3b1097a29d8678974267e2ffb7 /crypto/init.c | |
| parent | 88d57bf83fe32b2c8ceb1264562fdd028de504bf (diff) | |
Introduce a no-pinshared option
This option prevents OpenSSL from pinning itself in memory.
Fixes #7598
[extended tests]
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7647)
Diffstat (limited to 'crypto/init.c')
| -rw-r--r-- | crypto/init.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crypto/init.c b/crypto/init.c index 321ac11cf4..6b6bd71967 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -147,7 +147,9 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_nodelete) #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_load_crypto_nodelete()\n"); #endif -#if !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE) +#if !defined(OPENSSL_NO_DSO) \ + && !defined(OPENSSL_USE_NODELETE) \ + && !defined(OPENSSL_NO_PINSHARED) # ifdef DSO_WIN32 { HMODULE handle = NULL; @@ -767,7 +769,9 @@ int OPENSSL_atexit(void (*handler)(void)) { OPENSSL_INIT_STOP *newhand; -#if !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE) +#if !defined(OPENSSL_NO_DSO) \ + && !defined(OPENSSL_USE_NODELETE)\ + && !defined(OPENSSL_NO_PINSHARED) { union { void *sym; |