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 @@
+From 5a871ad1f426f7ed3952588ecec61d2304e66a80 Mon Sep 17 00:00:00 2001
+From: Chunrong Guo <chunrong.guo@nxp.com>
+Date: Tue, 20 Mar 2018 11:39:29 +0800
+Subject: [PATCH] Makefiles-ptest
+
 Add 'buildtest' and 'runtest' targets to Makefile, to build and run tests
 cross-compiled.
 
@@ -5,11 +10,15 @@ Signed-off-by: Anders Roxell <anders.roxell@enea.com>
 Signed-off-by: Maxin B. John <maxin.john@enea.com>
 Upstream-Status: Pending
 ---
-Index: openssl-1.0.2/Makefile.org
-===================================================================
---- openssl-1.0.2.orig/Makefile.org
-+++ openssl-1.0.2/Makefile.org
-@@ -451,8 +451,16 @@ rehash.time: certs apps
+ Makefile.org  | 10 +++++++++-
+ test/Makefile | 12 ++++++++----
+ 2 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.org b/Makefile.org
+index 111fbba..9f24777 100644
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -468,8 +468,16 @@ rehash.time: certs apps
  test:   tests
  
  tests: rehash
@@ -27,32 +36,31 @@ Index: openssl-1.0.2/Makefile.org
         OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a
  
  report:
-Index: openssl-1.0.2/test/Makefile
-===================================================================
---- openssl-1.0.2.orig/test/Makefile
-+++ openssl-1.0.2/test/Makefile
-@@ -137,7 +137,7 @@ tests:      exe apps $(TESTS)
+diff --git a/test/Makefile b/test/Makefile
+index 74d8fc2..34f17fc 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -149,7 +149,7 @@ tests:      exe apps $(TESTS)
  apps:
         @(cd ..; $(MAKE) DIRS=apps all)
  
 -alltests: \
-+all-tests= \
++alltests= \
         test_des test_idea test_sha test_md4 test_md5 test_hmac \
         test_md2 test_mdc2 test_wp \
         test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \
-@@ -148,6 +148,11 @@ alltests: \
+@@ -160,6 +160,10 @@ alltests: \
         test_jpake test_srp test_cms test_ocsp test_v3name test_heartbeat \
-        test_constant_time
- 
+        test_constant_time test_verify_extra test_clienthello test_sslv2conftest \
+        test_dtls test_bad_dtls
 +alltests:
 +       @(for i in $(all-tests); do \
 +       ( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \
 +       done)
-+
+ 
  test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt
         ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
- 
-@@ -213,7 +218,7 @@ test_x509: ../apps/openssl$(EXE_EXT) tx5
+@@ -229,7 +233,7 @@ test_x509: ../apps/openssl$(EXE_EXT) tx509 testx509.pem v3-cert1.pem v3-cert2.pe
         echo test second x509v3 certificate
         sh ./tx509 v3-cert2.pem 2>/dev/null
  
@@ -61,7 +69,7 @@ Index: openssl-1.0.2/test/Makefile
         @sh ./trsa 2>/dev/null
         ../util/shlib_wrap.sh ./$(RSATEST)
  
-@@ -313,11 +318,11 @@ test_tsa: ../apps/openssl$(EXE_EXT) test
+@@ -330,11 +334,11 @@ test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh
           sh ./testtsa; \
         fi
  
@@ -75,3 +83,6 @@ Index: openssl-1.0.2/test/Makefile
         @echo "Test JPAKE"
         ../util/shlib_wrap.sh ./$(JPAKETEST)
  
+-- 
+2.7.4
+
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
 
 Upstream-Status: Backport [debian]
 
-diff --git a/tools/c_rehash.in b/tools/c_rehash.in
-index b086ff9..b777d79 100644
---- a/tools/c_rehash.in
-+++ b/tools/c_rehash.in
+Index: openssl-1.0.2n/tools/c_rehash.in
+===================================================================
+--- openssl-1.0.2n.orig/tools/c_rehash.in
++++ openssl-1.0.2n/tools/c_rehash.in
 @@ -8,8 +8,6 @@ my $prefix;
  
  my $openssl = $ENV{OPENSSL} || "openssl";
@@ -48,7 +48,7 @@ index b086ff9..b777d79 100644
                 $fname =~ s/'/'\\''/g;
                 my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
                 chomp $hash;
-@@ -176,11 +174,21 @@ sub link_hash_cert {
+@@ -177,10 +175,20 @@ sub link_hash_cert {
                 $hashlist{$hash} = $fprint;
  }
  
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 @@
 Upstream-Status: Backport [debian]
 
-Index: openssl-1.0.2/Configure
+Index: openssl-1.0.2n/Configure
 ===================================================================
---- openssl-1.0.2.orig/Configure
-+++ openssl-1.0.2/Configure
-@@ -107,6 +107,10 @@ my $gcc_devteam_warn = "-Wall -pedantic
- 
- 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";
+--- openssl-1.0.2n.orig/Configure
++++ openssl-1.0.2n/Configure
+@@ -133,6 +133,10 @@ my $clang_devteam_warn = "-Wno-unused-pa
+ # Warn that "make depend" should be run?
+ my $warn_make_depend = 0;
  
 +# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS
 +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
  my $strict_warnings = 0;
  
  my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
-@@ -343,6 +347,55 @@ my %table=(
+@@ -369,6 +373,55 @@ my %table=(
  "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
  "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",
  
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 @@
-Fix the parallel races in the Makefiles.
+From ca1f18b71005c199059870a5772fb88e5449cbae Mon Sep 17 00:00:00 2001
+From: Chunrong Guo <chunrong.guo@nxp.com>
+Date: Tue, 20 Mar 2018 13:51:15 +0800
+Subject: [PATCH] Fix the parallel races in the Makefiles.
 
 This patch was taken from the Gentoo packaging:
 https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2g-parallel-build.patch
 
 Upstream-Status: Pending
 Signed-off-by: Ross Burton <ross.burton@intel.com>
+---
+ Makefile.org     | 14 ++++-----
+ Makefile.shared  |  2 ++
+ crypto/Makefile  | 10 +++---
+ engines/Makefile |  6 ++--
+ test/Makefile    | 92 ++++++++++++++++++++++++++++----------------------------
+ 5 files changed, 63 insertions(+), 61 deletions(-)
 
-Refreshed for 1.0.2i
-Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
-
---- openssl-1.0.2g/crypto/Makefile
-+++ openssl-1.0.2g/crypto/Makefile
-@@ -85,11 +85,11 @@
+diff --git a/Makefile.org b/Makefile.org
+index 9f24777..61fc488 100644
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -283,17 +283,17 @@ build_libcrypto: build_crypto build_engines libcrypto.pc
+ build_libssl: build_ssl libssl.pc
+ 
+ build_crypto:
+-       @dir=crypto; target=all; $(BUILD_ONE_CMD)
++       +@dir=crypto; target=all; $(BUILD_ONE_CMD)
+ build_ssl: build_crypto
+-       @dir=ssl; target=all; $(BUILD_ONE_CMD)
++       +@dir=ssl; target=all; $(BUILD_ONE_CMD)
+ build_engines: build_crypto
+-       @dir=engines; target=all; $(BUILD_ONE_CMD)
++       +@dir=engines; target=all; $(BUILD_ONE_CMD)
+ build_apps: build_libs
+-       @dir=apps; target=all; $(BUILD_ONE_CMD)
++       +@dir=apps; target=all; $(BUILD_ONE_CMD)
+ build_tests: build_libs
+-       @dir=test; target=all; $(BUILD_ONE_CMD)
++       +@dir=test; target=all; $(BUILD_ONE_CMD)
+ build_tools: build_libs
+-       @dir=tools; target=all; $(BUILD_ONE_CMD)
++       +@dir=tools; target=all; $(BUILD_ONE_CMD)
+ 
+ all_testapps: build_libs build_testapps
+ build_testapps:
+@@ -565,7 +565,7 @@ install_sw:
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+-       @set -e; target=install; $(RECURSIVE_BUILD_CMD)
++       +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
+        @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
+        do \
+                if [ -f "$$i" ]; then \
+diff --git a/Makefile.shared b/Makefile.shared
+index f6f92e7..43f85fc 100644
+--- a/Makefile.shared
++++ b/Makefile.shared
+@@ -105,6 +105,7 @@ LINK_SO=    \
+     SHAREDFLAGS="$(OE_LDFLAGS) $${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
+     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
+     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
++    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
+     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+     $${SHAREDCMD} $${SHAREDFLAGS} \
+        -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+@@ -122,6 +123,7 @@ SYMLINK_SO= \
+                        done; \
+                fi; \
+                if [ -n "$$SHLIB_SOVER" ]; then \
++                        [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
+                        ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
+                          ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+                fi; \
+diff --git a/crypto/Makefile b/crypto/Makefile
+index 17a87f8..29c2dcf 100644
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -85,11 +85,11 @@ testapps:
         @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
  
  subdirs:
@@ -25,7 +91,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
  
  links:
         @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-@@ -100,7 +100,7 @@
+@@ -100,7 +100,7 @@ links:
  # lib: $(LIB): are splitted to avoid end-less loop
  lib:   $(LIB)
         @touch lib
@@ -34,7 +100,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
         $(AR) $(LIB) $(LIBOBJ)
         test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
         $(RANLIB) $(LIB) || echo Never mind.
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@ shared: buildinf.h lib subdirs
         fi
  
  libs:
@@ -43,7 +109,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
  
  install:
         @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-@@ -120,7 +120,7 @@
+@@ -120,7 +120,7 @@ install:
         (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
         chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
         done;
@@ -52,9 +118,11 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
  
  lint:
         @target=lint; $(RECURSIVE_MAKE)
---- openssl-1.0.2g/engines/Makefile
-+++ openssl-1.0.2g/engines/Makefile
-@@ -72,7 +72,7 @@
+diff --git a/engines/Makefile b/engines/Makefile
+index fe8e9ca..a43d21b 100644
+--- a/engines/Makefile
++++ b/engines/Makefile
+@@ -72,7 +72,7 @@ top:
  
  all:   lib subdirs
  
@@ -63,7 +131,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
         @if [ -n "$(SHARED_LIBS)" ]; then \
                 set -e; \
                 for l in $(LIBNAMES); do \
-@@ -89,7 +89,7 @@
+@@ -89,7 +89,7 @@ lib:  $(LIBOBJ)
  
  subdirs:
         echo $(EDIRS)
@@ -72,8 +140,8 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
  
  files:
         $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-@@ -128,7 +128,7 @@
-                          mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+@@ -128,7 +128,7 @@ install:
+                          mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx ); \
                 done; \
         fi
 -       @target=install; $(RECURSIVE_MAKE)
@@ -81,71 +149,20 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
  
  tags:
         ctags $(SRC)
---- openssl-1.0.2g/Makefile.org
-+++ openssl-1.0.2g/Makefile.org
-@@ -279,17 +279,17 @@
- build_libssl: build_ssl libssl.pc
- 
- build_crypto:
--       @dir=crypto; target=all; $(BUILD_ONE_CMD)
-+       +@dir=crypto; target=all; $(BUILD_ONE_CMD)
- build_ssl: build_crypto
--       @dir=ssl; target=all; $(BUILD_ONE_CMD)
-+       +@dir=ssl; target=all; $(BUILD_ONE_CMD)
- build_engines: build_crypto
--       @dir=engines; target=all; $(BUILD_ONE_CMD)
-+       +@dir=engines; target=all; $(BUILD_ONE_CMD)
- build_apps: build_libs
--       @dir=apps; target=all; $(BUILD_ONE_CMD)
-+       +@dir=apps; target=all; $(BUILD_ONE_CMD)
- build_tests: build_libs
--       @dir=test; target=all; $(BUILD_ONE_CMD)
-+       +@dir=test; target=all; $(BUILD_ONE_CMD)
- build_tools: build_libs
--       @dir=tools; target=all; $(BUILD_ONE_CMD)
-+       +@dir=tools; target=all; $(BUILD_ONE_CMD)
- 
- all_testapps: build_libs build_testapps
- build_testapps:
-@@ -544,7 +544,7 @@
-        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done;
--       @set -e; target=install; $(RECURSIVE_BUILD_CMD)
-+       +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
-        @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
-        do \
-                if [ -f "$$i" ]; then \
---- openssl-1.0.2g/Makefile.shared
-+++ openssl-1.0.2g/Makefile.shared
-@@ -105,6 +105,7 @@
-     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
-     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
-     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-+    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
-     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-     $${SHAREDCMD} $${SHAREDFLAGS} \
-        -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
-@@ -122,6 +123,7 @@
-                        done; \
-                fi; \
-                if [ -n "$$SHLIB_SOVER" ]; then \
-+                       [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
-                        ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
-                          ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
-                fi; \
---- openssl-1.0.2g/test/Makefile
-+++ openssl-1.0.2g/test/Makefile
-@@ -144,7 +144,7 @@
+diff --git a/test/Makefile b/test/Makefile
+index dc1b86f..97eb0de 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -144,7 +144,7 @@ install:
  tags:
         ctags $(SRC)
  
 -tests: exe apps $(TESTS)
-+tests: exe $(TESTS)
++tests: exe  $(TESTS)
  
  apps:
         @(cd ..; $(MAKE) DIRS=apps all)
-@@ -438,136 +438,136 @@
+@@ -438,136 +438,136 @@ BUILD_CMD_STATIC=shlib_target=; \
                 link_app.$${shlib_target}
  
  $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
@@ -326,7 +343,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
  
  #$(AESTEST).o: $(AESTEST).c
  #      $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
-@@ -580,6 +580,6 @@
+@@ -580,7 +580,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO)
  #      fi
  
  dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
@@ -334,4 +351,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
 +       +@target=dummytest; $(BUILD_CMD)
  
  # DO NOT DELETE THIS LINE -- make depend depends on it.
- 
\ No newline at end of file
+ 
+-- 
+2.7.4
+
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 @@
-Additional Makefile dependencies removal for test targets
+From e754d694815fcd68231ea701826ca7f5a8030b8b Mon Sep 17 00:00:00 2001
+From: Chunrong Guo <chunrong.guo@nxp.com>
+Date: Tue, 20 Mar 2018 15:23:19 +0800
+Subject: [PATCH] Additional Makefile dependencies removal for test targets
 
 Removing the dependency check for test targets as these tests are
 causing a number of failures and "noise" during ptest execution.
@@ -7,10 +10,17 @@ Upstream-Status: Inappropriate [config]
 
 Signed-off-by: Maxin B. John <maxin.john@intel.com>
 
-diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
---- openssl-1.0.2d-orig/test/Makefile   2015-09-28 12:50:41.530022979 +0300
-+++ openssl-1.0.2d/test/Makefile        2015-09-28 12:57:45.930717240 +0300
-@@ -155,67 +155,67 @@
+Refreshed for 1.0.2l
+Signed-off-by:  Chunrong Guo <chunrong.guo@nxp.com>
+---
+ test/Makefile | 88 +++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 43 insertions(+), 45 deletions(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index 341d652..e3d79bd 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -165,67 +165,67 @@ alltests:
         ( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \
         done)
  
@@ -31,18 +41,18 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
         ../util/shlib_wrap.sh ./$(IDEATEST)
  
 -test_sha: $(SHATEST)$(EXE_EXT) $(SHA1TEST)$(EXE_EXT) $(SHA256TEST)$(EXE_EXT) $(SHA512TEST)$(EXE_EXT)
-+test_sha:
++test_sha: 
         ../util/shlib_wrap.sh ./$(SHATEST)
         ../util/shlib_wrap.sh ./$(SHA1TEST)
         ../util/shlib_wrap.sh ./$(SHA256TEST)
         ../util/shlib_wrap.sh ./$(SHA512TEST)
  
 -test_mdc2: $(MDC2TEST)$(EXE_EXT)
-+test_mdc2:
++test_mdc2: 
         ../util/shlib_wrap.sh ./$(MDC2TEST)
  
 -test_md5: $(MD5TEST)$(EXE_EXT)
-+test_md5:
++test_md5: 
         ../util/shlib_wrap.sh ./$(MD5TEST)
  
 -test_md4: $(MD4TEST)$(EXE_EXT)
@@ -50,43 +60,43 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
         ../util/shlib_wrap.sh ./$(MD4TEST)
  
 -test_hmac: $(HMACTEST)$(EXE_EXT)
-+test_hmac:
++test_hmac: 
         ../util/shlib_wrap.sh ./$(HMACTEST)
  
 -test_wp: $(WPTEST)$(EXE_EXT)
-+test_wp:
++test_wp: 
         ../util/shlib_wrap.sh ./$(WPTEST)
  
 -test_md2: $(MD2TEST)$(EXE_EXT)
-+test_md2:
++test_md2: 
         ../util/shlib_wrap.sh ./$(MD2TEST)
  
 -test_rmd: $(RMDTEST)$(EXE_EXT)
-+test_rmd:
++test_rmd: 
         ../util/shlib_wrap.sh ./$(RMDTEST)
  
 -test_bf: $(BFTEST)$(EXE_EXT)
-+test_bf:
++test_bf: 
         ../util/shlib_wrap.sh ./$(BFTEST)
  
 -test_cast: $(CASTTEST)$(EXE_EXT)
-+test_cast:
++test_cast: 
         ../util/shlib_wrap.sh ./$(CASTTEST)
  
 -test_rc2: $(RC2TEST)$(EXE_EXT)
-+test_rc2:
++test_rc2: 
         ../util/shlib_wrap.sh ./$(RC2TEST)
  
 -test_rc4: $(RC4TEST)$(EXE_EXT)
-+test_rc4:
++test_rc4: 
         ../util/shlib_wrap.sh ./$(RC4TEST)
  
 -test_rc5: $(RC5TEST)$(EXE_EXT)
-+test_rc5:
++test_rc5: 
         ../util/shlib_wrap.sh ./$(RC5TEST)
  
 -test_rand: $(RANDTEST)$(EXE_EXT)
-+test_rand:
++test_rand: 
         ../util/shlib_wrap.sh ./$(RANDTEST)
  
 -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
         echo test normal x509v1 certificate
         sh ./tx509 2>/dev/null
         echo test first x509v3 certificate
-@@ -223,25 +223,25 @@
+@@ -233,25 +233,25 @@ test_x509: ../apps/openssl$(EXE_EXT) tx509 testx509.pem v3-cert1.pem v3-cert2.pe
         echo test second x509v3 certificate
         sh ./tx509 v3-cert2.pem 2>/dev/null
  
@@ -112,11 +122,11 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
         @sh ./tcrl 2>/dev/null
  
 -test_sid: ../apps/openssl$(EXE_EXT) tsid testsid.pem
-+test_sid:
++test_sid: 
         @sh ./tsid 2>/dev/null
  
 -test_req: ../apps/openssl$(EXE_EXT) treq testreq.pem testreq2.pem
-+test_req:
++test_req: 
         @sh ./treq 2>/dev/null
         @sh ./treq testreq2.pem 2>/dev/null
  
@@ -126,26 +136,26 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
         @sh ./tpkcs7d 2>/dev/null
  
 -test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
-+test_bn:
++test_bn: 
         @echo starting big number library test, could take a while...
         @../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest
         @echo quit >>tmp.bntest
-@@ -250,33 +250,33 @@
+@@ -260,33 +260,33 @@ test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
         @echo 'test a^b%c implementations'
         ../util/shlib_wrap.sh ./$(EXPTEST)
  
 -test_ec: $(ECTEST)$(EXE_EXT)
-+test_ec:
++test_ec: 
         @echo 'test elliptic curves'
         ../util/shlib_wrap.sh ./$(ECTEST)
  
 -test_ecdsa: $(ECDSATEST)$(EXE_EXT)
-+test_ecdsa:
++test_ecdsa: 
         @echo 'test ecdsa'
         ../util/shlib_wrap.sh ./$(ECDSATEST)
  
 -test_ecdh: $(ECDHTEST)$(EXE_EXT)
-+test_ecdh:
++test_ecdh: 
         @echo 'test ecdh'
         ../util/shlib_wrap.sh ./$(ECDHTEST)
  
@@ -156,7 +166,7 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
         ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem
  
 -test_dh: $(DHTEST)$(EXE_EXT)
-+test_dh:
++test_dh: 
         @echo "Generate a set of DH parameters"
         ../util/shlib_wrap.sh ./$(DHTEST)
  
@@ -167,59 +177,59 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
         ../util/shlib_wrap.sh ./$(DSATEST) -app2_1
  
 -test_gen testreq.pem: ../apps/openssl$(EXE_EXT) testgen test.cnf
-+test_gen testreq.pem:
++test_gen testreq.pem: 
         @echo "Generate and verify a certificate request"
         @sh ./testgen
  
-@@ -288,13 +288,11 @@
+@@ -298,13 +298,11 @@ test_ss keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
         @cat certCA.ss certU.ss > intP1.ss
         @cat certCA.ss certU.ss certP1.ss > intP2.ss
  
 -test_engine:  $(ENGINETEST)$(EXE_EXT)
-+test_engine:
++test_engine:  
         @echo "Manipulate the ENGINE structures"
         ../util/shlib_wrap.sh ./$(ENGINETEST)
  
 -test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
 -               intP1.ss intP2.ss $(SSLTEST)$(EXE_EXT) testssl testsslproxy \
 -               ../apps/server2.pem serverinfo.pem
-+test_ssl:
++test_ssl: 
         @echo "test SSL protocol"
         @if [ -n "$(FIPSCANLIB)" ]; then \
           sh ./testfipsssl keyU.ss certU.ss certCA.ss; \
-@@ -304,7 +302,7 @@
+@@ -315,7 +313,7 @@ test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
         @sh ./testsslproxy keyP1.ss certP1.ss intP1.ss
         @sh ./testsslproxy keyP2.ss certP2.ss intP2.ss
  
 -test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf
-+test_ca:
++test_ca: 
         @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
           echo "skipping CA.sh test -- requires RSA"; \
         else \
-@@ -312,11 +310,11 @@
+@@ -323,11 +321,11 @@ test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf
           sh ./testca; \
         fi
  
 -test_aes: #$(AESTEST)
-+test_aes:
++test_aes: 
  #      @echo "test Rijndael"
  #      ../util/shlib_wrap.sh ./$(AESTEST)
  
 -test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh
-+test_tsa:
++test_tsa: 
         @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
           echo "skipping testtsa test -- requires RSA"; \
         else \
-@@ -331,7 +329,7 @@
+@@ -342,7 +340,7 @@ test_jpake:
         @echo "Test JPAKE"
         ../util/shlib_wrap.sh ./$(JPAKETEST)
  
 -test_cms: ../apps/openssl$(EXE_EXT) cms-test.pl smcont.txt
-+test_cms:
++test_cms: 
         @echo "CMS consistency test"
         $(PERL) cms-test.pl
  
-@@ -339,22 +337,22 @@
+@@ -350,22 +348,22 @@ test_srp:
         @echo "Test SRP"
         ../util/shlib_wrap.sh ./srptest
  
@@ -229,7 +239,7 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
         @sh ./tocsp
  
 -test_v3name: $(V3NAMETEST)$(EXE_EXT)
-+test_v3name:
++test_v3name: 
         @echo "Test X509v3_check_*"
         ../util/shlib_wrap.sh ./$(V3NAMETEST)
  
@@ -237,12 +247,15 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
         ../util/shlib_wrap.sh ./$(HEARTBEATTEST)
  
 -test_constant_time: $(CONSTTIMETEST)$(EXE_EXT)
-+test_constant_time:
++test_constant_time: 
         @echo "Test constant time utilites"
         ../util/shlib_wrap.sh ./$(CONSTTIMETEST)
  
 -test_verify_extra: $(VERIFYEXTRATEST)$(EXE_EXT)
-+test_verify_extra:
++test_verify_extra: 
         @echo $(START) $@
         ../util/shlib_wrap.sh ./$(VERIFYEXTRATEST)
  
+-- 
+2.7.4
+
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 \
             file://openssl-fix-des.pod-error.patch \
             file://Makefiles-ptest.patch \
             file://ptest-deps.patch \
-            file://openssl-1.0.2a-x32-asm.patch \
             file://ptest_makefile_deps.patch \
             file://configure-musl-target.patch \
             file://parallel.patch \