[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  72960279562e9af53264155a46b4a0b6a40f9590 (commit)
      from  f11a023adaae8ba037f952fd72dfbcc34733c993 (commit)


- Log -----------------------------------------------------------------
commit 72960279562e9af53264155a46b4a0b6a40f9590
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Feb 10 00:30:29 2018 +0100

    Use both getrandom() and /dev/urandom by default on Linux.
    
    getrandom() is now used on Linux by default when using Linux >= 3.17
    and glibc >= 2.25
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    GH: #5314

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

Summary of changes:
 crypto/rand/rand_unix.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index f5a59cb..bfd7ef0 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -14,10 +14,6 @@
 #include "rand_lcl.h"
 #include <stdio.h>
 
-#ifdef OPENSSL_RAND_SEED_GETRANDOM
-# include <linux/random.h>
-#endif
-
 #if (defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)) && \
         !defined(OPENSSL_RAND_SEED_NONE)
 # error "UEFI and VXWorks only support seeding NONE"
@@ -123,11 +119,19 @@ size_t RAND_POOL_acquire_entropy(RAND_POOL *pool)
 #  endif
 
 #  if defined(OPENSSL_RAND_SEED_OS)
-#   if defined(DEVRANDOM)
-#    define OPENSSL_RAND_SEED_DEVRANDOM
-#   else
+#   if !defined(DEVRANDOM)
 #    error "OS seeding requires DEVRANDOM to be configured"
 #   endif
+#   define OPENSSL_RAND_SEED_DEVRANDOM
+#   if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#    if __GLIBC_PREREQ(2, 25)
+#     define OPENSSL_RAND_SEED_GETRANDOM
+#    endif
+#   endif
+#  endif
+
+#  ifdef OPENSSL_RAND_SEED_GETRANDOM
+#   include <sys/random.h>
 #  endif
 
 #  if defined(OPENSSL_RAND_SEED_LIBRANDOM)