[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  c9007bda79291179ed2df31b3dfd9f1311102847 (commit)
      from  e48fe798409eb22f067f635c62b9a72e18cd4347 (commit)


- Log -----------------------------------------------------------------
commit c9007bda79291179ed2df31b3dfd9f1311102847
Author: Peiwei Hu <jlu.hpw at foxmail.com>
Date:   Mon Nov 15 00:20:32 2021 +0800

    RAND_bytes_ex: fix return check
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17032)

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

Summary of changes:
 ssl/record/tls_pad.c | 2 +-
 test/provfetchtest.c | 2 +-
 test/sslapitest.c    | 2 +-
 test/tls-provider.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ssl/record/tls_pad.c b/ssl/record/tls_pad.c
index 528c605554..e559350461 100644
--- a/ssl/record/tls_pad.c
+++ b/ssl/record/tls_pad.c
@@ -251,7 +251,7 @@ static int ssl3_cbc_copy_mac(size_t *reclen,
     }
 
     /* Create the random MAC we will emit if padding is bad */
-    if (!RAND_bytes_ex(libctx, randmac, mac_size, 0))
+    if (RAND_bytes_ex(libctx, randmac, mac_size, 0) <= 0)
         return 0;
 
     if (!ossl_assert(mac != NULL && alloced != NULL))
diff --git a/test/provfetchtest.c b/test/provfetchtest.c
index 1d09e6a0db..b1f9d08c46 100644
--- a/test/provfetchtest.c
+++ b/test/provfetchtest.c
@@ -213,7 +213,7 @@ static int dummy_provider_init(const OSSL_CORE_HANDLE *handle,
      * Do some work using the child libctx, to make sure this is possible from
      * inside the init function.
      */
-    if (!RAND_bytes_ex(libctx, buf, sizeof(buf), 0))
+    if (RAND_bytes_ex(libctx, buf, sizeof(buf), 0) <= 0)
         return 0;
 
     return 1;
diff --git a/test/sslapitest.c b/test/sslapitest.c
index 722106889b..b06d5d7a14 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -1337,7 +1337,7 @@ static int execute_test_ktls_sendfile(int tls_version, const char *cipher)
         goto end;
     }
 
-    if (!TEST_true(RAND_bytes_ex(libctx, buf, SENDFILE_SZ, 0)))
+    if (!TEST_int_gt(RAND_bytes_ex(libctx, buf, SENDFILE_SZ, 0), 0))
         goto end;
 
     out = BIO_new_file(tmpfilename, "wb");
diff --git a/test/tls-provider.c b/test/tls-provider.c
index f8eeaeb363..9ac1db51b3 100644
--- a/test/tls-provider.c
+++ b/test/tls-provider.c
@@ -813,7 +813,7 @@ unsigned int randomize_tls_group_id(OSSL_LIB_CTX *libctx)
     int i;
 
  retry:
-    if (!RAND_bytes_ex(libctx, (unsigned char *)&group_id, sizeof(group_id), 0))
+    if (RAND_bytes_ex(libctx, (unsigned char *)&group_id, sizeof(group_id), 0) <= 0)
         return 0;
     /*
      * Ensure group_id is within the IANA Reserved for private use range