diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-10-15 02:01:16 +0100 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2014-10-15 08:46:57 -0400 |
| commit | 2ed80d14d7159de7b52c7720128459e8c24a94d5 (patch) | |
| tree | 0b1f6d41ad57602b3dbcf29564c916abf69fff2e | |
| parent | d2866063015d839569c2323cae85d1d27ccdb484 (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 90e53055939db40cf0fac1ad0c59630280aeee86)
| -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 8638eb9a41..68c527dfdf 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -1101,7 +1101,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); goto tickerr; + } /* 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); |