commit 2de588ffdbb3502ad680283ef5363125a1966de2
parent 6beeb10070190b8caf5af379476f725c38fbd663
Author: Nick Mathewson <nickm@torproject.org>
Date: Tue, 26 Sep 2017 13:02:26 -0400
Merge branch 'ticket23602_029'
Diffstat:
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/changes/ticket23602 b/changes/ticket23602
@@ -0,0 +1,6 @@
+ o Minor bugfixes (build):
+ - When searching for OpenSSL, don't accept any OpenSSL library that lacks
+ TLSv1_1_method(): Tor doesn't build with those versions. Additionally,
+ look in /usr/local/opt/openssl, if it's present. These changes
+ together repair the default build on OSX systems with Homebrew
+ installed. Fixes bug 23602; bugfix on 0.2.7.2-alpha.
diff --git a/configure.ac b/configure.ac
@@ -722,11 +722,12 @@ AC_ARG_WITH(ssl-dir,
fi
])
+AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1])
TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI],
- [#include <openssl/rand.h>],
- [void RAND_add(const void *buf, int num, double entropy);],
- [RAND_add((void*)0,0,0);], [],
- [/usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl])
+ [#include <openssl/ssl.h>],
+ [struct ssl_method_st; const struct ssl_method_st *TLSv1_1_method(void);],
+ [TLSv1_1_method();], [],
+ [/usr/local/opt/openssl /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl])
dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay()
