From 6e290a25c2cbdc26119c0866c20d9292f9e64dd8 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 11 Nov 2016 10:23:26 +0100 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/1902) --- crypto/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/init.c b/crypto/init.c index 4363beeb1d..e457b2dd0e 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; -- 2.34.1