diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-11-10 10:13:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-11-10 10:13:04 -0500 |
| commit | 3aebeeffa5bdea5b1392f0d35175d614053b0acb (patch) | |
| tree | 4557277dc6ae06bad8e7c948fe532090c7729bce /src | |
| parent | c32a43a4d2bbd2be89888fc5a253e55c72bb466a (diff) | |
| download | tor-3aebeeffa5bdea5b1392f0d35175d614053b0acb.tar.gz tor-3aebeeffa5bdea5b1392f0d35175d614053b0acb.zip | |
Every openssl we support has ERR_remove_thread_state
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/compat_openssl.h | 2 | ||||
| -rw-r--r-- | src/common/crypto.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h index 96c00c7993..23f695064a 100644 --- a/src/common/compat_openssl.h +++ b/src/common/compat_openssl.h @@ -24,7 +24,6 @@ #define OpenSSL_version(v) SSLeay_version(v) #define OpenSSL_version_num() SSLeay() #define RAND_OpenSSL() RAND_SSLeay() -#define tor_ERR_remove_cur_thread_state() ERR_remove_state(0) #ifndef SSL_get_state #define SSL_get_state(ssl) SSL_state(ssl) #endif @@ -33,7 +32,6 @@ ((st) == SSL3_ST_SW_SRVR_HELLO_B)) #define OSSL_HANDSHAKE_STATE int #else -#define tor_ERR_remove_cur_thread_state() ERR_remove_thread_state(NULL) #define STATE_IS_SW_SERVER_HELLO(st) \ ((st) == TLS_ST_SW_SRVR_HELLO) #endif diff --git a/src/common/crypto.c b/src/common/crypto.c index 5feb9be2c2..4c41d4494d 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -403,7 +403,7 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir) void crypto_thread_cleanup(void) { - tor_ERR_remove_cur_thread_state(); + ERR_remove_thread_state(NULL); } /** used by tortls.c: wrap an RSA* in a crypto_pk_t. */ @@ -2690,7 +2690,7 @@ int crypto_global_cleanup(void) { EVP_cleanup(); - tor_ERR_remove_cur_thread_state(); + ERR_remove_thread_state(NULL); ERR_free_strings(); if (dh_param_p) |