diff options
| author | Omar Polo <op@omarpolo.com> | 2023-08-23 19:22:22 +0000 |
|---|---|---|
| committer | Omar Polo <op@omarpolo.com> | 2023-08-23 19:22:22 +0000 |
| commit | 74c6900c916b368b2f88d9f28cfdb5170cee5f6c (patch) | |
| tree | e98f3b4267fb42969012baa4dd74f49d771f3779 | |
| parent | 21b4a5163ce61f351f95e10eda89a312190476ce (diff) | |
fix previous; check for getentropy only when arc4random is missing
on macos we have the situation where we have arc4random available
but no getentropy().
| -rw-r--r-- | compat/getentropy.c | 2 | ||||
| -rwxr-xr-x | 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) @@ -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 |