diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-10-15 01:53:55 +0100 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2014-10-15 08:51:50 -0400 |
| commit | 7fd4ce6a997be5f5c9e744ac527725c2850de203 (patch) | |
| tree | 47c9d734943dc3430d697fe624dc09d81ab9725d /ssl/t1_lib.c | |
| parent | d9d09a8d0f2a42d02e9a4b11a9ac395a0e15b8ba (diff) | |
Fix for session tickets memory leak.
CVE-2014-3567
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 5dc6070a03779cd524f0e67f76c945cb0ac38320)
Diffstat (limited to 'ssl/t1_lib.c')
| -rw-r--r-- | ssl/t1_lib.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 12ee3c9a10..d6aff4b682 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -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); |