summaryrefslogtreecommitdiffstats
path: root/e_os.h
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2019-08-30 07:38:58 +1000
committerPauli <paul.dale@oracle.com>2019-08-30 08:02:33 +1000
commitc6ab1bb54a56b167d7fd43bf688499635a9f2e56 (patch)
tree90d64824ee7aec5ffcb1c890a786904c9ec4f51e /e_os.h
parentf493bd6f94c646ba1d96d95f4e5c2a828c668f42 (diff)
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)
Diffstat (limited to 'e_os.h')
-rw-r--r--e_os.h2
1 files changed, 1 insertions, 1 deletions
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