diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-04-20 15:45:06 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-04-20 15:45:06 +0200 |
| commit | eb2b9892065cf5b69400b98ca82e4e99a525eb29 (patch) | |
| tree | 0185f809739e7ffbde0ee7d477f749fd34a541ce /include | |
| parent | e1c0348cc728cb37003ae411879bd23b6a84fcc8 (diff) | |
Ensure the thread keys are always allocated in the same order
Fixes: #5899
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5911)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/crypto.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 27119ffa7b..c2ad65e044 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -376,8 +376,9 @@ int CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len); # define OPENSSL_INIT_ENGINE_CAPI 0x00002000L # define OPENSSL_INIT_ENGINE_PADLOCK 0x00004000L # define OPENSSL_INIT_ENGINE_AFALG 0x00008000L -# define OPENSSL_INIT_reserved_internal 0x00010000L +/* OPENSSL_INIT_ZLIB 0x00010000L */ # define OPENSSL_INIT_ATFORK 0x00020000L +/* OPENSSL_INIT_BASE_ONLY 0x00040000L */ /* OPENSSL_INIT flag range 0xfff00000 reserved for OPENSSL_init_ssl() */ /* Max OPENSSL_INIT flag value is 0x80000000 */ |