[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  963eb12dbd551df71d7eb054e095c1b85f4aaab9 (commit)
      from  f541419c792600f6ebe476168587d2a1436d87a3 (commit)


- Log -----------------------------------------------------------------
commit 963eb12dbd551df71d7eb054e095c1b85f4aaab9
Author: x2018 <xkernel.wang at foxmail.com>
Date:   Tue Oct 26 11:31:11 2021 +0800

    free the Post-Handshake Auth digest when there is an error saving the digest
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16917)

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

Summary of changes:
 ssl/statem/statem_lib.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index eef2fe4367..79ac9be04b 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -2381,6 +2381,8 @@ int tls13_save_handshake_digest_for_pha(SSL *s)
         if (!EVP_MD_CTX_copy_ex(s->pha_dgst,
                                 s->s3.handshake_dgst)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
+            EVP_MD_CTX_free(s->pha_dgst);
+            s->pha_dgst = NULL;
             return 0;
         }
     }