[openssl] master update
Dr. Paul Dale
pauli at openssl.org
Thu May 9 05:28:36 UTC 2019
The branch master has been updated
via 7eeefcd841e6e58ecc0107acf550d1c12a7769ef (commit)
from ad37edce684f97ce87868c121e39743b99580d7a (commit)
- Log -----------------------------------------------------------------
commit 7eeefcd841e6e58ecc0107acf550d1c12a7769ef
Author: Shane Lontis <shane.lontis at oracle.com>
Date: Thu May 9 12:33:46 2019 +1000
Fixed 32bit issue for kdf_opts
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Paul Dale <paul.dale at oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8901)
-----------------------------------------------------------------------
Summary of changes:
include/openssl/crypto.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 3eef3e9..5322cc8 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 \
More information about the openssl-commits
mailing list