mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
20865: Don't use getentropy() on OSX Sierra.
Tor 0.2.9 has a broader range of fixes and workarounds here, but for 0.2.8, we're just going to maintain the existing behavior. (The alternative would be to backport both1eba088054and16fcbd21c9, but the latter is kind of a subtle kludge in the configure.ac script, and I'm not a fan of backporting that kind of thing.)
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user