nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.8'

Browse Source
This commit is contained in:
Nick Mathewson 2016-04-05 10:38:53 -04:00
commit b46d126e64
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/crypto.c
View File

@ -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