wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the effect of no-dso in crypto/init.c

Browse source 
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)
This commit is contained in:
Richard Levitte 2016-11-11 10:23:26 +01:00
parent 588d2375a2
commit 6e290a25c2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crypto/init.c
View file

@ -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;