From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Wed, 4 Sep 2019 09:39:54 +0000 (+0200)
Subject: Cleanup includes in rand_unix.c
X-Git-Tag: OpenSSL_1_1_1d~34
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ce1ab24163e451b21de91d49ed8e8c45ccfbcae0;hp=aa24cc01957f813beb5329c26ae581fe6b7482a7;p=oweals%2Fopenssl.git

Cleanup includes in rand_unix.c

Fixes #9757

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9761)

(cherry picked from commit 41ffd2ab09d24692c71850ccd7d5ff154196fe01)
---

diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index d118360366..1f608c9565 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -19,11 +19,12 @@
 #include "internal/rand_int.h"
 #include <stdio.h>
 #include "internal/dso.h"
-#if defined(__linux)
-# include <asm/unistd.h>
-# include <sys/ipc.h>
-# include <sys/shm.h>
-# include <sys/utsname.h>
+#ifdef __linux
+# include <sys/syscall.h>
+# ifdef DEVRANDOM_WAIT
+#  include <sys/shm.h>
+#  include <sys/utsname.h>
+# endif
 #endif
 #if defined(__FreeBSD__) && !defined(OPENSSL_SYS_UEFI)
 # include <sys/types.h>