summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity')
-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 ac27dba494..3476d84bdf 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
@@ -34,6 +34,7 @@ SRC_URI += "file://configure-targets.patch \
34 file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \ 34 file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.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://find.pl \ 36 file://find.pl \
37 file://0001-Fix-for-TLS-record-tampering-bug-CVE-2013-4353.patch \
37 " 38 "
38 39
39SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c" 40SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c"