From: Gisle Vanem <gvanem@yahoo.no>
Date: Thu, 17 Mar 2016 09:42:33 +0000 (+0100)
Subject: openssl: adapt to API breakage in ERR_remove_thread_state()
X-Git-Tag: curl-7_48_0~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d816e8cf52ff031d3af97a7fd93c1886bfda76e4;p=curl

openssl: adapt to API breakage in ERR_remove_thread_state()

The OpenSSL API change that broke this is "Convert ERR_STATE to new
multi-threading API": openssl commit 8509dcc.

Closes #713
---

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 3b19369f1..540800d1f 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -95,6 +95,10 @@
 
 #if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
 #define HAVE_ERR_REMOVE_THREAD_STATE 1
+#if (OPENSSL_VERSION_NUMBER >= 0x10100004L)
+/* OpenSSL 1.1.0-pre4 removed the argument! */
+#define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1
+#endif
 #endif
 
 #if !defined(HAVE_SSLV2_CLIENT_METHOD) || \
@@ -731,7 +735,9 @@ void Curl_ossl_cleanup(void)
   ERR_free_strings();
 
   /* Free thread local error state, destroying hash upon zero refcount */
-#ifdef HAVE_ERR_REMOVE_THREAD_STATE
+#ifdef HAVE_ERR_REMOVE_THREAD_STATE_NOARG
+  ERR_remove_thread_state();
+#elif defined(HAVE_ERR_REMOVE_THREAD_STATE)
   ERR_remove_thread_state(NULL);
 #else
   ERR_remove_state(0);