diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-04-21 15:41:42 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-04-21 15:41:42 +0200 |
| commit | bf21fe935a979c08292d06553ef8c9a49382208c (patch) | |
| tree | 9ebf32e165296264f8d5ef8efee422f9b304d80d /include | |
| parent | 5fc89c1af837026b5812526ef6f519bf7ca42f16 (diff) | |
Ensure the thread keys are always allocated in the same order
Back-port of #5911
Fixes: #5899
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6037)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/crypto.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 1ba7f25f01..7fc60b3c51 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -371,7 +371,9 @@ 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_AFALG 0x00008000L -/* OPENSSL_INIT flag 0x00010000 reserved for internal use */ +/* OPENSSL_INIT_ZLIB 0x00010000L */ +/* currently unused 0x00020000L */ +/* OPENSSL_INIT_BASE_ONLY 0x00040000L */ /* OPENSSL_INIT flag range 0xfff00000 reserved for OPENSSL_init_ssl() */ /* Max OPENSSL_INIT flag value is 0x80000000 */ |