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 /crypto/include | |
| parent | openssl/err.h: remove duplicate OSSL_STOREerr() (diff) | |
| download | openssl-eb2b9892065cf5b69400b98ca82e4e99a525eb29.tar.xz openssl-eb2b9892065cf5b69400b98ca82e4e99a525eb29.zip | |
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 'crypto/include')
| -rw-r--r-- | crypto/include/internal/cryptlib_int.h | 1 | ||||
| -rw-r--r-- | crypto/include/internal/err_int.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/crypto/include/internal/cryptlib_int.h b/crypto/include/internal/cryptlib_int.h index 8f5650fe55..38b5dac9a3 100644 --- a/crypto/include/internal/cryptlib_int.h +++ b/crypto/include/internal/cryptlib_int.h @@ -25,6 +25,7 @@ int ossl_init_thread_start(uint64_t opts); * use". */ # define OPENSSL_INIT_ZLIB 0x00010000L +# define OPENSSL_INIT_BASE_ONLY 0x00040000L /* OPENSSL_INIT_THREAD flags */ # define OPENSSL_INIT_THREAD_ASYNC 0x01 diff --git a/crypto/include/internal/err_int.h b/crypto/include/internal/err_int.h index 7fec3ed767..4a7e43abcd 100644 --- a/crypto/include/internal/err_int.h +++ b/crypto/include/internal/err_int.h @@ -13,5 +13,7 @@ int err_load_crypto_strings_int(void); void err_cleanup(void); void err_delete_thread_state(void); +int err_shelve_state(void **); +void err_unshelve_state(void *); #endif |