diff options
author | Roy Li <rongqing.li@windriver.com> | 2014-05-22 14:42:51 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-10 17:12:19 +0100 |
commit | ebf62ba85d6ecd44e8b602bb514b7eed20169501 (patch) | |
tree | 76ecd83ef075d4ecca93dd3b3e9032d48d612b9c /meta/recipes-connectivity | |
parent | 9deb3333b03463e6c0f8405e0ad8d016203ccee6 (diff) | |
download | poky-ebf62ba85d6ecd44e8b602bb514b7eed20169501.tar.gz |
openssl: add openssl-CVE-2010-5298.patch SRC_URI
make openssl-CVE-2010-5298.patch truely work
(From OE-Core rev: eab33442480cc27a5cd00b3f46984fea74b7c0f9)
(From OE-Core rev: 1bd77c28fdb51d1a0dad55c8d1af2991046c801d)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Conflicts:
meta/recipes-connectivity/openssl/openssl_1.0.1g.bb
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/openssl-CVE-2010-5298.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2010-5298.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.1g.bb | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2010-5298.patch b/meta/recipes-connectivity/openssl/openssl/openssl-CVE-2010-5298.patch index 417a774ba2..417a774ba2 100644 --- a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2010-5298.patch +++ b/meta/recipes-connectivity/openssl/openssl/openssl-CVE-2010-5298.patch | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb index d5f9660c38..579cf0376e 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb | |||
@@ -35,6 +35,7 @@ SRC_URI += "file://configure-targets.patch \ | |||
35 | file://find.pl \ | 35 | file://find.pl \ |
36 | file://openssl-fix-des.pod-error.patch \ | 36 | file://openssl-fix-des.pod-error.patch \ |
37 | file://openssl-CVE-2014-0198-fix.patch \ | 37 | file://openssl-CVE-2014-0198-fix.patch \ |
38 | file://openssl-CVE-2010-5298.patch \ | ||
38 | " | 39 | " |
39 | 40 | ||
40 | SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959" | 41 | SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959" |