[openssl] master update

[tomas]

The branch master has been updated
       via  4bd60d486cbe59cc7d086985d42a5220fd12ce32 (commit)
      from  034f9f4f6e6213a46ae8c7ac79d6e34179ac6cca (commit)


- Log -----------------------------------------------------------------
commit 4bd60d486cbe59cc7d086985d42a5220fd12ce32
Author: Tomas Mraz <to...@openssl.org>
Date:   Thu Jul 22 15:25:32 2021 +0200

    do_sigver_init: Add missing ERR_clear_last_mark()
    
    Reviewed-by: Richard Levitte <levi...@openssl.org>
    Reviewed-by: Matt Caswell <m...@openssl.org>
    Reviewed-by: Paul Dale <pa...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16138)

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

Summary of changes:
 crypto/evp/m_sigver.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index ae79562e2d..f21865a8c3 100644
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -87,6 +87,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX 
**pctx,
     provkey = evp_pkey_export_to_provider(locpctx->pkey, locpctx->libctx,
                                           &tmp_keymgmt, locpctx->propquery);
     if (provkey == NULL) {
+        ERR_clear_last_mark();
         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
         goto err;
     }