From: Patrick Steuer <patrick.steuer@de.ibm.com>
Date: Thu, 5 Oct 2017 16:20:30 +0000 (+0200)
Subject: e_os.h: add prandom and hwrng to the list of random devices on s390x.
X-Git-Tag: OpenSSL_1_1_1-pre1~524
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb9163ba4ddd95e9516fbd8695542460507ef3e6;p=thirdparty%2Fopenssl.git

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)
---

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)
 /*