diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-07 17:13:49 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-07 17:24:55 +0200 |
| commit | 318392ca7cda813f4117688ce622fcef252744bc (patch) | |
| tree | 1f510070d05a958673c2d9e559a56ed837919205 /src | |
| parent | fa646369489d5655ac187f2a9e151317829581df (diff) | |
| parent | ee2d10ad0c0e04d0b9da4535a6fff265ac2501e5 (diff) | |
| download | bitcoin-318392ca7cda813f4117688ce622fcef252744bc.tar.xz | |
Merge #10301: Check if sys/random.h is required for getentropy.
ee2d10a Check if sys/random.h is required for getentropy on OSX. (James Hilliard)
Pull request description:
This should check and include sys/random.h if required for osx as mentioned [here](https://github.com/bitcoin/bitcoin/pull/9821#issuecomment-290936636).
Tree-SHA512: e9491f67f2e8b2e6bcdbcbb8063295e844d5627daf5336e3e17b4a8027d888fa65a08e4580a745abdc35ffd8d86b4fc7434daaac172c4a06ab7566a2ed0bfb92
Diffstat (limited to 'src')
| -rw-r--r-- | src/random.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/random.cpp b/src/random.cpp index b308e8f4a1..e07ef44471 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -27,9 +27,12 @@ #include <sys/syscall.h> #include <linux/random.h> #endif -#ifdef HAVE_GETENTROPY +#if defined(HAVE_GETENTROPY) || (defined(HAVE_GETENTROPY_RAND) && defined(MAC_OSX)) #include <unistd.h> #endif +#if defined(HAVE_GETENTROPY_RAND) && defined(MAC_OSX) +#include <sys/random.h> +#endif #ifdef HAVE_SYSCTL_ARND #include <sys/sysctl.h> #endif @@ -237,6 +240,15 @@ void GetOSRand(unsigned char *ent32) if (getentropy(ent32, NUM_OS_RANDOM_BYTES) != 0) { RandFailure(); } +#elif defined(HAVE_GETENTROPY_RAND) && defined(MAC_OSX) + // We need a fallback for OSX < 10.12 + if (&getentropy != NULL) { + if (getentropy(ent32, NUM_OS_RANDOM_BYTES) != 0) { + RandFailure(); + } + } else { + GetDevURandom(ent32); + } #elif defined(HAVE_SYSCTL_ARND) /* FreeBSD and similar. It is possible for the call to return less * bytes than requested, so need to read in a loop. |