Commit 15457b62 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix OPENSSL_INIT flags to avoid a clash. 



The 0x00010000L OPENSSL_INIT flag appeared twice.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 8da00a38

crypto/include/internal/cryptlib_int.h

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

include/openssl/crypto.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */