aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-03-23 10:04:48 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-03-23 10:05:29 +0100
commit240cd84b494e0ffee8ad261c43b927d246cf6be1 (patch)
tree512212daea0ff05ffcd63fa9b661137a7eaa1b07
parent5173c499c1b1c44b3913ecce8ccc3ac5250abe72 (diff)
openssl: fix ERR_remove_thread_state() for boringssl/libressl
The removed arg is only done in OpenSSL Bug: https://twitter.com/xtraemeat/status/712564874098917376
-rw-r--r--lib/vtls/openssl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index cbf2d2123..b7e446253 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -95,7 +95,9 @@
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
#define HAVE_ERR_REMOVE_THREAD_STATE 1
-#if (OPENSSL_VERSION_NUMBER >= 0x10100004L)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100004L) && \
+ !defined(LIBRESSL_VERSION_NUMBER) && \
+ !defined(OPENSSL_IS_BORINGSSL)
/* OpenSSL 1.1.0-pre4 removed the argument! */
#define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1
#endif