diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-06-09 16:53:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-10 17:12:24 +0100 |
commit | d6f29c015404fb87889e7275a398733a906b81d1 (patch) | |
tree | d7a528025d59f066a9b7ef8774e2e2ecf336eba2 /meta/recipes-connectivity/openssl/openssl_1.0.1e.bb | |
parent | c5d81c3386b945293580ed87fcecc0c80851ef0e (diff) | |
download | poky-d6f29c015404fb87889e7275a398733a906b81d1.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: 21fa437a37dad14145b6c8c8c16c95f1b074e09c)
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 7783206a4b..38cdb3f740 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb | |||
@@ -38,8 +38,8 @@ SRC_URI += "file://configure-targets.patch \ | |||
38 | file://0001-Fix-DTLS-retransmission-from-previous-session.patch \ | 38 | file://0001-Fix-DTLS-retransmission-from-previous-session.patch \ |
39 | file://0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch \ | 39 | file://0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch \ |
40 | file://CVE-2014-0160.patch \ | 40 | file://CVE-2014-0160.patch \ |
41 | file://openssl-CVE-2014-0198-fix.patch \ | ||
42 | file://openssl-1.0.1e-cve-2014-0195.patch \ | 41 | file://openssl-1.0.1e-cve-2014-0195.patch \ |
42 | file://openssl-1.0.1e-cve-2014-0198.patch \ | ||
43 | " | 43 | " |
44 | 44 | ||
45 | SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c" | 45 | SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c" |