[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  9fe4f5bc82bb7b5352ce4f55c86d53ce802f5053 (commit)
      from  ee067bc066ccc21462a1a489f8f1314c7207c01f (commit)


- Log -----------------------------------------------------------------
commit 9fe4f5bc82bb7b5352ce4f55c86d53ce802f5053
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 18 16:52:38 2021 +0100

    Fix a missing rand -> ossl_rand rename
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14609)

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

Summary of changes:
 providers/implementations/rands/seeding/rand_cpu_x86.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/providers/implementations/rands/seeding/rand_cpu_x86.c b/providers/implementations/rands/seeding/rand_cpu_x86.c
index 0bdf1c302f..39da74e293 100644
--- a/providers/implementations/rands/seeding/rand_cpu_x86.c
+++ b/providers/implementations/rands/seeding/rand_cpu_x86.c
@@ -35,7 +35,7 @@ static size_t get_hardware_random_value(unsigned char *buf, size_t len);
  * Returns the total entropy count, if it exceeds the requested
  * entropy count. Otherwise, returns an entropy count of 0.
  */
-size_t prov_acquire_entropy_from_cpu(RAND_POOL *pool)
+size_t ossl_prov_acquire_entropy_from_cpu(RAND_POOL *pool)
 {
     size_t bytes_needed;
     unsigned char *buffer;