From: Yawning Angel <yawning@schwanenlied.me>
Date: Thu, 23 Apr 2015 10:56:31 +0000 (+0000)
Subject: ERR_remove_state() is deprecated since OpenSSL 1.0.0.
X-Git-Tag: tor-0.2.7.2-alpha~103^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53a347592aa5311f8910125cef1d1814cd7088d5;p=thirdparty%2Ftor.git

ERR_remove_state() is deprecated since OpenSSL 1.0.0.

OpenSSL 1.1.0 must be built with "enable-deprecated", and compiled with
`OPENSSL_USE_DEPRECATED` for this to work, so instead, use the newer
routine as appropriate.
---

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 218c7bea1e..a68294a756 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -405,7 +405,11 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir)
 void
 crypto_thread_cleanup(void)
 {
+#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)
+  ERR_remove_thread_state(NULL);
+#else
   ERR_remove_state(0);
+#endif
 }
 
 /** used by tortls.c: wrap an RSA* in a crypto_pk_t. */
@@ -3157,7 +3161,11 @@ int
 crypto_global_cleanup(void)
 {
   EVP_cleanup();
+#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)
+  ERR_remove_thread_state(NULL);
+#else
   ERR_remove_state(0);
+#endif
   ERR_free_strings();
 
   if (dh_param_p)