[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  d5d95daba59adc41ab60ea86acd513f255fca3c0 (commit)
      from  34563be5368fb8e6ade7d06d8376522ba83cd6ac (commit)


- Log -----------------------------------------------------------------
commit d5d95daba59adc41ab60ea86acd513f255fca3c0
Author: Tomas Mraz <tomas at openssl.org>
Date:   Thu Oct 14 11:02:36 2021 +0200

    Raise error when invalid digest used with SM2
    
    Otherwise commands like openssl req -newkey sm2 fail silently without
    reporting any error unless -sm3 option is added.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16833)

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

Summary of changes:
 providers/implementations/signature/sm2_sig.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/providers/implementations/signature/sm2_sig.c b/providers/implementations/signature/sm2_sig.c
index 719e7a2eb2..10a9496904 100644
--- a/providers/implementations/signature/sm2_sig.c
+++ b/providers/implementations/signature/sm2_sig.c
@@ -94,9 +94,13 @@ static int sm2sig_set_mdname(PROV_SM2_CTX *psm2ctx, const char *mdname)
     if (psm2ctx->md == NULL) /* We need an SM3 md to compare with */
         psm2ctx->md = EVP_MD_fetch(psm2ctx->libctx, psm2ctx->mdname,
                                    psm2ctx->propq);
-    if (psm2ctx->md == NULL
-        || strlen(mdname) >= sizeof(psm2ctx->mdname)
+    if (psm2ctx->md == NULL)
+        return 0;
+
+    if (strlen(mdname) >= sizeof(psm2ctx->mdname)
         || !EVP_MD_is_a(psm2ctx->md, mdname)) {
+        ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST, "digest=%s",
+                       mdname);
         return 0;
     }