From: nia <nia@netbsd.org>
Date: Thu, 30 Apr 2020 13:41:07 +0000 (+0100)
Subject: rand_unix.c: Include correct headers for sysctl() on NetBSD
X-Git-Tag: openssl-3.0.0-alpha2~95
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e2e4b784e65eaafb133a7db3d344446c43112d41;p=oweals%2Fopenssl.git

rand_unix.c: Include correct headers for sysctl() on NetBSD

This allows sysctl(KERN_ARND) to be detected properly.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11689)
---

diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index 319c6e4c53..6b6cc78f80 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -27,12 +27,12 @@
 #  include <sys/utsname.h>
 # endif
 #endif
-#if defined(__FreeBSD__) && !defined(OPENSSL_SYS_UEFI)
+#if (defined(__FreeBSD__) || defined(__NetBSD__)) && !defined(OPENSSL_SYS_UEFI)
 # include <sys/types.h>
 # include <sys/sysctl.h>
 # include <sys/param.h>
 #endif
-#if defined(__OpenBSD__) || defined(__NetBSD__)
+#if defined(__OpenBSD__)
 # include <sys/param.h>
 #endif