[openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  09dca557332a2187598932388ac7bd7bbf16172b (commit)
      from  d43597c718dd6e4f2b18d5cec1eb791503a18988 (commit)


- Log -----------------------------------------------------------------
commit 09dca557332a2187598932388ac7bd7bbf16172b
Author: Jiasheng Jiang <jiasheng at iscas.ac.cn>
Date:   Tue Feb 15 17:45:04 2022 +0800

    rand: Add missing check for rand_get_global
    
    As the potential failure of the rand_get_global(),
    for example fail to get lock, 'dgbl' could be NULL
    pointer and be dereferenced later.
    Therefore, it should be better to check it and return
    error if fails, like RAND_get0_primary() and other callers.
    
    Signed-off-by: Jiasheng Jiang <jiasheng at iscas.ac.cn>
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/17690)

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

Summary of changes:
 crypto/rand/rand_lib.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 4f36e84bd4..c772bcc79c 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -529,6 +529,8 @@ static EVP_RAND_CTX *rand_new_seed(OSSL_LIB_CTX *libctx)
     EVP_RAND_CTX *ctx;
     char *name;
 
+    if (dgbl == NULL)
+        return NULL;
     name = dgbl->seed_name != NULL ? dgbl->seed_name : "SEED-SRC";
     rand = EVP_RAND_fetch(libctx, name, dgbl->seed_propq);
     if (rand == NULL) {
@@ -561,6 +563,8 @@ static EVP_RAND_CTX *rand_new_drbg(OSSL_LIB_CTX *libctx, EVP_RAND_CTX *parent,
     const OSSL_PARAM *settables;
     char *name, *cipher;
 
+    if (dgbl == NULL)
+        return NULL;
     name = dgbl->rng_name != NULL ? dgbl->rng_name : "CTR-DRBG";
     rand = EVP_RAND_fetch(libctx, name, dgbl->rng_propq);
     if (rand == NULL) {
@@ -763,6 +767,9 @@ static int random_conf_init(CONF_IMODULE *md, const CONF *cnf)
         return 0;
     }
 
+    if (dgbl == NULL)
+        return 0;
+
     for (i = 0; i < sk_CONF_VALUE_num(elist); i++) {
         cval = sk_CONF_VALUE_value(elist, i);
         if (strcasecmp(cval->name, "random") == 0) {