diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-11-11 10:23:26 +0100 |
|---|---|---|
| committer | Richard Levitte <richard@levitte.org> | 2016-11-11 10:44:19 +0100 |
| commit | 1b8055a18387ed93987df868f87df62b713922c1 (patch) | |
| tree | 522a6a983422706f58615a32a62654efef447831 /crypto/init.c | |
| parent | 16db345c47cbf97ea01e655d4eb00f9c4c52f361 (diff) | |
Fix the effect of no-dso in crypto/init.c
When configured no-dso, there are no DSO_{whatever} macros defined.
Therefore, before checking those, you have to check if OPENSSL_NO_DSO
is defined.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1902)
(cherry picked from commit 6e290a25c2cbdc26119c0866c20d9292f9e64dd8)
Diffstat (limited to 'crypto/init.c')
| -rw-r--r-- | crypto/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/init.c b/crypto/init.c index a939cb16d4..411e2d8809 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -81,7 +81,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_base) OPENSSL_cpuid_setup(); base_inited = 1; -#ifndef OPENSSL_USE_NODELETE +#if !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE) # ifdef DSO_WIN32 { HMODULE handle = NULL; @@ -604,7 +604,7 @@ int OPENSSL_atexit(void (*handler)(void)) { OPENSSL_INIT_STOP *newhand; -#ifndef OPENSSL_USE_NODELETE +#if !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE) { union { void *sym; |