Commit 3aebeeff authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Every openssl we support has ERR_remove_thread_state

parent c32a43a4

src/common/compat_openssl.h

+0 −2
Original line number Diff line number Diff line
@@ -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

src/common/crypto.c

+2 −2
Original line number Diff line number Diff line
@@ -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)