summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2015-03-04 09:46:48 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-10 10:47:46 +0000
commitf5e4349011bd00aa47d142022dcdd1d1706a9655 (patch)
tree31b2c535de004b08968cfdb57ce085ca3b70eb83 /meta/recipes-connectivity/openssl/openssl/ptest-deps.patch
parent7c504b44ef593f97f5311d0d27f667e85a2eddbb (diff)
downloadpoky-f5e4349011bd00aa47d142022dcdd1d1706a9655.tar.gz
openssl: Upgrade to 1.0.2
Rebased numerous patches removed aarch64 initial work since it's part of upstream now Imported a few additional patches from Debian to support the version-script and blacklist additional bad certificates. (From OE-Core rev: 10b689033551c37d6cafa284d82bdccd43f6113e) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/ptest-deps.patch')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/ptest-deps.patch16
1 files changed, 10 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch b/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch
index 527e10c53b..ef6d17934d 100644
--- a/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch
+++ b/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch
@@ -10,11 +10,11 @@ Upstream-Status: Inappropriate [config]
10 10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12 12
13diff --git a/test/Makefile b/test/Makefile 13Index: openssl-1.0.2/test/Makefile
14index e6fcfb4..5ae043b 100644 14===================================================================
15--- a/test/Makefile 15--- openssl-1.0.2.orig/test/Makefile
16+++ b/test/Makefile 16+++ openssl-1.0.2/test/Makefile
17@@ -322,11 +322,11 @@ test_cms: 17@@ -330,7 +330,7 @@ test_cms: ../apps/openssl$(EXE_EXT) cms-
18 @echo "CMS consistency test" 18 @echo "CMS consistency test"
19 $(PERL) cms-test.pl 19 $(PERL) cms-test.pl
20 20
@@ -23,8 +23,12 @@ index e6fcfb4..5ae043b 100644
23 @echo "Test SRP" 23 @echo "Test SRP"
24 ../util/shlib_wrap.sh ./srptest 24 ../util/shlib_wrap.sh ./srptest
25 25
26@@ -342,7 +342,7 @@ test_v3name: $(V3NAMETEST)$(EXE_EXT)
27 @echo "Test X509v3_check_*"
28 ../util/shlib_wrap.sh ./$(V3NAMETEST)
29
26-test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT) 30-test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT)
27+test_heartbeat: 31+test_heartbeat:
28 ../util/shlib_wrap.sh ./$(HEARTBEATTEST) 32 ../util/shlib_wrap.sh ./$(HEARTBEATTEST)
29 33
30 lint: 34 test_constant_time: $(CONSTTIMETEST)$(EXE_EXT)