From: Shane Lontis Date: Thu, 9 May 2019 02:33:46 +0000 (+1000) Subject: Fixed 32bit issue for kdf_opts X-Git-Tag: openssl-3.0.0-alpha1~2075 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eeefcd841e6e58ecc0107acf550d1c12a7769ef;p=thirdparty%2Fopenssl.git Fixed 32bit issue for kdf_opts Reviewed-by: Richard Levitte Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/8901) --- diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 3eef3e96fa5..5322cc8f040 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -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 \