Commit 8d00e30f authored by Richard Levitte's avatar Richard Levitte
Browse files

Don't try to init dasync internally 



Since dasync isn't installed, and is only ever used as a dynamic
engine, there's no reason to consider it for initialization when
building static engines.

Reviewed-by: default avatarBen Laurie <ben@openssl.org>
parent 67a014bf

crypto/init.c

+1 −14
Original line number Diff line number Diff line
@@ -258,16 +258,6 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_capi) 
    return 1;

}

#  endif

static CRYPTO_ONCE engine_dasync = CRYPTO_ONCE_STATIC_INIT;

DEFINE_RUN_ONCE_STATIC(ossl_init_engine_dasync)

{

# ifdef OPENSSL_INIT_DEBUG

    fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_dasync: "

                    "engine_load_dasync_int()\n");

# endif

    engine_load_dasync_int();

    return 1;

}

#  if !defined(OPENSSL_NO_AFALGENG)

static CRYPTO_ONCE engine_afalg = CRYPTO_ONCE_STATIC_INIT;

DEFINE_RUN_ONCE_STATIC(ossl_init_engine_afalg)
@@ -559,9 +549,6 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) 
            && !RUN_ONCE(&engine_capi, ossl_init_engine_capi))

        return 0;

#  endif

    if ((opts & OPENSSL_INIT_ENGINE_DASYNC)

            && !RUN_ONCE(&engine_dasync, ossl_init_engine_dasync))

        return 0;

#  if !defined(OPENSSL_NO_AFALGENG)

    if ((opts & OPENSSL_INIT_ENGINE_AFALG)

            && !RUN_ONCE(&engine_afalg, ossl_init_engine_afalg))
@@ -569,7 +556,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) 
#  endif

# endif

    if (opts & (OPENSSL_INIT_ENGINE_ALL_BUILTIN

                | OPENSSL_INIT_ENGINE_DASYNC | OPENSSL_INIT_ENGINE_OPENSSL

                | OPENSSL_INIT_ENGINE_OPENSSL

                | OPENSSL_INIT_ENGINE_AFALG)) {

        ENGINE_register_all_complete();

    }

include/openssl/crypto.h

+1 −2
Original line number Diff line number Diff line
@@ -366,9 +366,8 @@ int CRYPTO_memcmp(const volatile void * volatile in_a, 
# define OPENSSL_INIT_ENGINE_CRYPTODEV       0x00001000L

# define OPENSSL_INIT_ENGINE_CAPI            0x00002000L

# define OPENSSL_INIT_ENGINE_PADLOCK         0x00004000L

# define OPENSSL_INIT_ENGINE_DASYNC          0x00008000L

# define OPENSSL_INIT_ENGINE_AFALG           0x00008000L

/* OPENSSL_INIT flag 0x00010000 reserved for internal use */

# define OPENSSL_INIT_ENGINE_AFALG           0x00020000L

/* OPENSSL_INIT flag range 0xfff00000 reserved for OPENSSL_init_ssl() */

/* Max OPENSSL_INIT flag value is 0x80000000 */