commit 9326abe16ac720346885e0ac555d6625233e198c Author: Taylor Yu catalyst@torproject.org Date: Mon May 7 12:43:39 2018 -0500

Restore sys/random.h inclusion for getentropy()

Code movement for the refactoring for ticket 24658 didn't copy the inclusion of sys/random.h, which is needed to get a prototype for getentropy() on macOS 10.12 Sierra. It also didn't copy the inclusion of sys/syscall.h, which might prevent the getrandom() syscall from being properly detected. Move these inclusions. Bug not in any released Tor. --- src/common/crypto.c | 6 ------ src/common/crypto_rand.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c index e148878be..052f31723 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -60,12 +60,6 @@ ENABLE_GCC_WARNING(redundant-decls) #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef HAVE_SYS_SYSCALL_H -#include <sys/syscall.h> -#endif -#ifdef HAVE_SYS_RANDOM_H -#include <sys/random.h> -#endif

#include "torlog.h" #include "torint.h" diff --git a/src/common/crypto_rand.c b/src/common/crypto_rand.c index 5abf0b096..df2e2f65d 100644 --- a/src/common/crypto_rand.c +++ b/src/common/crypto_rand.c @@ -55,6 +55,12 @@ ENABLE_GCC_WARNING(redundant-decls) #ifdef HAVE_UNISTD_H #include <unistd.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +#include <sys/syscall.h> +#endif +#ifdef HAVE_SYS_RANDOM_H +#include <sys/random.h> +#endif

/** * How many bytes of entropy we add at once.