From: Pauli <paul.dale@oracle.com>
Date: Thu, 29 Aug 2019 21:38:58 +0000 (+1000)
Subject: Don't include the DEVRANDOM being seeded logic on Android.
X-Git-Tag: OpenSSL_1_1_1d~41
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c6ab1bb54a56b167d7fd43bf688499635a9f2e56;p=oweals%2Fopenssl.git

Don't include the DEVRANDOM being seeded logic on Android.

It lacks exposure of the `shm*` functions and should prefer the GETRANDOM
source.

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/9735)

(cherry picked from commit 280cc0180862ae6664b88d5ea12cb5f599000d36)
---

diff --git a/e_os.h b/e_os.h
index fe4c0912bc..858bc40cb1 100644
--- a/e_os.h
+++ b/e_os.h
@@ -28,7 +28,7 @@
  * default, we will try to read at least one of these files
  */
 #  define DEVRANDOM "/dev/urandom", "/dev/random", "/dev/hwrng", "/dev/srandom"
-#  ifdef __linux
+#  if defined(__linux) && !defined(__ANDROID__)
 #   ifndef DEVRANDOM_WAIT
 #    define DEVRANDOM_WAIT   "/dev/random"
 #   endif