[tor-commits] [tor/master] Only define NEW_THREAD_API when not building with LibreSSL.

nickm at torproject.org nickm at torproject.org
Tue Apr 5 14:39:03 UTC 2016


commit 967491f1566002861b4ff64cfcd68052acb35900
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 5 10:38:15 2016 -0400

    Only define NEW_THREAD_API when not building with LibreSSL.
---
 src/common/crypto.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 2da5791..d2a4269 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





More information about the tor-commits mailing list