summaryrefslogtreecommitdiff
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:01:34 +1000
commit280cc0180862ae6664b88d5ea12cb5f599000d36 (patch)
tree1ef44b92ac36897358bcd6768b7a47915c295e5c /e_os.h
parent46a9cc9451213039fd53f62733b2ccd04e853bb2 (diff)
downloadopenssl-new-280cc0180862ae6664b88d5ea12cb5f599000d36.tar.gz
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)
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 62d5c5ab1d..6cd7476296 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