sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket23602_029'

This commit is contained in:
Nick Mathewson 2017-09-26 13:02:26 -04:00
parent 6beeb10070 564ff506ea
commit 2de588ffdb
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/ticket23602 Normal file
View File

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

9
configure.ac
View File

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