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

Merge branch 'maint-0.2.8' into release-0.2.8

This commit is contained in:
Nick Mathewson 2016-12-05 10:06:25 -05:00
parent 5b336f2e0b cc34ba1cec
commit 212d984dc5
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/bug20865 Normal file
View File

@ -0,0 +1,7 @@
o Minor bugfixes (portability):
- Avoid compilation errors when building on OSX Sierra. Sierra began
to support the getentropy() API, but created a few problems in
doing so. Tor 0.2.9 has a more thorough set of workarounds; in
0.2.8, we are just using the /dev/urandom interface. Fixes
bug 20865. Bugfix on 0.2.8.1-alpha.

9
src/common/crypto.c
View File

@ -88,6 +88,15 @@
#include "keccak-tiny/keccak-tiny.h"
#ifdef __APPLE__
/* Apple messed up their getentropy definitions in Sierra. It's not insecure
* or anything (as far as I know) but it makes compatible builds hard. 0.2.9
* contains the necessary tricks to do it right: in 0.2.8, we're just using
* this blunt instrument.
*/
#undef HAVE_GETENTROPY
#endif
#ifdef ANDROID
/* Android's OpenSSL seems to have removed all of its Engine support. */
#define DISABLE_ENGINES