From: Matt Caswell Date: Mon, 29 Feb 2016 16:14:00 +0000 (+0000) Subject: Fix OPENSSL_INIT flags to avoid a clash. X-Git-Tag: OpenSSL_1_1_0-pre4~341 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=15457b620397d7fd671df6eea8055a18baf68699;p=oweals%2Fopenssl.git Fix OPENSSL_INIT flags to avoid a clash. The 0x00010000L OPENSSL_INIT flag appeared twice. Reviewed-by: Richard Levitte --- diff --git a/crypto/include/internal/cryptlib_int.h b/crypto/include/internal/cryptlib_int.h index 0e457623ff..ae30842d6d 100644 --- a/crypto/include/internal/cryptlib_int.h +++ b/crypto/include/internal/cryptlib_int.h @@ -70,7 +70,7 @@ int ossl_init_thread_start(uint64_t opts); * are those ommitted from crypto.h because they are "reserverd for internal * use". */ -# define OPENSSL_INIT_ZLIB 0x010000 +# define OPENSSL_INIT_ZLIB 0x00010000L /* OPENSSL_INIT_THREAD flags */ # define OPENSSL_INIT_THREAD_ASYNC 0x01 diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 24e9245663..d52c14c379 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -546,8 +546,8 @@ int CRYPTO_memcmp(const volatile void * volatile in_a, # define OPENSSL_INIT_ENGINE_CAPI 0x00002000L # define OPENSSL_INIT_ENGINE_PADLOCK 0x00004000L # define OPENSSL_INIT_ENGINE_DASYNC 0x00008000L -# define OPENSSL_INIT_ENGINE_AFALG 0x00010000L /* 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 */