[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  fb9163ba4ddd95e9516fbd8695542460507ef3e6 (commit)
      from  f84a648ca1da0177e7ed1d4b50312c5dd6a2c0c8 (commit)


- Log -----------------------------------------------------------------
commit fb9163ba4ddd95e9516fbd8695542460507ef3e6
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Thu Oct 5 18:20:30 2017 +0200

    e_os.h: add prandom and hwrng to the list of random devices on s390x.
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/4534)

-----------------------------------------------------------------------

Summary of changes:
 e_os.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/e_os.h b/e_os.h
index e76fb43..f3b8fb8 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)
 /*