diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-05-08 17:01:09 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-05-10 11:31:05 +0200 |
| commit | 21e001747d4a246827ad432fc508d67ac404ecdb (patch) | |
| tree | 512105b818918f601165eb8105c725f46d1f3ba4 /crypto/err | |
| parent | 06aa885d0ccbb018ff7044258e9a8b6e7a56681d (diff) | |
Restore the ERR_remove_thread_state() API and make it a no-op
The ERR_remove_thread_state() API is restored to take a pointer
argument, but does nothing more. ERR_remove_state() is also made into
a no-op. Both functions are deprecated and users are recommended to
use OPENSSL_thread_stop() instead.
Documentation is changed to reflect this.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/err')
| -rw-r--r-- | crypto/err/err.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index b0fd19e7ae..fd2ea8194a 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -740,7 +740,7 @@ const char *ERR_reason_error_string(unsigned long e) return ((p == NULL) ? NULL : p->string); } -void ERR_remove_thread_state(void) +void err_delete_thread_state(void) { ERR_STATE *state = ERR_get_state(); if (state == NULL) @@ -751,9 +751,14 @@ void ERR_remove_thread_state(void) } #if OPENSSL_API_COMPAT < 0x10000000L +void ERR_remove_thread_state(void *dummy) +{ +} +#endif + +#if OPENSSL_API_COMPAT < 0x10000000L void ERR_remove_state(unsigned long pid) { - ERR_remove_thread_state(); } #endif |