Commit 7fd4ce6a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson Committed by Geoff Thorpe
Browse files

Fix for session tickets memory leak. 



CVE-2014-3567

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(cherry picked from commit 5dc6070a03779cd524f0e67f76c945cb0ac38320)
parent d9d09a8d

ssl/t1_lib.c

+3 −0
Original line number Diff line number Diff line
@@ -2348,7 +2348,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);