The branch master has been updated via 280cc0180862ae6664b88d5ea12cb5f599000d36 (commit) from 46a9cc9451213039fd53f62733b2ccd04e853bb2 (commit)
- Log ----------------------------------------------------------------- commit 280cc0180862ae6664b88d5ea12cb5f599000d36 Author: Pauli <paul.d...@oracle.com> 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 <matthias.st.pie...@ncp-e.com> Reviewed-by: Bernd Edlinger <bernd.edlin...@hotmail.de> (Merged from https://github.com/openssl/openssl/pull/9735) ----------------------------------------------------------------------- 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 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