diff --git a/auto/unix b/auto/unix index ddb41934..5813e5e8 100644 --- a/auto/unix +++ b/auto/unix @@ -48,6 +48,49 @@ if [ $nxt_found = no ]; then fi +if [ $nxt_found = no ]; then + + # OpenBSD 5.6 lacks . + + nxt_feature="getentropy()" + nxt_feature_name=NXT_HAVE_GETENTROPY + nxt_feature_test="#include + + int main() { + char buf[4]; + + if (getentropy(buf, 4) == -1) { + return 1; + } + + return 0; + }" + . auto/feature +fi + + +if [ $nxt_found = no ]; then + + # macOS 10.12. + + nxt_feature="getentropy() in sys/random.h" + nxt_feature_name=NXT_HAVE_GETENTROPY_SYS_RANDOM + nxt_feature_test="#include + #include + + int main() { + char buf[4]; + + if (getentropy(buf, 4) == -1) { + return 1; + } + + return 0; + }" + . auto/feature +fi + + nxt_feature="ucontext" nxt_feature_name=NXT_HAVE_UCONTEXT nxt_feature_run= diff --git a/src/nxt_random.c b/src/nxt_random.c index b6c9f704..aaa39887 100644 --- a/src/nxt_random.c +++ b/src/nxt_random.c @@ -68,6 +68,14 @@ nxt_random_stir(nxt_random_t *r) n = syscall(SYS_getrandom, &key, NXT_RANDOM_KEY_SIZE, 0); +#elif (NXT_HAVE_GETENTROPY || NXT_HAVE_GETENTROPY_SYS_RANDOM) + + n = 0; + + if (getentropy(&key, NXT_RANDOM_KEY_SIZE) == 0) { + n = NXT_RANDOM_KEY_SIZE; + } + #else n = 0; diff --git a/src/nxt_unix.h b/src/nxt_unix.h index 33e9f247..151dd555 100644 --- a/src/nxt_unix.h +++ b/src/nxt_unix.h @@ -234,6 +234,8 @@ #include /* getrandom(). */ #elif (NXT_HAVE_LINUX_SYS_GETRANDOM) #include /* SYS_getrandom. */ +#elif (NXT_HAVE_GETENTROPY_SYS_RANDOM) +#include /* getentropy(). */ #endif