aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Steuer <patrick.steuer@de.ibm.com>2017-10-05 18:20:30 +0200
committerAndy Polyakov <appro@openssl.org>2017-10-22 22:56:18 +0200
commitfb9163ba4ddd95e9516fbd8695542460507ef3e6 (patch)
tree88d288330d5d93d8f6ab99a5b47dccaa35170cf6
parentf84a648ca1da0177e7ed1d4b50312c5dd6a2c0c8 (diff)
downloadopenssl-fb9163ba4ddd95e9516fbd8695542460507ef3e6.tar.gz
e_os.h: add prandom and hwrng to the list of random devices on s390x.
Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com> Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/4534)
-rw-r--r--e_os.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/e_os.h b/e_os.h
index e76fb43a4d..f3b8fb830d 100644
--- a/e_os.h
+++ b/e_os.h
@@ -58,7 +58,11 @@ extern "C" {
* set this to a comma-separated list of 'random' device files to try out. By
* default, we will try to read at least one of these files
*/
-# define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom"
+# if defined(__s390__)
+# define DEVRANDOM "/dev/prandom","/dev/urandom","/dev/hwrng","/dev/random"
+# else
+# define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom"
+# endif
# endif
# if !defined(OPENSSL_NO_EGD) && !defined(DEVRANDOM_EGD)
/*