[openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  41ffd2ab09d24692c71850ccd7d5ff154196fe01 (commit)
      from  1c3ace6898032b7b45d8106ba4e0d21d75b0997e (commit)


- Log -----------------------------------------------------------------
commit 41ffd2ab09d24692c71850ccd7d5ff154196fe01
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Wed Sep 4 11:39:54 2019 +0200

    Cleanup includes in rand_unix.c
    
    Fixes #9757
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9761)

-----------------------------------------------------------------------

Summary of changes:
 crypto/rand/rand_unix.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index e59882cde7..fb8a7b7c6d 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>