From aa3416215e980a2ec87ac259be0ea39f1caf96df Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Thu, 17 Aug 2017 13:53:04 +0200 Subject: lib: Check system-specific call first The build failed on OS X if an old version of libgrypt is installed. --- src/lib/random.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib') diff --git a/src/lib/random.c b/src/lib/random.c index 5d6763ca..66aefaa3 100644 --- a/src/lib/random.c +++ b/src/lib/random.c @@ -47,18 +47,18 @@ int random_buffer(void * buf, size_t len) { -#if defined(HAVE_SYS_RANDOM) - return getrandom(buf, len, GRND_NONBLOCK); /* glibc 2.25 */ -#elif defined(HAVE_LIBGCRYPT) - return gcry_randomize(buf, len, GCRY_STRONG_RANDOM); +#if defined(__APPLE__) + return getentropy(buf, len); #elif defined(__FreeBSD__) arc4random_buf(buf, len); return 0; +#elif defined(HAVE_SYS_RANDOM) + return getrandom(buf, len, GRND_NONBLOCK); /* glibc 2.25 */ +#elif defined(HAVE_LIBGCRYPT) + return gcry_randomize(buf, len, GCRY_STRONG_RANDOM); #elif defined(HAVE_OPENSSL) if (len > 0 && len < INT_MAX) return RAND_bytes((unsigned char *) buf, (int) len); return -1; -#elif defined(__APPLE__) - return getentropy(buf, len); #endif } -- cgit v1.2.3