From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 15 Oct 2014 00:53:55 +0000 (+0100)
Subject: Fix for session tickets memory leak.
X-Git-Tag: master-post-reformat~337
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=748270554824d2a51d1718f52a8d3ab34116bbfb;p=oweals%2Fopenssl.git

Fix for session tickets memory leak.

CVE-2014-3567

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 879467cd7c..77fe232526 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -3380,7 +3380,10 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen,
 	HMAC_Final(&hctx, tick_hmac, NULL);
 	HMAC_CTX_cleanup(&hctx);
 	if (CRYPTO_memcmp(tick_hmac, etick + eticklen, mlen))
+		{
+		EVP_CIPHER_CTX_cleanup(&ctx);
 		return 2;
+		}
 	/* Attempt to decrypt session data */
 	/* Move p after IV to start of encrypted ticket, update length */
 	p = etick + 16 + EVP_CIPHER_CTX_iv_length(&ctx);