torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'no_openssl_100'

Browse Source
This commit is contained in:
Nick Mathewson
2016-10-06 16:36:49 -04:00
parent 80e2896d52 850ec1e282
commit 4f169a020a
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/no_openssl_100
+4
View File
@@ -0,0 +1,4 @@
o Required libraries:
- When building with OpenSSL, Tor now requires version 1.0.1 or later.
OpenSSL 1.0.0 and earlier are no longer supported by the openssl team,
and should not be used. Closes ticket 20303.
configure.ac
+2 -2
View File
@@ -614,12 +614,12 @@ CPPFLAGS="$TOR_CPPFLAGS_openssl $CPPFLAGS"
AC_TRY_COMPILE([
#include <openssl/opensslv.h>
#if OPENSSL_VERSION_NUMBER < 0x1000000fL
#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1000100fL
#error "too old"
#endif
], [],
[ : ],
[ AC_ERROR([OpenSSL is too old. We require 1.0.0 or later. You can specify a path to a newer one with --with-openssl-dir.]) ])
[ AC_ERROR([OpenSSL is too old. We require 1.0.1 or later. You can specify a path to a newer one with --with-openssl-dir.]) ])
AC_TRY_COMPILE([
#include <openssl/opensslv.h>
src/common/compat_openssl.h
+3 -2
View File
@@ -15,8 +15,9 @@
* \brief compatability definitions for working with different openssl forks
**/
#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0)
#error "We require OpenSSL >= 1.0.0"
#if !defined(LIBRESSL_VERSION_NUMBER) && \
OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,1)
#error "We require OpenSSL >= 1.0.1"
#endif
#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && \