summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-06-09 16:53:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-10 17:12:24 +0100
commit8ac53f3c2d0c20409aee7161ce6b548221e43709 (patch)
tree63ec4380993e310c04c5f62304b3e90117492d31
parent0ea0a14bd934964fa84a2d655d94ea227ed1981d (diff)
downloadpoky-8ac53f3c2d0c20409aee7161ce6b548221e43709.tar.gz
openssl: fix CVE-2014-3470
http://www.openssl.org/news/secadv_20140605.txt Anonymous ECDH denial of service (CVE-2014-3470) OpenSSL TLS clients enabling anonymous ECDH ciphersuites are subject to a denial of service attack. (Patch borrowed from Fedora.) (From OE-Core rev: fe4e278f1794dda2e1aded56360556fe933614ca) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-1.0.1e-cve-2014-3470.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/openssl-1.0.1e-cve-2014-3470.patch b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-1.0.1e-cve-2014-3470.patch
new file mode 100644
index 0000000000..025727f587
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-1.0.1e-cve-2014-3470.patch
@@ -0,0 +1,31 @@
1commit 4ad43d511f6cf064c66eb4bfd0fb0919b5dd8a86
2Author: Dr. Stephen Henson <steve@openssl.org>
3Date: Thu May 29 15:00:05 2014 +0100
4
5 Fix CVE-2014-3470
6
7 Check session_cert is not NULL before dereferencing it.
8
9Patch borrowed from Fedora
10Upstream-Status: Backport
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12
13
14diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
15index d35376d..4324f8d 100644
16--- a/ssl/s3_clnt.c
17+++ b/ssl/s3_clnt.c
18@@ -2511,6 +2511,13 @@ int ssl3_send_client_key_exchange(SSL *s)
19 int ecdh_clnt_cert = 0;
20 int field_size = 0;
21
22+ if (s->session->sess_cert == NULL)
23+ {
24+ ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
25+ SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
26+ goto err;
27+ }
28+
29 /* Did we send out the client's
30 * ECDH share for use in premaster
31 * computation as part of client certificate?
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
index fae0b93f37..65083fb8bf 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
@@ -42,6 +42,7 @@ SRC_URI += "file://configure-targets.patch \
42 file://openssl-1.0.1e-cve-2014-0198.patch \ 42 file://openssl-1.0.1e-cve-2014-0198.patch \
43 file://openssl-1.0.1e-cve-2014-0221.patch \ 43 file://openssl-1.0.1e-cve-2014-0221.patch \
44 file://openssl-1.0.1e-cve-2014-0224.patch \ 44 file://openssl-1.0.1e-cve-2014-0224.patch \
45 file://openssl-1.0.1e-cve-2014-3470.patch \
45 " 46 "
46 47
47SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c" 48SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c"