diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-05-09 04:33:46 +0200 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-05-09 07:27:24 +0200 |
| commit | 7eeefcd841e6e58ecc0107acf550d1c12a7769ef (patch) | |
| tree | 9859228f36079a2d0c18eacd6e75debdd288f901 /include | |
| parent | Don't use '-z defs' if sanitizers are used (diff) | |
| download | openssl-7eeefcd841e6e58ecc0107acf550d1c12a7769ef.tar.xz openssl-7eeefcd841e6e58ecc0107acf550d1c12a7769ef.zip | |
Fixed 32bit issue for kdf_opts
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8901)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/crypto.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 3eef3e96fa..5322cc8f04 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 \ |