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 'getentropy_028' into maint-0.2.8

Browse Source
This commit is contained in:
Nick Mathewson
2016-12-05 10:06:16 -05:00
parent 2a365413eb 714aeedc52
commit cc34ba1cec
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/crypto.c
+9
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