diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-06-09 11:23:28 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-10 17:36:44 +0100 |
commit | 889f731acc7be2503fe092a6ba527cd8893e6948 (patch) | |
tree | 5ef90b334df950e886bae80242c4b8b379f47cba /meta/recipes-connectivity/openssl/openssl_1.0.1e.bb | |
parent | f3df1c7e77b04af41c5f9c0ad5868d67c0644467 (diff) | |
download | poky-889f731acc7be2503fe092a6ba527cd8893e6948.tar.gz |
openssl: use upstream fix for CVE-2014-0198
This replaces the fix for CVE-2014-0198 with one borrowed from Fedora,
which is the same as the patch which was actually applied upstream for
the issue, i.e.:
https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=b107586c0c3447ea22dba8698ebbcd81bb29d48c
(From OE-Core rev: 26a6e230ebb4f69c992ec909d46d586ee42bfdf6)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl_1.0.1e.bb')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.1e.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb index 7b1dad1f22..25dc1856c6 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb | |||
@@ -36,8 +36,8 @@ SRC_URI += "file://configure-targets.patch \ | |||
36 | file://0001-Fix-DTLS-retransmission-from-previous-session.patch \ | 36 | file://0001-Fix-DTLS-retransmission-from-previous-session.patch \ |
37 | file://0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch \ | 37 | file://0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch \ |
38 | file://CVE-2014-0160.patch \ | 38 | file://CVE-2014-0160.patch \ |
39 | file://openssl-CVE-2014-0198-fix.patch \ | ||
40 | file://openssl-1.0.1e-cve-2014-0195.patch \ | 39 | file://openssl-1.0.1e-cve-2014-0195.patch \ |
40 | file://openssl-1.0.1e-cve-2014-0198.patch \ | ||
41 | " | 41 | " |
42 | 42 | ||
43 | SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c" | 43 | SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c" |