summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYue Tao <Yue.Tao@windriver.com>2014-03-26 17:08:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-27 09:42:04 +0000
commit34117165da3924fccd8b8232633dd0f5be954848 (patch)
treef7170119585f056cc158c5600bc61657f8c88430
parentae938eba92b2c89a9fd91161e57c5dbc594ad4ad (diff)
downloadpoky-34117165da3924fccd8b8232633dd0f5be954848.tar.gz
Security Advisory - openssl - CVE-2013-4353
The ssl3_take_mac function in ssl/s3_both.c in OpenSSL 1.0.1 before 1.0.1f allows remote TLS servers to cause a denial of service (NULL pointer dereference and application crash) via a crafted Next Protocol Negotiation record in a TLS handshake. (From OE-Core rev: 35ccce7002188c8270d2fead35f9763b22776877) Signed-off-by: Yue Tao <Yue.Tao@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.1e/0001-Fix-for-TLS-record-tampering-bug-CVE-2013-4353.patch31
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.1e.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.1e/0001-Fix-for-TLS-record-tampering-bug-CVE-2013-4353.patch b/meta/recipes-connectivity/openssl/openssl-1.0.1e/0001-Fix-for-TLS-record-tampering-bug-CVE-2013-4353.patch
new file mode 100644
index 0000000000..d03dc06daf
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.1e/0001-Fix-for-TLS-record-tampering-bug-CVE-2013-4353.patch
@@ -0,0 +1,31 @@
1From 197e0ea817ad64820789d86711d55ff50d71f631 Mon Sep 17 00:00:00 2001
2From: "Dr. Stephen Henson" <steve@openssl.org>
3Date: Mon, 6 Jan 2014 14:35:04 +0000
4Subject: [PATCH] Fix for TLS record tampering bug CVE-2013-4353
5
6Upstream-Status: Backport
7commit 197e0ea817ad64820789d86711d55ff50d71f631 upstream
8
9 ssl/s3_both.c | 6 +++++-
10 3 files changed, 11 insertions(+), 1 deletions(-)
11
12diff --git a/ssl/s3_both.c b/ssl/s3_both.c
13index 1e5dcab..53b9390 100644
14--- a/ssl/s3_both.c
15+++ b/ssl/s3_both.c
16@@ -210,7 +210,11 @@ static void ssl3_take_mac(SSL *s)
17 {
18 const char *sender;
19 int slen;
20-
21+ /* If no new cipher setup return immediately: other functions will
22+ * set the appropriate error.
23+ */
24+ if (s->s3->tmp.new_cipher == NULL)
25+ return;
26 if (s->state & SSL_ST_CONNECT)
27 {
28 sender=s->method->ssl3_enc->server_finished_label;
29--
301.7.5.4
31
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
index a574e81fb3..3e92234031 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
@@ -35,6 +35,7 @@ SRC_URI += "file://configure-targets.patch \
35 file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \ 35 file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \
36 file://initial-aarch64-bits.patch \ 36 file://initial-aarch64-bits.patch \
37 file://find.pl \ 37 file://find.pl \
38 file://0001-Fix-for-TLS-record-tampering-bug-CVE-2013-4353.patch \
38 " 39 "
39 40
40SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c" 41SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c"