diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-04-05 10:38:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-04-05 10:38:15 -0400 |
| commit | 967491f1566002861b4ff64cfcd68052acb35900 (patch) | |
| tree | 6889b30ad07d02a36926b38b16211f4aedb39cdb /src/common/crypto.c | |
| parent | 92ae6b95243054644dd8515a9cfa11679440a579 (diff) | |
| download | tor-967491f1566002861b4ff64cfcd68052acb35900.tar.gz tor-967491f1566002861b4ff64cfcd68052acb35900.zip | |
Only define NEW_THREAD_API when not building with LibreSSL.
Diffstat (limited to 'src/common/crypto.c')
| -rw-r--r-- | src/common/crypto.c | 5 |
1 files changed, 3 insertions, 2 deletions
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 |