aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2014-05-22 14:42:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-10 17:10:34 +0100
commit1bd77c28fdb51d1a0dad55c8d1af2991046c801d (patch)
tree521e6476cac6ebcc1d467eec5b8804bb64ea4609
parent8c4ea49ba8440871f5a7008c7fa20f93bfb35d78 (diff)
downloadopenembedded-core-contrib-1bd77c28fdb51d1a0dad55c8d1af2991046c801d.tar.gz
openssl: add openssl-CVE-2010-5298.patch SRC_URI
make openssl-CVE-2010-5298.patch truely work (From OE-Core rev: eab33442480cc27a5cd00b3f46984fea74b7c0f9) 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
-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.bb1
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 \
file://find.pl \
file://openssl-fix-des.pod-error.patch \
file://openssl-CVE-2014-0198-fix.patch \
+ file://openssl-CVE-2010-5298.patch \
"
SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959"