diff options
Diffstat (limited to 'arc4random.c')
-rw-r--r-- | arc4random.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/arc4random.c b/arc4random.c index be64452b..8729f6b9 100644 --- a/arc4random.c +++ b/arc4random.c @@ -63,6 +63,9 @@ #ifdef EVENT__HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> #endif +#ifdef EVENT__HAVE_SYS_RANDOM_H +#include <sys/random.h> +#endif #endif #include <limits.h> #include <stdlib.h> @@ -167,17 +170,11 @@ arc4_seed_win32(void) } #endif -#if defined(EVENT__HAVE_SYS_SYSCTL_H) && defined(EVENT__HAVE_SYSCTL) -#if EVENT__HAVE_DECL_CTL_KERN && EVENT__HAVE_DECL_KERN_RANDOM && EVENT__HAVE_DECL_RANDOM_UUID -#define TRY_SEED_SYSCTL_LINUX +#if defined(EVENT__HAVE_GETRANDOM) +#define TRY_SEED_GETRANDOM static int -arc4_seed_sysctl_linux(void) +arc4_seed_getrandom(void) { - /* Based on code by William Ahern, this function tries to use the - * RANDOM_UUID sysctl to get entropy from the kernel. This can work - * even if /dev/urandom is inaccessible for some reason (e.g., we're - * running in a chroot). */ - int mib[] = { CTL_KERN, KERN_RANDOM, RANDOM_UUID }; unsigned char buf[ADD_ENTROPY]; size_t len, n; unsigned i; @@ -188,7 +185,7 @@ arc4_seed_sysctl_linux(void) for (len = 0; len < sizeof(buf); len += n) { n = sizeof(buf) - len; - if (0 != sysctl(mib, 3, &buf[len], &n, NULL, 0)) + if (0 == getrandom(&buf[len], n, 0)) return -1; } /* make sure that the buffer actually got set. */ @@ -202,8 +199,9 @@ arc4_seed_sysctl_linux(void) evutil_memclear_(buf, sizeof(buf)); return 0; } -#endif +#endif /* EVENT__HAVE_GETRANDOM */ +#if defined(EVENT__HAVE_SYS_SYSCTL_H) && defined(EVENT__HAVE_SYSCTL) #if EVENT__HAVE_DECL_CTL_KERN && EVENT__HAVE_DECL_KERN_ARND #define TRY_SEED_SYSCTL_BSD static int @@ -342,6 +340,10 @@ arc4_seed(void) if (0 == arc4_seed_win32()) ok = 1; #endif +#ifdef TRY_SEED_GETRANDOM + if (0 == arc4_seed_getrandom()) + ok = 1; +#endif #ifdef TRY_SEED_URANDOM if (0 == arc4_seed_urandom()) ok = 1; @@ -351,12 +353,6 @@ arc4_seed(void) 0 == arc4_seed_proc_sys_kernel_random_uuid()) ok = 1; #endif -#ifdef TRY_SEED_SYSCTL_LINUX - /* Apparently Linux is deprecating sysctl, and spewing warning - * messages when you try to use it. */ - if (!ok && 0 == arc4_seed_sysctl_linux()) - ok = 1; -#endif #ifdef TRY_SEED_SYSCTL_BSD if (0 == arc4_seed_sysctl_bsd()) ok = 1; |