diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-04-05 10:38:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-04-05 10:38:53 -0400 |
| commit | b46d126e647a0789d362036e9a4d957f0d916aff (patch) | |
| tree | af46d5cb3c0445918818ac163cdf1c4ac8340a57 | |
| parent | 16f7851807995fd2b42f15b1303c8431d0f7ba38 (diff) | |
| parent | 967491f1566002861b4ff64cfcd68052acb35900 (diff) | |
| download | tor-b46d126e647a0789d362036e9a4d957f0d916aff.tar.gz tor-b46d126e647a0789d362036e9a4d957f0d916aff.zip | |
Merge branch 'maint-0.2.8'
| -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 |