[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  0449702abc95a3af24c049cb02c01ca6a8015cef (commit)
      from  0ec738433e522c96c7edfe4c9ffdc76d4dfef00a (commit)


- Log -----------------------------------------------------------------
commit 0449702abc95a3af24c049cb02c01ca6a8015cef
Author: Todd Short <tshort at akamai.com>
Date:   Fri Aug 13 09:59:59 2021 -0400

    Fix potential double-free
    
    The `sk` variable is assigned to `s->session->peer_chain`.
    If `ssl3_digest_cached_records()` were to fail, then `sk` would still be
    non-NULL, and subsequently freed on the error return. When the session
    is freed, it will then attempt to free `s->session->peer_chain`,
    resulting in a double-free (of `sk`).
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16309)

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

Summary of changes:
 ssl/statem/statem_srvr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 2be50733fe..d0d8d26e11 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -3556,6 +3556,7 @@ MSG_PROCESS_RETURN tls_process_client_certificate(SSL *s, PACKET *pkt)
 
     sk_X509_pop_free(s->session->peer_chain, X509_free);
     s->session->peer_chain = sk;
+    sk = NULL;
 
     /*
      * Freeze the handshake buffer. For <TLS1.3 we do this after the CKE
@@ -3570,7 +3571,6 @@ MSG_PROCESS_RETURN tls_process_client_certificate(SSL *s, PACKET *pkt)
      * Inconsistency alert: cert_chain does *not* include the peer's own
      * certificate, while we do include it in statem_clnt.c
      */
-    sk = NULL;
 
     /* Save the current hash state for when we receive the CertificateVerify */
     if (SSL_IS_TLS13(s)) {