aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSona Sarmadi <sona.sarmadi@enea.com>2014-11-06 07:14:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-06 11:42:22 +0000
commit420a8dc7b84b03a9c0a56280132e15b6c9a8b4df (patch)
treedf5704ce961d30fd4702f6ee2a4199c5583a9f7e
parent6c19ca0d5aa6094aa2cfede821d63c008951cfb7 (diff)
downloadopenembedded-core-420a8dc7b84b03a9c0a56280132e15b6c9a8b4df.zip
openembedded-core-420a8dc7b84b03a9c0a56280132e15b6c9a8b4df.tar.gz
openembedded-core-420a8dc7b84b03a9c0a56280132e15b6c9a8b4df.tar.bz2
openssl: Fix for CVE-2014-3567
Fix for session tickets memory leak. This patch is a backport from OpenSSL_1.0.1j. Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-fix-CVE-2014-3567.patch32
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.1e.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-fix-CVE-2014-3567.patch b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-fix-CVE-2014-3567.patch
new file mode 100644
index 0000000..61f821b
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-fix-CVE-2014-3567.patch
@@ -0,0 +1,32 @@
+From 748270554824d2a51d1718f52a8d3ab34116bbfb Mon Sep 17 00:00:00 2001
+From: "Dr. Stephen Henson" <steve@openssl.org>
+Date: Wed, 15 Oct 2014 01:53:55 +0100
+Subject: [PATCH] Fix for session tickets memory leak.
+
+CVE-2014-3567
+
+Reviewed-by: Rich Salz <rsalz@openssl.org>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+Signed-off-by: Catalin Popeanga <catalin.popeanga@enea.com>
+---
+ 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.1e.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
index 8282822..6af4ee9 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
@@ -46,6 +46,7 @@ SRC_URI += "file://configure-targets.patch \
file://openssl-CVE-2010-5298.patch \
file://openssl-fix-CVE-2014-3566.patch \
file://openssl-fix-CVE-2014-3513.patch \
+ file://openssl-fix-CVE-2014-3567.patch \
"
SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c"