From 6f221e66d41547cd46df26cacc00cc07d73c71a5 Mon Sep 17 00:00:00 2001 From: Catalin Popeanga Date: Wed, 15 Oct 2014 17:33:31 +0200 Subject: Fix CVE-2014-3567 Fix for session tickets memory leak. This patch is a backport from OpenSSL_1.0.1j. Signed-off-by: Catalin Popeanga --- .../openssl/openssl-fix-CVE-2014-3567.patch | 31 ++++++++++++++++++++++ .../recipes-connectivity/openssl/openssl_1.0.1g.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/openssl-fix-CVE-2014-3567.patch diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-fix-CVE-2014-3567.patch b/meta/recipes-connectivity/openssl/openssl/openssl-fix-CVE-2014-3567.patch new file mode 100644 index 0000000000..afd283e3f8 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/openssl-fix-CVE-2014-3567.patch @@ -0,0 +1,31 @@ +From 748270554824d2a51d1718f52a8d3ab34116bbfb Mon Sep 17 00:00:00 2001 +From: "Dr. Stephen Henson" +Date: Wed, 15 Oct 2014 01:53:55 +0100 +Subject: [PATCH] Fix for session tickets memory leak. + +CVE-2014-3567 + +Reviewed-by: Rich Salz +Reviewed-by: Matt Caswell +--- + ssl/t1_lib.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c +index 879467c..77fe232 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); +-- +1.7.9.5 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb index 3ec5ddcfc0..8afb21eedf 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb @@ -45,6 +45,7 @@ SRC_URI += "file://configure-targets.patch \ file://run-ptest \ file://openssl-fix-CVE-2014-3566.patch \ file://openssl-fix-CVE-2014-3513.patch \ + file://openssl-fix-CVE-2014-3567.patch \ " SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959" -- cgit v1.2.3-54-g00ecf