The branch OpenSSL_1_1_1-stable has been updated
via c6ab1bb54a56b167d7fd43bf688499635a9f2e56 (commit)
from f493bd6f94c646ba1d96d95f4e5c2a828c668f42 (commit)
- Log -----------------------------------------------------------------
commit c6ab1bb54a56b167d7fd43bf688499635a9f2e56
Author: Pauli <[email protected]>
Date: Fri Aug 30 07:38:58 2019 +1000
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 <[email protected]>
Reviewed-by: Bernd Edlinger <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/9735)
(cherry picked from commit 280cc0180862ae6664b88d5ea12cb5f599000d36)
-----------------------------------------------------------------------
Summary of changes:
e_os.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
