From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 5 Apr 2016 14:38:15 +0000 (-0400)
Subject: Only define NEW_THREAD_API when not building with LibreSSL.
X-Git-Tag: tor-0.2.8.3-alpha~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=967491f1566002861b4ff64cfcd68052acb35900;p=thirdparty%2Ftor.git

Only define NEW_THREAD_API when not building with LibreSSL.
---

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 2da579119b..d2a42698cb 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -72,11 +72,12 @@
 #define DISABLE_ENGINES
 #endif
 
-#if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,4)
+#if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,4) && \
+  !defined(LIBRESSL_VERSION_NUMBER)
 /* OpenSSL as of 1.1.0-pre4 has an "new" thread API, which doesn't require
  * seting up various callbacks.
  *
- * Note: Yes, using OPENSSL_VER is naughty, but theis was introduced in the
+ * Note: Yes, using OPENSSL_VER is naughty, but this was introduced in the
  * pre-release series.
  */
 #define NEW_THREAD_API