[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  64fdea12beb7fa0a1c2d2c67ee998e3e5d895b0b (commit)
       via  7f791b25eb092ec78ff62e944ac3096c8d2f9311 (commit)
      from  31214258309251aff297da67a60a6b60bf4ef27e (commit)


- Log -----------------------------------------------------------------
commit 64fdea12beb7fa0a1c2d2c67ee998e3e5d895b0b
Author: Pauli <paul.dale at oracle.com>
Date:   Thu Jun 25 07:55:47 2020 +1000

    rand: include the CPU source in a build.
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/12267)

commit 7f791b25eb092ec78ff62e944ac3096c8d2f9311
Author: Pauli <paul.dale at oracle.com>
Date:   Thu Jun 25 07:46:36 2020 +1000

    rand: fix CPU and timer sources.
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/12267)

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

Summary of changes:
 .travis.yml                                            | 2 +-
 providers/implementations/rands/seeding/rand_cpu_x86.c | 1 +
 providers/implementations/rands/seeding/rand_tsc.c     | 1 +
 providers/implementations/rands/seeding/rand_unix.c    | 4 ++--
 providers/implementations/rands/seeding/rand_win.c     | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bc28ac7adf..be9ba1e68f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ jobs:
           env: CONFIG_OPTS="" DESTDIR="_install"
         - os: linux
           compiler: clang
-          env: CONFIG_OPTS="no-asm no-makedepend enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" CPPFLAGS="-ansi"
+          env: CONFIG_OPTS="no-asm no-makedepend enable-buildtest-c++ --strict-warnings --with-rand-seed=rdcpu,os -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" CPPFLAGS="-ansi"
         - os: osx
           compiler: gcc
         - os: osx
diff --git a/providers/implementations/rands/seeding/rand_cpu_x86.c b/providers/implementations/rands/seeding/rand_cpu_x86.c
index ba0f716426..fd47de9ad0 100644
--- a/providers/implementations/rands/seeding/rand_cpu_x86.c
+++ b/providers/implementations/rands/seeding/rand_cpu_x86.c
@@ -10,6 +10,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/opensslconf.h>
 #include "prov/rand_pool.h"
+#include "prov/seeding.h"
 
 #ifdef OPENSSL_RAND_SEED_RDCPU
 size_t OPENSSL_ia32_rdseed_bytes(unsigned char *buf, size_t len);
diff --git a/providers/implementations/rands/seeding/rand_tsc.c b/providers/implementations/rands/seeding/rand_tsc.c
index dd69aa438f..520f140fdf 100644
--- a/providers/implementations/rands/seeding/rand_tsc.c
+++ b/providers/implementations/rands/seeding/rand_tsc.c
@@ -10,6 +10,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/opensslconf.h>
 #include "prov/rand_pool.h"
+#include "prov/seeding.h"
 
 #ifdef OPENSSL_RAND_SEED_RDTSC
 /*
diff --git a/providers/implementations/rands/seeding/rand_unix.c b/providers/implementations/rands/seeding/rand_unix.c
index 77c5d26142..69fa3f841e 100644
--- a/providers/implementations/rands/seeding/rand_unix.c
+++ b/providers/implementations/rands/seeding/rand_unix.c
@@ -684,13 +684,13 @@ size_t prov_pool_acquire_entropy(RAND_POOL *pool)
 #   endif
 
 #   if defined(OPENSSL_RAND_SEED_RDTSC)
-    entropy_available = rand_acquire_entropy_from_tsc(pool);
+    entropy_available = prov_acquire_entropy_from_tsc(pool);
     if (entropy_available > 0)
         return entropy_available;
 #   endif
 
 #   if defined(OPENSSL_RAND_SEED_RDCPU)
-    entropy_available = rand_acquire_entropy_from_cpu(pool);
+    entropy_available = prov_acquire_entropy_from_cpu(pool);
     if (entropy_available > 0)
         return entropy_available;
 #   endif
diff --git a/providers/implementations/rands/seeding/rand_win.c b/providers/implementations/rands/seeding/rand_win.c
index a576109f6c..d820d3e395 100644
--- a/providers/implementations/rands/seeding/rand_win.c
+++ b/providers/implementations/rands/seeding/rand_win.c
@@ -53,13 +53,13 @@ size_t prov_pool_acquire_entropy(RAND_POOL *pool)
 
 
 # ifdef OPENSSL_RAND_SEED_RDTSC
-    entropy_available = rand_acquire_entropy_from_tsc(pool);
+    entropy_available = prov_acquire_entropy_from_tsc(pool);
     if (entropy_available > 0)
         return entropy_available;
 # endif
 
 # ifdef OPENSSL_RAND_SEED_RDCPU
-    entropy_available = rand_acquire_entropy_from_cpu(pool);
+    entropy_available = prov_acquire_entropy_from_cpu(pool);
     if (entropy_available > 0)
         return entropy_available;
 # endif