summaryrefslogtreecommitdiffstats
path: root/recipes-connectivity/openssl
diff options
context:
space:
mode:
authorC.R. Guo <chunrong.guo@nxp.com>2018-03-20 16:01:48 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2018-04-02 10:30:13 -0300
commit49c5985d05e7442393c9cdc0933d231666f09065 (patch)
treecf82c6aba7169d4b8d0b78007364abcf1deed30f /recipes-connectivity/openssl
parent0dc0c701511959f1e71c97a3323ea012f3f92bb4 (diff)
downloadmeta-freescale-49c5985d05e7442393c9cdc0933d231666f09065.tar.gz
openssl-qoriq: refresh patches
1. The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed 2. drop openssl-1.0.2a-x32-asm.patch The patch was applied in a completely incorrect spot (due to fuzz), no one noticed or complained. Meanwhile upstream says the issue has been resolved differently: https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-connectivity/openssl')
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/Makefiles-ptest.patch47
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/debian/c_rehash-compat.patch10
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/debian/debian-targets.patch14
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/parallel.patch172
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/ptest_makefile_deps.patch97
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq_1.0.2l.bb1
6 files changed, 192 insertions, 149 deletions
diff --git a/recipes-connectivity/openssl/openssl-qoriq/Makefiles-ptest.patch b/recipes-connectivity/openssl/openssl-qoriq/Makefiles-ptest.patch
index 249446a5..1ab585c2 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/Makefiles-ptest.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/Makefiles-ptest.patch
@@ -1,3 +1,8 @@
1From 5a871ad1f426f7ed3952588ecec61d2304e66a80 Mon Sep 17 00:00:00 2001
2From: Chunrong Guo <chunrong.guo@nxp.com>
3Date: Tue, 20 Mar 2018 11:39:29 +0800
4Subject: [PATCH] Makefiles-ptest
5
1Add 'buildtest' and 'runtest' targets to Makefile, to build and run tests 6Add 'buildtest' and 'runtest' targets to Makefile, to build and run tests
2cross-compiled. 7cross-compiled.
3 8
@@ -5,11 +10,15 @@ Signed-off-by: Anders Roxell <anders.roxell@enea.com>
5Signed-off-by: Maxin B. John <maxin.john@enea.com> 10Signed-off-by: Maxin B. John <maxin.john@enea.com>
6Upstream-Status: Pending 11Upstream-Status: Pending
7--- 12---
8Index: openssl-1.0.2/Makefile.org 13 Makefile.org | 10 +++++++++-
9=================================================================== 14 test/Makefile | 12 ++++++++----
10--- openssl-1.0.2.orig/Makefile.org 15 2 files changed, 17 insertions(+), 5 deletions(-)
11+++ openssl-1.0.2/Makefile.org 16
12@@ -451,8 +451,16 @@ rehash.time: certs apps 17diff --git a/Makefile.org b/Makefile.org
18index 111fbba..9f24777 100644
19--- a/Makefile.org
20+++ b/Makefile.org
21@@ -468,8 +468,16 @@ rehash.time: certs apps
13 test: tests 22 test: tests
14 23
15 tests: rehash 24 tests: rehash
@@ -27,32 +36,31 @@ Index: openssl-1.0.2/Makefile.org
27 OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a 36 OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a
28 37
29 report: 38 report:
30Index: openssl-1.0.2/test/Makefile 39diff --git a/test/Makefile b/test/Makefile
31=================================================================== 40index 74d8fc2..34f17fc 100644
32--- openssl-1.0.2.orig/test/Makefile 41--- a/test/Makefile
33+++ openssl-1.0.2/test/Makefile 42+++ b/test/Makefile
34@@ -137,7 +137,7 @@ tests: exe apps $(TESTS) 43@@ -149,7 +149,7 @@ tests: exe apps $(TESTS)
35 apps: 44 apps:
36 @(cd ..; $(MAKE) DIRS=apps all) 45 @(cd ..; $(MAKE) DIRS=apps all)
37 46
38-alltests: \ 47-alltests: \
39+all-tests= \ 48+alltests= \
40 test_des test_idea test_sha test_md4 test_md5 test_hmac \ 49 test_des test_idea test_sha test_md4 test_md5 test_hmac \
41 test_md2 test_mdc2 test_wp \ 50 test_md2 test_mdc2 test_wp \
42 test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \ 51 test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \
43@@ -148,6 +148,11 @@ alltests: \ 52@@ -160,6 +160,10 @@ alltests: \
44 test_jpake test_srp test_cms test_ocsp test_v3name test_heartbeat \ 53 test_jpake test_srp test_cms test_ocsp test_v3name test_heartbeat \
45 test_constant_time 54 test_constant_time test_verify_extra test_clienthello test_sslv2conftest \
46 55 test_dtls test_bad_dtls
47+alltests: 56+alltests:
48+ @(for i in $(all-tests); do \ 57+ @(for i in $(all-tests); do \
49+ ( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \ 58+ ( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \
50+ done) 59+ done)
51+ 60
52 test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt 61 test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt
53 ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt 62 ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
54 63@@ -229,7 +233,7 @@ test_x509: ../apps/openssl$(EXE_EXT) tx509 testx509.pem v3-cert1.pem v3-cert2.pe
55@@ -213,7 +218,7 @@ test_x509: ../apps/openssl$(EXE_EXT) tx5
56 echo test second x509v3 certificate 64 echo test second x509v3 certificate
57 sh ./tx509 v3-cert2.pem 2>/dev/null 65 sh ./tx509 v3-cert2.pem 2>/dev/null
58 66
@@ -61,7 +69,7 @@ Index: openssl-1.0.2/test/Makefile
61 @sh ./trsa 2>/dev/null 69 @sh ./trsa 2>/dev/null
62 ../util/shlib_wrap.sh ./$(RSATEST) 70 ../util/shlib_wrap.sh ./$(RSATEST)
63 71
64@@ -313,11 +318,11 @@ test_tsa: ../apps/openssl$(EXE_EXT) test 72@@ -330,11 +334,11 @@ test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh
65 sh ./testtsa; \ 73 sh ./testtsa; \
66 fi 74 fi
67 75
@@ -75,3 +83,6 @@ Index: openssl-1.0.2/test/Makefile
75 @echo "Test JPAKE" 83 @echo "Test JPAKE"
76 ../util/shlib_wrap.sh ./$(JPAKETEST) 84 ../util/shlib_wrap.sh ./$(JPAKETEST)
77 85
86--
872.7.4
88
diff --git a/recipes-connectivity/openssl/openssl-qoriq/debian/c_rehash-compat.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/c_rehash-compat.patch
index 68e54d56..3820e3e3 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/debian/c_rehash-compat.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/debian/c_rehash-compat.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] also create old hash for compatibility
5 5
6Upstream-Status: Backport [debian] 6Upstream-Status: Backport [debian]
7 7
8diff --git a/tools/c_rehash.in b/tools/c_rehash.in 8Index: openssl-1.0.2n/tools/c_rehash.in
9index b086ff9..b777d79 100644 9===================================================================
10--- a/tools/c_rehash.in 10--- openssl-1.0.2n.orig/tools/c_rehash.in
11+++ b/tools/c_rehash.in 11+++ openssl-1.0.2n/tools/c_rehash.in
12@@ -8,8 +8,6 @@ my $prefix; 12@@ -8,8 +8,6 @@ my $prefix;
13 13
14 my $openssl = $ENV{OPENSSL} || "openssl"; 14 my $openssl = $ENV{OPENSSL} || "openssl";
@@ -48,7 +48,7 @@ index b086ff9..b777d79 100644
48 $fname =~ s/'/'\\''/g; 48 $fname =~ s/'/'\\''/g;
49 my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`; 49 my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
50 chomp $hash; 50 chomp $hash;
51@@ -176,11 +174,21 @@ sub link_hash_cert { 51@@ -177,10 +175,20 @@ sub link_hash_cert {
52 $hashlist{$hash} = $fprint; 52 $hashlist{$hash} = $fprint;
53 } 53 }
54 54
diff --git a/recipes-connectivity/openssl/openssl-qoriq/debian/debian-targets.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/debian-targets.patch
index 39d43281..35d92bed 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/debian/debian-targets.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/debian/debian-targets.patch
@@ -1,12 +1,12 @@
1Upstream-Status: Backport [debian] 1Upstream-Status: Backport [debian]
2 2
3Index: openssl-1.0.2/Configure 3Index: openssl-1.0.2n/Configure
4=================================================================== 4===================================================================
5--- openssl-1.0.2.orig/Configure 5--- openssl-1.0.2n.orig/Configure
6+++ openssl-1.0.2/Configure 6+++ openssl-1.0.2n/Configure
7@@ -107,6 +107,10 @@ my $gcc_devteam_warn = "-Wall -pedantic 7@@ -133,6 +133,10 @@ my $clang_devteam_warn = "-Wno-unused-pa
8 8 # Warn that "make depend" should be run?
9 my $clang_disabled_warnings = "-Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum"; 9 my $warn_make_depend = 0;
10 10
11+# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS 11+# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS
12+my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall"; 12+my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall";
@@ -15,7 +15,7 @@ Index: openssl-1.0.2/Configure
15 my $strict_warnings = 0; 15 my $strict_warnings = 0;
16 16
17 my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL"; 17 my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
18@@ -343,6 +347,55 @@ my %table=( 18@@ -369,6 +373,55 @@ my %table=(
19 "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", 19 "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
20 "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so", 20 "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
21 21
diff --git a/recipes-connectivity/openssl/openssl-qoriq/parallel.patch b/recipes-connectivity/openssl/openssl-qoriq/parallel.patch
index f3f4c998..f4b8ef6c 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/parallel.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/parallel.patch
@@ -1,17 +1,83 @@
1Fix the parallel races in the Makefiles. 1From ca1f18b71005c199059870a5772fb88e5449cbae Mon Sep 17 00:00:00 2001
2From: Chunrong Guo <chunrong.guo@nxp.com>
3Date: Tue, 20 Mar 2018 13:51:15 +0800
4Subject: [PATCH] Fix the parallel races in the Makefiles.
2 5
3This patch was taken from the Gentoo packaging: 6This patch was taken from the Gentoo packaging:
4https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2g-parallel-build.patch 7https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2g-parallel-build.patch
5 8
6Upstream-Status: Pending 9Upstream-Status: Pending
7Signed-off-by: Ross Burton <ross.burton@intel.com> 10Signed-off-by: Ross Burton <ross.burton@intel.com>
11---
12 Makefile.org | 14 ++++-----
13 Makefile.shared | 2 ++
14 crypto/Makefile | 10 +++---
15 engines/Makefile | 6 ++--
16 test/Makefile | 92 ++++++++++++++++++++++++++++----------------------------
17 5 files changed, 63 insertions(+), 61 deletions(-)
8 18
9Refreshed for 1.0.2i 19diff --git a/Makefile.org b/Makefile.org
10Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> 20index 9f24777..61fc488 100644
11 21--- a/Makefile.org
12--- openssl-1.0.2g/crypto/Makefile 22+++ b/Makefile.org
13+++ openssl-1.0.2g/crypto/Makefile 23@@ -283,17 +283,17 @@ build_libcrypto: build_crypto build_engines libcrypto.pc
14@@ -85,11 +85,11 @@ 24 build_libssl: build_ssl libssl.pc
25
26 build_crypto:
27- @dir=crypto; target=all; $(BUILD_ONE_CMD)
28+ +@dir=crypto; target=all; $(BUILD_ONE_CMD)
29 build_ssl: build_crypto
30- @dir=ssl; target=all; $(BUILD_ONE_CMD)
31+ +@dir=ssl; target=all; $(BUILD_ONE_CMD)
32 build_engines: build_crypto
33- @dir=engines; target=all; $(BUILD_ONE_CMD)
34+ +@dir=engines; target=all; $(BUILD_ONE_CMD)
35 build_apps: build_libs
36- @dir=apps; target=all; $(BUILD_ONE_CMD)
37+ +@dir=apps; target=all; $(BUILD_ONE_CMD)
38 build_tests: build_libs
39- @dir=test; target=all; $(BUILD_ONE_CMD)
40+ +@dir=test; target=all; $(BUILD_ONE_CMD)
41 build_tools: build_libs
42- @dir=tools; target=all; $(BUILD_ONE_CMD)
43+ +@dir=tools; target=all; $(BUILD_ONE_CMD)
44
45 all_testapps: build_libs build_testapps
46 build_testapps:
47@@ -565,7 +565,7 @@ install_sw:
48 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
49 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
50 done;
51- @set -e; target=install; $(RECURSIVE_BUILD_CMD)
52+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
53 @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
54 do \
55 if [ -f "$$i" ]; then \
56diff --git a/Makefile.shared b/Makefile.shared
57index f6f92e7..43f85fc 100644
58--- a/Makefile.shared
59+++ b/Makefile.shared
60@@ -105,6 +105,7 @@ LINK_SO= \
61 SHAREDFLAGS="$(OE_LDFLAGS) $${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
62 LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
63 LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
64+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
65 LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
66 $${SHAREDCMD} $${SHAREDFLAGS} \
67 -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
68@@ -122,6 +123,7 @@ SYMLINK_SO= \
69 done; \
70 fi; \
71 if [ -n "$$SHLIB_SOVER" ]; then \
72+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
73 ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
74 ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
75 fi; \
76diff --git a/crypto/Makefile b/crypto/Makefile
77index 17a87f8..29c2dcf 100644
78--- a/crypto/Makefile
79+++ b/crypto/Makefile
80@@ -85,11 +85,11 @@ testapps:
15 @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi 81 @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
16 82
17 subdirs: 83 subdirs:
@@ -25,7 +91,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
25 91
26 links: 92 links:
27 @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) 93 @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
28@@ -100,7 +100,7 @@ 94@@ -100,7 +100,7 @@ links:
29 # lib: $(LIB): are splitted to avoid end-less loop 95 # lib: $(LIB): are splitted to avoid end-less loop
30 lib: $(LIB) 96 lib: $(LIB)
31 @touch lib 97 @touch lib
@@ -34,7 +100,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
34 $(AR) $(LIB) $(LIBOBJ) 100 $(AR) $(LIB) $(LIBOBJ)
35 test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o 101 test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
36 $(RANLIB) $(LIB) || echo Never mind. 102 $(RANLIB) $(LIB) || echo Never mind.
37@@ -111,7 +111,7 @@ 103@@ -111,7 +111,7 @@ shared: buildinf.h lib subdirs
38 fi 104 fi
39 105
40 libs: 106 libs:
@@ -43,7 +109,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
43 109
44 install: 110 install:
45 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... 111 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
46@@ -120,7 +120,7 @@ 112@@ -120,7 +120,7 @@ install:
47 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 113 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
48 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ 114 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
49 done; 115 done;
@@ -52,9 +118,11 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
52 118
53 lint: 119 lint:
54 @target=lint; $(RECURSIVE_MAKE) 120 @target=lint; $(RECURSIVE_MAKE)
55--- openssl-1.0.2g/engines/Makefile 121diff --git a/engines/Makefile b/engines/Makefile
56+++ openssl-1.0.2g/engines/Makefile 122index fe8e9ca..a43d21b 100644
57@@ -72,7 +72,7 @@ 123--- a/engines/Makefile
124+++ b/engines/Makefile
125@@ -72,7 +72,7 @@ top:
58 126
59 all: lib subdirs 127 all: lib subdirs
60 128
@@ -63,7 +131,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
63 @if [ -n "$(SHARED_LIBS)" ]; then \ 131 @if [ -n "$(SHARED_LIBS)" ]; then \
64 set -e; \ 132 set -e; \
65 for l in $(LIBNAMES); do \ 133 for l in $(LIBNAMES); do \
66@@ -89,7 +89,7 @@ 134@@ -89,7 +89,7 @@ lib: $(LIBOBJ)
67 135
68 subdirs: 136 subdirs:
69 echo $(EDIRS) 137 echo $(EDIRS)
@@ -72,8 +140,8 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
72 140
73 files: 141 files:
74 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 142 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
75@@ -128,7 +128,7 @@ 143@@ -128,7 +128,7 @@ install:
76 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ 144 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx ); \
77 done; \ 145 done; \
78 fi 146 fi
79- @target=install; $(RECURSIVE_MAKE) 147- @target=install; $(RECURSIVE_MAKE)
@@ -81,71 +149,20 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
81 149
82 tags: 150 tags:
83 ctags $(SRC) 151 ctags $(SRC)
84--- openssl-1.0.2g/Makefile.org 152diff --git a/test/Makefile b/test/Makefile
85+++ openssl-1.0.2g/Makefile.org 153index dc1b86f..97eb0de 100644
86@@ -279,17 +279,17 @@ 154--- a/test/Makefile
87 build_libssl: build_ssl libssl.pc 155+++ b/test/Makefile
88 156@@ -144,7 +144,7 @@ install:
89 build_crypto:
90- @dir=crypto; target=all; $(BUILD_ONE_CMD)
91+ +@dir=crypto; target=all; $(BUILD_ONE_CMD)
92 build_ssl: build_crypto
93- @dir=ssl; target=all; $(BUILD_ONE_CMD)
94+ +@dir=ssl; target=all; $(BUILD_ONE_CMD)
95 build_engines: build_crypto
96- @dir=engines; target=all; $(BUILD_ONE_CMD)
97+ +@dir=engines; target=all; $(BUILD_ONE_CMD)
98 build_apps: build_libs
99- @dir=apps; target=all; $(BUILD_ONE_CMD)
100+ +@dir=apps; target=all; $(BUILD_ONE_CMD)
101 build_tests: build_libs
102- @dir=test; target=all; $(BUILD_ONE_CMD)
103+ +@dir=test; target=all; $(BUILD_ONE_CMD)
104 build_tools: build_libs
105- @dir=tools; target=all; $(BUILD_ONE_CMD)
106+ +@dir=tools; target=all; $(BUILD_ONE_CMD)
107
108 all_testapps: build_libs build_testapps
109 build_testapps:
110@@ -544,7 +544,7 @@
111 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
112 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
113 done;
114- @set -e; target=install; $(RECURSIVE_BUILD_CMD)
115+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
116 @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
117 do \
118 if [ -f "$$i" ]; then \
119--- openssl-1.0.2g/Makefile.shared
120+++ openssl-1.0.2g/Makefile.shared
121@@ -105,6 +105,7 @@
122 SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
123 LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
124 LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
125+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
126 LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
127 $${SHAREDCMD} $${SHAREDFLAGS} \
128 -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
129@@ -122,6 +123,7 @@
130 done; \
131 fi; \
132 if [ -n "$$SHLIB_SOVER" ]; then \
133+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
134 ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
135 ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
136 fi; \
137--- openssl-1.0.2g/test/Makefile
138+++ openssl-1.0.2g/test/Makefile
139@@ -144,7 +144,7 @@
140 tags: 157 tags:
141 ctags $(SRC) 158 ctags $(SRC)
142 159
143-tests: exe apps $(TESTS) 160-tests: exe apps $(TESTS)
144+tests: exe $(TESTS) 161+tests: exe $(TESTS)
145 162
146 apps: 163 apps:
147 @(cd ..; $(MAKE) DIRS=apps all) 164 @(cd ..; $(MAKE) DIRS=apps all)
148@@ -438,136 +438,136 @@ 165@@ -438,136 +438,136 @@ BUILD_CMD_STATIC=shlib_target=; \
149 link_app.$${shlib_target} 166 link_app.$${shlib_target}
150 167
151 $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) 168 $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
@@ -326,7 +343,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
326 343
327 #$(AESTEST).o: $(AESTEST).c 344 #$(AESTEST).o: $(AESTEST).c
328 # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c 345 # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
329@@ -580,6 +580,6 @@ 346@@ -580,7 +580,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO)
330 # fi 347 # fi
331 348
332 dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) 349 dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
@@ -334,4 +351,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
334+ +@target=dummytest; $(BUILD_CMD) 351+ +@target=dummytest; $(BUILD_CMD)
335 352
336 # DO NOT DELETE THIS LINE -- make depend depends on it. 353 # DO NOT DELETE THIS LINE -- make depend depends on it.
337 \ No newline at end of file 354
355--
3562.7.4
357
diff --git a/recipes-connectivity/openssl/openssl-qoriq/ptest_makefile_deps.patch b/recipes-connectivity/openssl/openssl-qoriq/ptest_makefile_deps.patch
index 4202e61d..fc93572e 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/ptest_makefile_deps.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/ptest_makefile_deps.patch
@@ -1,4 +1,7 @@
1Additional Makefile dependencies removal for test targets 1From e754d694815fcd68231ea701826ca7f5a8030b8b Mon Sep 17 00:00:00 2001
2From: Chunrong Guo <chunrong.guo@nxp.com>
3Date: Tue, 20 Mar 2018 15:23:19 +0800
4Subject: [PATCH] Additional Makefile dependencies removal for test targets
2 5
3Removing the dependency check for test targets as these tests are 6Removing the dependency check for test targets as these tests are
4causing a number of failures and "noise" during ptest execution. 7causing a number of failures and "noise" during ptest execution.
@@ -7,10 +10,17 @@ Upstream-Status: Inappropriate [config]
7 10
8Signed-off-by: Maxin B. John <maxin.john@intel.com> 11Signed-off-by: Maxin B. John <maxin.john@intel.com>
9 12
10diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile 13Refreshed for 1.0.2l
11--- openssl-1.0.2d-orig/test/Makefile 2015-09-28 12:50:41.530022979 +0300 14Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
12+++ openssl-1.0.2d/test/Makefile 2015-09-28 12:57:45.930717240 +0300 15---
13@@ -155,67 +155,67 @@ 16 test/Makefile | 88 +++++++++++++++++++++++++++++------------------------------
17 1 file changed, 43 insertions(+), 45 deletions(-)
18
19diff --git a/test/Makefile b/test/Makefile
20index 341d652..e3d79bd 100644
21--- a/test/Makefile
22+++ b/test/Makefile
23@@ -165,67 +165,67 @@ alltests:
14 ( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \ 24 ( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \
15 done) 25 done)
16 26
@@ -31,18 +41,18 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
31 ../util/shlib_wrap.sh ./$(IDEATEST) 41 ../util/shlib_wrap.sh ./$(IDEATEST)
32 42
33-test_sha: $(SHATEST)$(EXE_EXT) $(SHA1TEST)$(EXE_EXT) $(SHA256TEST)$(EXE_EXT) $(SHA512TEST)$(EXE_EXT) 43-test_sha: $(SHATEST)$(EXE_EXT) $(SHA1TEST)$(EXE_EXT) $(SHA256TEST)$(EXE_EXT) $(SHA512TEST)$(EXE_EXT)
34+test_sha: 44+test_sha:
35 ../util/shlib_wrap.sh ./$(SHATEST) 45 ../util/shlib_wrap.sh ./$(SHATEST)
36 ../util/shlib_wrap.sh ./$(SHA1TEST) 46 ../util/shlib_wrap.sh ./$(SHA1TEST)
37 ../util/shlib_wrap.sh ./$(SHA256TEST) 47 ../util/shlib_wrap.sh ./$(SHA256TEST)
38 ../util/shlib_wrap.sh ./$(SHA512TEST) 48 ../util/shlib_wrap.sh ./$(SHA512TEST)
39 49
40-test_mdc2: $(MDC2TEST)$(EXE_EXT) 50-test_mdc2: $(MDC2TEST)$(EXE_EXT)
41+test_mdc2: 51+test_mdc2:
42 ../util/shlib_wrap.sh ./$(MDC2TEST) 52 ../util/shlib_wrap.sh ./$(MDC2TEST)
43 53
44-test_md5: $(MD5TEST)$(EXE_EXT) 54-test_md5: $(MD5TEST)$(EXE_EXT)
45+test_md5: 55+test_md5:
46 ../util/shlib_wrap.sh ./$(MD5TEST) 56 ../util/shlib_wrap.sh ./$(MD5TEST)
47 57
48-test_md4: $(MD4TEST)$(EXE_EXT) 58-test_md4: $(MD4TEST)$(EXE_EXT)
@@ -50,43 +60,43 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
50 ../util/shlib_wrap.sh ./$(MD4TEST) 60 ../util/shlib_wrap.sh ./$(MD4TEST)
51 61
52-test_hmac: $(HMACTEST)$(EXE_EXT) 62-test_hmac: $(HMACTEST)$(EXE_EXT)
53+test_hmac: 63+test_hmac:
54 ../util/shlib_wrap.sh ./$(HMACTEST) 64 ../util/shlib_wrap.sh ./$(HMACTEST)
55 65
56-test_wp: $(WPTEST)$(EXE_EXT) 66-test_wp: $(WPTEST)$(EXE_EXT)
57+test_wp: 67+test_wp:
58 ../util/shlib_wrap.sh ./$(WPTEST) 68 ../util/shlib_wrap.sh ./$(WPTEST)
59 69
60-test_md2: $(MD2TEST)$(EXE_EXT) 70-test_md2: $(MD2TEST)$(EXE_EXT)
61+test_md2: 71+test_md2:
62 ../util/shlib_wrap.sh ./$(MD2TEST) 72 ../util/shlib_wrap.sh ./$(MD2TEST)
63 73
64-test_rmd: $(RMDTEST)$(EXE_EXT) 74-test_rmd: $(RMDTEST)$(EXE_EXT)
65+test_rmd: 75+test_rmd:
66 ../util/shlib_wrap.sh ./$(RMDTEST) 76 ../util/shlib_wrap.sh ./$(RMDTEST)
67 77
68-test_bf: $(BFTEST)$(EXE_EXT) 78-test_bf: $(BFTEST)$(EXE_EXT)
69+test_bf: 79+test_bf:
70 ../util/shlib_wrap.sh ./$(BFTEST) 80 ../util/shlib_wrap.sh ./$(BFTEST)
71 81
72-test_cast: $(CASTTEST)$(EXE_EXT) 82-test_cast: $(CASTTEST)$(EXE_EXT)
73+test_cast: 83+test_cast:
74 ../util/shlib_wrap.sh ./$(CASTTEST) 84 ../util/shlib_wrap.sh ./$(CASTTEST)
75 85
76-test_rc2: $(RC2TEST)$(EXE_EXT) 86-test_rc2: $(RC2TEST)$(EXE_EXT)
77+test_rc2: 87+test_rc2:
78 ../util/shlib_wrap.sh ./$(RC2TEST) 88 ../util/shlib_wrap.sh ./$(RC2TEST)
79 89
80-test_rc4: $(RC4TEST)$(EXE_EXT) 90-test_rc4: $(RC4TEST)$(EXE_EXT)
81+test_rc4: 91+test_rc4:
82 ../util/shlib_wrap.sh ./$(RC4TEST) 92 ../util/shlib_wrap.sh ./$(RC4TEST)
83 93
84-test_rc5: $(RC5TEST)$(EXE_EXT) 94-test_rc5: $(RC5TEST)$(EXE_EXT)
85+test_rc5: 95+test_rc5:
86 ../util/shlib_wrap.sh ./$(RC5TEST) 96 ../util/shlib_wrap.sh ./$(RC5TEST)
87 97
88-test_rand: $(RANDTEST)$(EXE_EXT) 98-test_rand: $(RANDTEST)$(EXE_EXT)
89+test_rand: 99+test_rand:
90 ../util/shlib_wrap.sh ./$(RANDTEST) 100 ../util/shlib_wrap.sh ./$(RANDTEST)
91 101
92-test_enc: ../apps/openssl$(EXE_EXT) testenc 102-test_enc: ../apps/openssl$(EXE_EXT) testenc
@@ -98,7 +108,7 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
98 echo test normal x509v1 certificate 108 echo test normal x509v1 certificate
99 sh ./tx509 2>/dev/null 109 sh ./tx509 2>/dev/null
100 echo test first x509v3 certificate 110 echo test first x509v3 certificate
101@@ -223,25 +223,25 @@ 111@@ -233,25 +233,25 @@ test_x509: ../apps/openssl$(EXE_EXT) tx509 testx509.pem v3-cert1.pem v3-cert2.pe
102 echo test second x509v3 certificate 112 echo test second x509v3 certificate
103 sh ./tx509 v3-cert2.pem 2>/dev/null 113 sh ./tx509 v3-cert2.pem 2>/dev/null
104 114
@@ -112,11 +122,11 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
112 @sh ./tcrl 2>/dev/null 122 @sh ./tcrl 2>/dev/null
113 123
114-test_sid: ../apps/openssl$(EXE_EXT) tsid testsid.pem 124-test_sid: ../apps/openssl$(EXE_EXT) tsid testsid.pem
115+test_sid: 125+test_sid:
116 @sh ./tsid 2>/dev/null 126 @sh ./tsid 2>/dev/null
117 127
118-test_req: ../apps/openssl$(EXE_EXT) treq testreq.pem testreq2.pem 128-test_req: ../apps/openssl$(EXE_EXT) treq testreq.pem testreq2.pem
119+test_req: 129+test_req:
120 @sh ./treq 2>/dev/null 130 @sh ./treq 2>/dev/null
121 @sh ./treq testreq2.pem 2>/dev/null 131 @sh ./treq testreq2.pem 2>/dev/null
122 132
@@ -126,26 +136,26 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
126 @sh ./tpkcs7d 2>/dev/null 136 @sh ./tpkcs7d 2>/dev/null
127 137
128-test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest 138-test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
129+test_bn: 139+test_bn:
130 @echo starting big number library test, could take a while... 140 @echo starting big number library test, could take a while...
131 @../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest 141 @../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest
132 @echo quit >>tmp.bntest 142 @echo quit >>tmp.bntest
133@@ -250,33 +250,33 @@ 143@@ -260,33 +260,33 @@ test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
134 @echo 'test a^b%c implementations' 144 @echo 'test a^b%c implementations'
135 ../util/shlib_wrap.sh ./$(EXPTEST) 145 ../util/shlib_wrap.sh ./$(EXPTEST)
136 146
137-test_ec: $(ECTEST)$(EXE_EXT) 147-test_ec: $(ECTEST)$(EXE_EXT)
138+test_ec: 148+test_ec:
139 @echo 'test elliptic curves' 149 @echo 'test elliptic curves'
140 ../util/shlib_wrap.sh ./$(ECTEST) 150 ../util/shlib_wrap.sh ./$(ECTEST)
141 151
142-test_ecdsa: $(ECDSATEST)$(EXE_EXT) 152-test_ecdsa: $(ECDSATEST)$(EXE_EXT)
143+test_ecdsa: 153+test_ecdsa:
144 @echo 'test ecdsa' 154 @echo 'test ecdsa'
145 ../util/shlib_wrap.sh ./$(ECDSATEST) 155 ../util/shlib_wrap.sh ./$(ECDSATEST)
146 156
147-test_ecdh: $(ECDHTEST)$(EXE_EXT) 157-test_ecdh: $(ECDHTEST)$(EXE_EXT)
148+test_ecdh: 158+test_ecdh:
149 @echo 'test ecdh' 159 @echo 'test ecdh'
150 ../util/shlib_wrap.sh ./$(ECDHTEST) 160 ../util/shlib_wrap.sh ./$(ECDHTEST)
151 161
@@ -156,7 +166,7 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
156 ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem 166 ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem
157 167
158-test_dh: $(DHTEST)$(EXE_EXT) 168-test_dh: $(DHTEST)$(EXE_EXT)
159+test_dh: 169+test_dh:
160 @echo "Generate a set of DH parameters" 170 @echo "Generate a set of DH parameters"
161 ../util/shlib_wrap.sh ./$(DHTEST) 171 ../util/shlib_wrap.sh ./$(DHTEST)
162 172
@@ -167,59 +177,59 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
167 ../util/shlib_wrap.sh ./$(DSATEST) -app2_1 177 ../util/shlib_wrap.sh ./$(DSATEST) -app2_1
168 178
169-test_gen testreq.pem: ../apps/openssl$(EXE_EXT) testgen test.cnf 179-test_gen testreq.pem: ../apps/openssl$(EXE_EXT) testgen test.cnf
170+test_gen testreq.pem: 180+test_gen testreq.pem:
171 @echo "Generate and verify a certificate request" 181 @echo "Generate and verify a certificate request"
172 @sh ./testgen 182 @sh ./testgen
173 183
174@@ -288,13 +288,11 @@ 184@@ -298,13 +298,11 @@ test_ss keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
175 @cat certCA.ss certU.ss > intP1.ss 185 @cat certCA.ss certU.ss > intP1.ss
176 @cat certCA.ss certU.ss certP1.ss > intP2.ss 186 @cat certCA.ss certU.ss certP1.ss > intP2.ss
177 187
178-test_engine: $(ENGINETEST)$(EXE_EXT) 188-test_engine: $(ENGINETEST)$(EXE_EXT)
179+test_engine: 189+test_engine:
180 @echo "Manipulate the ENGINE structures" 190 @echo "Manipulate the ENGINE structures"
181 ../util/shlib_wrap.sh ./$(ENGINETEST) 191 ../util/shlib_wrap.sh ./$(ENGINETEST)
182 192
183-test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \ 193-test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
184- intP1.ss intP2.ss $(SSLTEST)$(EXE_EXT) testssl testsslproxy \ 194- intP1.ss intP2.ss $(SSLTEST)$(EXE_EXT) testssl testsslproxy \
185- ../apps/server2.pem serverinfo.pem 195- ../apps/server2.pem serverinfo.pem
186+test_ssl: 196+test_ssl:
187 @echo "test SSL protocol" 197 @echo "test SSL protocol"
188 @if [ -n "$(FIPSCANLIB)" ]; then \ 198 @if [ -n "$(FIPSCANLIB)" ]; then \
189 sh ./testfipsssl keyU.ss certU.ss certCA.ss; \ 199 sh ./testfipsssl keyU.ss certU.ss certCA.ss; \
190@@ -304,7 +302,7 @@ 200@@ -315,7 +313,7 @@ test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
191 @sh ./testsslproxy keyP1.ss certP1.ss intP1.ss 201 @sh ./testsslproxy keyP1.ss certP1.ss intP1.ss
192 @sh ./testsslproxy keyP2.ss certP2.ss intP2.ss 202 @sh ./testsslproxy keyP2.ss certP2.ss intP2.ss
193 203
194-test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf 204-test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf
195+test_ca: 205+test_ca:
196 @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \ 206 @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
197 echo "skipping CA.sh test -- requires RSA"; \ 207 echo "skipping CA.sh test -- requires RSA"; \
198 else \ 208 else \
199@@ -312,11 +310,11 @@ 209@@ -323,11 +321,11 @@ test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf
200 sh ./testca; \ 210 sh ./testca; \
201 fi 211 fi
202 212
203-test_aes: #$(AESTEST) 213-test_aes: #$(AESTEST)
204+test_aes: 214+test_aes:
205 # @echo "test Rijndael" 215 # @echo "test Rijndael"
206 # ../util/shlib_wrap.sh ./$(AESTEST) 216 # ../util/shlib_wrap.sh ./$(AESTEST)
207 217
208-test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh 218-test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh
209+test_tsa: 219+test_tsa:
210 @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \ 220 @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
211 echo "skipping testtsa test -- requires RSA"; \ 221 echo "skipping testtsa test -- requires RSA"; \
212 else \ 222 else \
213@@ -331,7 +329,7 @@ 223@@ -342,7 +340,7 @@ test_jpake:
214 @echo "Test JPAKE" 224 @echo "Test JPAKE"
215 ../util/shlib_wrap.sh ./$(JPAKETEST) 225 ../util/shlib_wrap.sh ./$(JPAKETEST)
216 226
217-test_cms: ../apps/openssl$(EXE_EXT) cms-test.pl smcont.txt 227-test_cms: ../apps/openssl$(EXE_EXT) cms-test.pl smcont.txt
218+test_cms: 228+test_cms:
219 @echo "CMS consistency test" 229 @echo "CMS consistency test"
220 $(PERL) cms-test.pl 230 $(PERL) cms-test.pl
221 231
222@@ -339,22 +337,22 @@ 232@@ -350,22 +348,22 @@ test_srp:
223 @echo "Test SRP" 233 @echo "Test SRP"
224 ../util/shlib_wrap.sh ./srptest 234 ../util/shlib_wrap.sh ./srptest
225 235
@@ -229,7 +239,7 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
229 @sh ./tocsp 239 @sh ./tocsp
230 240
231-test_v3name: $(V3NAMETEST)$(EXE_EXT) 241-test_v3name: $(V3NAMETEST)$(EXE_EXT)
232+test_v3name: 242+test_v3name:
233 @echo "Test X509v3_check_*" 243 @echo "Test X509v3_check_*"
234 ../util/shlib_wrap.sh ./$(V3NAMETEST) 244 ../util/shlib_wrap.sh ./$(V3NAMETEST)
235 245
@@ -237,12 +247,15 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
237 ../util/shlib_wrap.sh ./$(HEARTBEATTEST) 247 ../util/shlib_wrap.sh ./$(HEARTBEATTEST)
238 248
239-test_constant_time: $(CONSTTIMETEST)$(EXE_EXT) 249-test_constant_time: $(CONSTTIMETEST)$(EXE_EXT)
240+test_constant_time: 250+test_constant_time:
241 @echo "Test constant time utilites" 251 @echo "Test constant time utilites"
242 ../util/shlib_wrap.sh ./$(CONSTTIMETEST) 252 ../util/shlib_wrap.sh ./$(CONSTTIMETEST)
243 253
244-test_verify_extra: $(VERIFYEXTRATEST)$(EXE_EXT) 254-test_verify_extra: $(VERIFYEXTRATEST)$(EXE_EXT)
245+test_verify_extra: 255+test_verify_extra:
246 @echo $(START) $@ 256 @echo $(START) $@
247 ../util/shlib_wrap.sh ./$(VERIFYEXTRATEST) 257 ../util/shlib_wrap.sh ./$(VERIFYEXTRATEST)
248 258
259--
2602.7.4
261
diff --git a/recipes-connectivity/openssl/openssl-qoriq_1.0.2l.bb b/recipes-connectivity/openssl/openssl-qoriq_1.0.2l.bb
index 04052ac3..1ffa5fed 100644
--- a/recipes-connectivity/openssl/openssl-qoriq_1.0.2l.bb
+++ b/recipes-connectivity/openssl/openssl-qoriq_1.0.2l.bb
@@ -36,7 +36,6 @@ SRC_URI += "file://find.pl;subdir=git/util \
36 file://openssl-fix-des.pod-error.patch \ 36 file://openssl-fix-des.pod-error.patch \
37 file://Makefiles-ptest.patch \ 37 file://Makefiles-ptest.patch \
38 file://ptest-deps.patch \ 38 file://ptest-deps.patch \
39 file://openssl-1.0.2a-x32-asm.patch \
40 file://ptest_makefile_deps.patch \ 39 file://ptest_makefile_deps.patch \
41 file://configure-musl-target.patch \ 40 file://configure-musl-target.patch \
42 file://parallel.patch \ 41 file://parallel.patch \