]> granicus.if.org Git - curl/commitdiff
openssl: fix ERR_remove_thread_state() for boringssl/libressl
authorDaniel Stenberg <daniel@haxx.se>
Wed, 23 Mar 2016 09:04:48 +0000 (10:04 +0100)
committerDaniel Stenberg <daniel@haxx.se>
Wed, 23 Mar 2016 09:05:29 +0000 (10:05 +0100)
The removed arg is only done in OpenSSL

Bug: https://twitter.com/xtraemeat/status/712564874098917376

lib/vtls/openssl.c

index cbf2d212361000bee75f0e22a53e4b086da44cd3..b7e446253eba824126552c09ecb9f363a67494b5 100644 (file)
@@ -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