aboutsummaryrefslogtreecommitdiff
path: root/lib/vtls
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-05-19 11:39:59 +0200
committerDaniel Stenberg <daniel@haxx.se>2016-05-19 11:39:59 +0200
commit48114a8634242c0d93f5bf06a3efd262e5f5ed97 (patch)
tree56e6c5a75ec65de270f47914eba159c84e0eac41 /lib/vtls
parent8243a9581b7782bc2af29e8421952d0e669f9e9e (diff)
openssl: ERR_remove_thread_state() is deprecated in latest 1.1.0
See OpenSSL commit 21e001747d4a
Diffstat (limited to 'lib/vtls')
-rw-r--r--lib/vtls/openssl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index fea0dfe4f..6e3335e44 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -97,8 +97,8 @@
#define HAVE_ERR_REMOVE_THREAD_STATE 1
#if (OPENSSL_VERSION_NUMBER >= 0x10100004L) && \
!defined(LIBRESSL_VERSION_NUMBER)
-/* OpenSSL 1.1.0-pre4 removed the argument! */
-#define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1
+/* OpenSSL 1.1.0 deprecates the function */
+#define HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED 1
#endif
#endif
@@ -737,8 +737,8 @@ void Curl_ossl_cleanup(void)
ERR_free_strings();
/* Free thread local error state, destroying hash upon zero refcount */
-#ifdef HAVE_ERR_REMOVE_THREAD_STATE_NOARG
- ERR_remove_thread_state();
+#ifdef HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED
+
#elif defined(HAVE_ERR_REMOVE_THREAD_STATE)
ERR_remove_thread_state(NULL);
#else