rand: fix CPU and timer sources.

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/12267)

diff --git a/providers/implementations/rands/seeding/rand_cpu_x86.c b/providers/implementations/rands/seeding/rand_cpu_x86.c
index ba0f716426b09982df1276ee84d37aa9745b70c5..fd47de9ad016630b4bc23a116c06263be35a5bfd 100644 (file)
--- 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 dd69aa438f90c9e65b035a5a7871744fd9698015..520f140fdfa9211f250c19596c1093698a6a8112 100644 (file)
--- 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 77c5d261428e3406c9d3db337c528309fd49b9c0..69fa3f841e37d7060b6b06be7ed4cefe5bcb00c6 100644 (file)
--- 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 a576109f6cff481a17b5fa2ea1d3c5e383509ed0..d820d3e395c1e51ae61ade376935ec57e9ccc86b 100644 (file)
--- 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