pings
From: Chunrong Guo
Sent: Tuesday, March 20, 2018 4:01:48 PM
To: meta-freescale@yoctoproject.org
Cc: Zhenhua Luo; C.r. Guo
Subject: [PATCH] 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://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Frt.openssl.org%2FTicket%2FDisplay.html%3Fid%3D3759%26user%3Dguest%26pass%3Dguest=02%7C01%7Cchunrong.guo%40nxp.com%7C51024e54a87b460691ba08d58e38dbee%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636571298372636549=AfELHSM7N1bDCkXVbaZQAuaNeREoFykQD3aXT93JSFk%3D=0
Signed-off-by: Chunrong Guo
---
.../openssl/openssl-qoriq/Makefiles-ptest.patch| 47 +++---
.../openssl-qoriq/debian/c_rehash-compat.patch | 10 +-
.../openssl-qoriq/debian/debian-targets.patch | 14 +-
.../openssl/openssl-qoriq/parallel.patch | 172 -
.../openssl-qoriq/ptest_makefile_deps.patch| 97 +++-
.../openssl/openssl-qoriq_1.0.2l.bb| 1 -
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 249446a..1ab585c 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
+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
Signed-off-by: Maxin B. John
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: