From 7f791b25eb092ec78ff62e944ac3096c8d2f9311 Mon Sep 17 00:00:00 2001 From: Pauli Date: Thu, 25 Jun 2020 07:46:36 +1000 Subject: [PATCH] rand: fix CPU and timer sources. Reviewed-by: Bernd Edlinger (Merged from https://github.com/openssl/openssl/pull/12267) --- 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 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/providers/implementations/rands/seeding/rand_cpu_x86.c b/providers/implementations/rands/seeding/rand_cpu_x86.c index ba0f716426b..fd47de9ad01 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 #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 dd69aa438f9..520f140fdfa 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 #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 77c5d261428..69fa3f841e3 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 a576109f6cf..d820d3e395c 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 -- 2.47.2