Commit 7eeefcd8 authored by Shane Lontis's avatar Shane Lontis Committed by Pauli
Browse files

Fixed 32bit issue for kdf_opts 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8901)
parent ad37edce

include/openssl/crypto.h

+2 −4
Original line number Diff line number Diff line
@@ -397,13 +397,11 @@ int CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len); 
/* OPENSSL_INIT flag range 0x03f00000 reserved for OPENSSL_init_ssl() */

# define OPENSSL_INIT_NO_ADD_ALL_MACS        0x04000000L

# define OPENSSL_INIT_ADD_ALL_MACS           0x08000000L

/* FREE: 0x10000000L */

/* FREE: 0x20000000L */

# define OPENSSL_INIT_NO_ADD_ALL_KDFS        0x10000000L

# define OPENSSL_INIT_ADD_ALL_KDFS           0x20000000L

/* FREE: 0x40000000L */

/* FREE: 0x80000000L */

/* Max OPENSSL_INIT flag value is 0x80000000 */

# define OPENSSL_INIT_NO_ADD_ALL_KDFS        0x100000000L

# define OPENSSL_INIT_ADD_ALL_KDFS           0x200000000L



/* openssl and dasync not counted as builtin */

# define OPENSSL_INIT_ENGINE_ALL_BUILTIN \