From 74c6900c916b368b2f88d9f28cfdb5170cee5f6c Mon Sep 17 00:00:00 2001
From: Omar Polo <op@omarpolo.com>
Date: Wed, 23 Aug 2023 19:22:22 +0000
Subject: [PATCH] fix previous; check for getentropy only when arc4random is
 missing

on macos we have the situation where we have arc4random available
but no getentropy().
---
 compat/getentropy.c | 2 --
 configure           | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/compat/getentropy.c b/compat/getentropy.c
index 6a46b28..dc33884 100644
--- a/compat/getentropy.c
+++ b/compat/getentropy.c
@@ -41,13 +41,11 @@
 
 int _ssh_compat_getentropy(void *, size_t);
 
-#if 0
 static int
 seed_from_prngd(unsigned char *buf, size_t bytes)
 {
 	return -1;
 }
-#endif
 
 int
 _ssh_compat_getentropy(void *s, size_t len)
diff --git a/configure b/configure
index 32a89f7..726c160 100755
--- a/configure
+++ b/configure
@@ -287,7 +287,6 @@ runtest explicit_bzero	EXPLICIT_BZERO	|| true
 runtest freezero	FREEZERO	|| true
 runtest getdtablecount	GETDTABLECOUNT	|| true
 runtest getdtablesize	GETDTABLESIZE	|| true
-runtest getentropy	GETENTROPY	|| true
 runtest getprogname	GETPROGNAME	|| true
 runtest imsg		IMSG		"" -lutil libimsg || true
 runtest libevent	LIBEVENT	"" -levent libevent_core|| true
@@ -313,6 +312,10 @@ if [ ${HAVE_ARC4RANDOM} -eq 1 -a ${HAVE_ARC4RANDOM_BUF} -eq 0 ]; then
 	COMPATS="compat/arc4random.c ${COMPATS}"
 fi
 
+if [ ${HAVE_ARC4RANDOM} -eq 0 ]; then
+	runtest getentropy GETENTROPY || true
+fi
+
 if [ ${HAVE_ARC4RANDOM} -eq 0 -a ${HAVE_GETENTROPY} -eq 1 ]; then
 	COMPATS="compat/getentropy.c ${COMPATS}"
 fi