diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2018-06-02 15:22:13 +0200 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2018-06-03 12:14:12 +0200 |
| commit | 8f57662771356882561b98d6add06a16dc479f9b (patch) | |
| tree | 24431306e18685427ea07fcb74e8278c9f84069e /crypto/rand | |
| parent | 6da34cfbddede5e46f9c9183b724c99999dcfb41 (diff) | |
Add support for KERN_ARND to get random bytes on NetBSD
Reviewed-by: Andy Polyakov <appro@openssl.org>
GH: #6405
Diffstat (limited to 'crypto/rand')
| -rw-r--r-- | crypto/rand/rand_unix.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index 1f0084db4e..bde4ac16cb 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -23,7 +23,7 @@ # include <sys/sysctl.h> # include <sys/param.h> #endif -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__NetBSD__) # include <sys/param.h> #endif #ifdef OPENSSL_SYS_UNIX @@ -189,7 +189,7 @@ size_t rand_pool_acquire_entropy(RAND_POOL *pool) # error "librandom not (yet) supported" # endif -# if defined(__FreeBSD__) && defined(KERN_ARND) +# if (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(KERN_ARND) /* * sysctl_random(): Use sysctl() to read a random number from the kernel * Returns the size on success, 0 on failure. @@ -201,14 +201,25 @@ static size_t sysctl_random(char *buf, size_t buflen) size_t len; /* - * Old implementations returned longs, newer versions support variable - * sizes up to 256 byte. The code below would not work properly when - * the sysctl returns long and we want to request something not a multiple - * of longs, which should never be the case. + * On FreeBSD old implementations returned longs, newer versions support + * variable sizes up to 256 byte. The code below would not work properly + * when the sysctl returns long and we want to request something not a + * multiple of longs, which should never be the case. */ if (!ossl_assert(buflen % sizeof(long) == 0)) return 0; + /* + * On NetBSD before 4.0 KERN_ARND was an alias for KERN_URND, and only + * filled in an int, leaving the rest uninitialized. Since NetBSD 4.0 + * it returns a variable number of bytes with the current version supporting + * up to 256 bytes. + * Just return an error on older NetBSD versions. + */ +#if defined(__NetBSD__) && __NetBSD_Version__ < 400000000 + return 0; +#endif + mib[0] = CTL_KERN; mib[1] = KERN_ARND; @@ -239,7 +250,7 @@ int syscall_random(void *buf, size_t buflen) return (int)syscall(SYS_getrandom, buf, buflen, 0); # endif -# if defined(__FreeBSD__) && defined(KERN_ARND) +# if (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(KERN_ARND) return (int)sysctl_random(buf, buflen); # endif |