[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  1b87116a0c43b8b4e1ad88b851d5bcf27c1a5f64 (commit)
      from  fd84b9c3e94be1771d1b34ad857081f7693318aa (commit)


- Log -----------------------------------------------------------------
commit 1b87116a0c43b8b4e1ad88b851d5bcf27c1a5f64
Author: xkernel <xkernel.wang at foxmail.com>
Date:   Tue Jan 4 21:18:02 2022 +0800

    properly free the resource from CRYPTO_malloc
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17412)

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

Summary of changes:
 ssl/statem/statem_clnt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 10e778d681..3e94d9e185 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -3187,7 +3187,7 @@ static int tls_construct_cke_gost18(SSL *s, WPACKET *pkt)
     if (peer_cert == NULL) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
                  SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER);
-        return 0;
+        goto err;
     }
 
     pkey_ctx = EVP_PKEY_CTX_new_from_pkey(s->ctx->libctx,
@@ -3195,7 +3195,7 @@ static int tls_construct_cke_gost18(SSL *s, WPACKET *pkt)
                                           s->ctx->propq);
     if (pkey_ctx == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_MALLOC_FAILURE);
-        return 0;
+        goto err;
     }
 
     if (EVP_PKEY_encrypt_init(pkey_ctx) <= 0) {