Commit Diff

Commit:
74c6900c916b368b2f88d9f28cfdb5170cee5f6c
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
fix previous; check for getentropy only when arc4random is missing on macos we have the situation where we have arc4random available but no getentropy().
Actions:
Patch | Tree
commit - 21b4a5163ce61f351f95e10eda89a312190476ce
commit + 74c6900c916b368b2f88d9f28cfdb5170cee5f6c
blob - 6a46b280913e335db942d3924037cf9611e61b94
blob + dc338844076d86d1fc83c8f5e10e340f11548d0e
--- compat/getentropy.c
+++ 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)
blob - 32a89f705207cf46f83dd94f91f80c30bf64f755
blob + 726c160350c4defb58ff690dfc6a596107a4d687
--- configure
+++ 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
 	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