[openssl] openssl-3.0 update

[tomas at openssl.org]

The branch openssl-3.0 has been updated
       via  6e463bcd53fedbb4ec277a5eb885619e32adcdd2 (commit)
      from  ce5b392c8dc99f849dabea8bc9a21f66908b4188 (commit)


- Log -----------------------------------------------------------------
commit 6e463bcd53fedbb4ec277a5eb885619e32adcdd2
Author: PW Hu <jlu.hpw at foxmail.com>
Date:   Fri Oct 8 16:59:00 2021 +0800

    Bugfix: unsafe return check of EVP_PKEY_fromdata_init
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16783)
    
    (cherry picked from commit 5e199c356d09aca3b625b5ea16966b36d24b0201)

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

Summary of changes:
 apps/dhparam.c                     | 2 +-
 crypto/evp/p_lib.c                 | 2 +-
 test/helpers/predefined_dhparams.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/dhparam.c b/apps/dhparam.c
index 982b2db549..6b8546e93b 100644
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -383,7 +383,7 @@ static EVP_PKEY *dsa_to_dh(EVP_PKEY *dh)
 
     ctx = EVP_PKEY_CTX_new_from_name(NULL, "DHX", NULL);
     if (ctx == NULL
-            || !EVP_PKEY_fromdata_init(ctx)
+            || EVP_PKEY_fromdata_init(ctx) <= 0
             || !EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEY_PARAMETERS, params)) {
         BIO_printf(bio_err, "Error, failed to set DH parameters\n");
         goto err;
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 2bc1237488..424d11b259 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -630,7 +630,7 @@ static EVP_PKEY *new_cmac_key_int(const unsigned char *priv, size_t len,
     if (ctx == NULL)
         goto err;
 
-    if (!EVP_PKEY_fromdata_init(ctx)) {
+    if (EVP_PKEY_fromdata_init(ctx) <= 0) {
         ERR_raise(ERR_LIB_EVP, EVP_R_KEY_SETUP_FAILED);
         goto err;
     }
diff --git a/test/helpers/predefined_dhparams.c b/test/helpers/predefined_dhparams.c
index a6dd8c08a5..b2f6601188 100644
--- a/test/helpers/predefined_dhparams.c
+++ b/test/helpers/predefined_dhparams.c
@@ -23,7 +23,7 @@ static EVP_PKEY *get_dh_from_pg_bn(OSSL_LIB_CTX *libctx, const char *type,
     OSSL_PARAM *params = NULL;
     EVP_PKEY *dhpkey = NULL;
 
-    if (pctx == NULL || !EVP_PKEY_fromdata_init(pctx))
+    if (pctx == NULL || EVP_PKEY_fromdata_init(pctx) <= 0)
         goto err;
 
     if ((tmpl = OSSL_PARAM_BLD_new()) == NULL