From a8897115626ab6509c67511e50e73c0f7c953c6a Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 17 Mar 2020 13:00:31 +0800
Subject: rand: remove getentropy() fallback for macOS < 10.12

---
 src/random.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/random.cpp b/src/random.cpp
index f0082cf3e0..f53427c711 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -315,13 +315,10 @@ void GetOSRand(unsigned char *ent32)
         RandFailure();
     }
 #elif defined(HAVE_GETENTROPY_RAND) && defined(MAC_OSX)
-    // We need a fallback for OSX < 10.12
-    if (&getentropy != nullptr) {
-        if (getentropy(ent32, NUM_OS_RANDOM_BYTES) != 0) {
-            RandFailure();
-        }
-    } else {
-        GetDevURandom(ent32);
+    /* getentropy() is available on macOS 10.12 and later.
+     */
+    if (getentropy(ent32, NUM_OS_RANDOM_BYTES) != 0) {
+        RandFailure();
     }
 #elif defined(HAVE_SYSCTL_ARND)
     /* FreeBSD and similar. It is possible for the call to return less
-- 
cgit v1.2.3


From f9f210d8de43b4559fe7c80bb286aeb60de52b54 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 17 Mar 2020 13:09:52 +0800
Subject: doc: fix GetTimeMicros() comment in random.cpp

---
 src/random.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/random.cpp b/src/random.cpp
index f53427c711..f7f3dd9de3 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -15,7 +15,7 @@
 #endif
 #include <logging.h>  // for LogPrintf()
 #include <sync.h>     // for Mutex
-#include <util/time.h> // for GetTime()
+#include <util/time.h> // for GetTimeMicros()
 
 #include <stdlib.h>
 #include <thread>
-- 
cgit v1.2.3