Commit 6e290a25 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1902)
parent 588d2375

crypto/init.c

+2 −2
Original line number Diff line number Diff line
@@ -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;