summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-02-01 20:01:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-19 23:53:34 +0000
commit932ecd6def4b84ac23bebe6c08c214d112028a1f (patch)
tree3410f4b2e8e44af3fa55c3f26e6692dd68bbdc8b
parent5dc6fd13c53bf69fb9ce7c0243e6ea3dd700596d (diff)
downloadpoky-932ecd6def4b84ac23bebe6c08c214d112028a1f.tar.gz
openssl: update to 1.0.2n
Drop upstreamed 0001-aes-armv4-bsaes-armv7-sha256-armv4-.pl-make-it-work-.patch Rebase a couple more patches (via devtool upgrade). (From OE-Core rev: a69526f9cd7682d8a8ff49fd8101b46616e3c05f) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 8a79b8619ce797d5395989e7bb804bc2accfbb14) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-aes-armv4-bsaes-armv7-sha256-armv4-.pl-make-it-work-.patch100
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/0001-Fix-build-with-clang-using-external-assembler.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-Fix-build-with-clang-using-external-assembler.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/0001-openssl-force-soft-link-to-avoid-rare-race.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-openssl-force-soft-link-to-avoid-rare-race.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/Makefiles-ptest.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/Makefiles-ptest.patch)46
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/Use-SHA256-not-MD5-as-default-digest.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/Use-SHA256-not-MD5-as-default-digest.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/configure-musl-target.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-musl-target.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/configure-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/c_rehash-compat.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/ca.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/ca.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/debian-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/man-dir.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-dir.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/man-section.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-section.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/no-rpath.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-rpath.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/no-symbolic.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-symbolic.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/pic.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/pic.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/block_digicert_malaysia.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_digicert_malaysia.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/block_diginotar.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_diginotar.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/soname.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/soname.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/version-script.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/version-script.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/engines-install-in-libdir-ssl.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/engines-install-in-libdir-ssl.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/find.pl (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/find.pl)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/oe-ldflags.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/oe-ldflags.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-1.0.2a-x32-asm.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-1.0.2a-x32-asm.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-c_rehash.sh (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-c_rehash.sh)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-fix-des.pod-error.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-fix-des.pod-error.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-util-perlpath.pl-cwd.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-util-perlpath.pl-cwd.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl_fix_for_x32.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl_fix_for_x32.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/parallel.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/parallel.patch)177
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/ptest-deps.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest-deps.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/ptest_makefile_deps.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest_makefile_deps.patch)0
-rwxr-xr-xmeta/recipes-connectivity/openssl/openssl-1.0.2n/run-ptest (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/run-ptest)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2n/shared-libs.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2m/shared-libs.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2m.bb61
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2n.bb60
34 files changed, 196 insertions, 248 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-aes-armv4-bsaes-armv7-sha256-armv4-.pl-make-it-work-.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-aes-armv4-bsaes-armv7-sha256-armv4-.pl-make-it-work-.patch
deleted file mode 100644
index 2ce0320c49..0000000000
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-aes-armv4-bsaes-armv7-sha256-armv4-.pl-make-it-work-.patch
+++ /dev/null
@@ -1,100 +0,0 @@
1From d1d6c69b6fd25e71dbae67fad17b2c7737f6b2dc Mon Sep 17 00:00:00 2001
2From: Andy Polyakov <appro@openssl.org>
3Date: Sun, 5 Nov 2017 17:08:16 +0100
4Subject: [PATCH] {aes-armv4|bsaes-armv7|sha256-armv4}.pl: make it work with
5 binutils-2.29
6
7It's not clear if it's a feature or bug, but binutils-2.29[.1]
8interprets 'adr' instruction with Thumb2 code reference differently,
9in a way that affects calculation of addresses of constants' tables.
10
11Upstream-Status: Backport
12
13Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
14Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
15Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
16(Merged from https://github.com/openssl/openssl/pull/4673)
17---
18 crypto/aes/asm/aes-armv4.pl | 6 +++---
19 crypto/aes/asm/bsaes-armv7.pl | 6 +++---
20 crypto/sha/asm/sha256-armv4.pl | 2 +-
21 3 files changed, 7 insertions(+), 7 deletions(-)
22
23diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl
24index 4f8917089f..c1b5e352d7 100644
25--- a/crypto/aes/asm/aes-armv4.pl
26+++ b/crypto/aes/asm/aes-armv4.pl
27@@ -184,7 +184,7 @@ AES_encrypt:
28 #if __ARM_ARCH__<7
29 sub r3,pc,#8 @ AES_encrypt
30 #else
31- adr r3,AES_encrypt
32+ adr r3,.
33 #endif
34 stmdb sp!,{r1,r4-r12,lr}
35 mov $rounds,r0 @ inp
36@@ -430,7 +430,7 @@ _armv4_AES_set_encrypt_key:
37 #if __ARM_ARCH__<7
38 sub r3,pc,#8 @ AES_set_encrypt_key
39 #else
40- adr r3,private_AES_set_encrypt_key
41+ adr r3,.
42 #endif
43 teq r0,#0
44 #if __ARM_ARCH__>=7
45@@ -952,7 +952,7 @@ AES_decrypt:
46 #if __ARM_ARCH__<7
47 sub r3,pc,#8 @ AES_decrypt
48 #else
49- adr r3,AES_decrypt
50+ adr r3,.
51 #endif
52 stmdb sp!,{r1,r4-r12,lr}
53 mov $rounds,r0 @ inp
54diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl
55index 70b3f9656f..ec66b0502a 100644
56--- a/crypto/aes/asm/bsaes-armv7.pl
57+++ b/crypto/aes/asm/bsaes-armv7.pl
58@@ -724,7 +724,7 @@ $code.=<<___;
59 .type _bsaes_decrypt8,%function
60 .align 4
61 _bsaes_decrypt8:
62- adr $const,_bsaes_decrypt8
63+ adr $const,.
64 vldmia $key!, {@XMM[9]} @ round 0 key
65 add $const,$const,#.LM0ISR-_bsaes_decrypt8
66
67@@ -819,7 +819,7 @@ _bsaes_const:
68 .type _bsaes_encrypt8,%function
69 .align 4
70 _bsaes_encrypt8:
71- adr $const,_bsaes_encrypt8
72+ adr $const,.
73 vldmia $key!, {@XMM[9]} @ round 0 key
74 sub $const,$const,#_bsaes_encrypt8-.LM0SR
75
76@@ -923,7 +923,7 @@ $code.=<<___;
77 .type _bsaes_key_convert,%function
78 .align 4
79 _bsaes_key_convert:
80- adr $const,_bsaes_key_convert
81+ adr $const,.
82 vld1.8 {@XMM[7]}, [$inp]! @ load round 0 key
83 sub $const,$const,#_bsaes_key_convert-.LM0
84 vld1.8 {@XMM[15]}, [$inp]! @ load round 1 key
85diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
86index 4fee74d832..750216eb42 100644
87--- a/crypto/sha/asm/sha256-armv4.pl
88+++ b/crypto/sha/asm/sha256-armv4.pl
89@@ -205,7 +205,7 @@ sha256_block_data_order:
90 #if __ARM_ARCH__<7
91 sub r3,pc,#8 @ sha256_block_data_order
92 #else
93- adr r3,sha256_block_data_order
94+ adr r3,.
95 #endif
96 #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
97 ldr r12,.LOPENSSL_armcap
98--
992.15.0
100
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-Fix-build-with-clang-using-external-assembler.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/0001-Fix-build-with-clang-using-external-assembler.patch
index 2270962a6f..2270962a6f 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-Fix-build-with-clang-using-external-assembler.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/0001-Fix-build-with-clang-using-external-assembler.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-openssl-force-soft-link-to-avoid-rare-race.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/0001-openssl-force-soft-link-to-avoid-rare-race.patch
index dd1a9b1dd2..dd1a9b1dd2 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-openssl-force-soft-link-to-avoid-rare-race.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/0001-openssl-force-soft-link-to-avoid-rare-race.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/Makefiles-ptest.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/Makefiles-ptest.patch
index 249446a5bd..2122fa1fb4 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/Makefiles-ptest.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/Makefiles-ptest.patch
@@ -1,15 +1,28 @@
1From a176c69f4fdfbfa7e4ccb79d91c3b6602da7e69a Mon Sep 17 00:00:00 2001
2From: Anders Roxell <anders.roxell@enea.com>
3Date: Thu, 24 Apr 2014 19:28:25 +0200
4Subject: [PATCH 19/28] openssl: enable ptest support
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
4Signed-off-by: Anders Roxell <anders.roxell@enea.com> 9Signed-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
12
7--- 13---
8Index: openssl-1.0.2/Makefile.org 14 Makefile.org | 10 +-
9=================================================================== 15 Makefile.org.orig | 7 +-
10--- openssl-1.0.2.orig/Makefile.org 16 test/Makefile | 13 +-
11+++ openssl-1.0.2/Makefile.org 17 test/Makefile.orig | 987 +++++++++++++++++++++++++++++++++++++++++++++++++++++
12@@ -451,8 +451,16 @@ rehash.time: certs apps 18 4 files changed, 1009 insertions(+), 8 deletions(-)
19 create mode 100644 test/Makefile.orig
20
21diff --git a/Makefile.org b/Makefile.org
22index 111fbba..8e7936c 100644
23--- a/Makefile.org
24+++ b/Makefile.org
25@@ -468,8 +468,16 @@ rehash.time: certs apps
13 test: tests 26 test: tests
14 27
15 tests: rehash 28 tests: rehash
@@ -27,11 +40,11 @@ Index: openssl-1.0.2/Makefile.org
27 OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a 40 OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a
28 41
29 report: 42 report:
30Index: openssl-1.0.2/test/Makefile 43diff --git a/test/Makefile b/test/Makefile
31=================================================================== 44index a1f7eeb..b2984c4 100644
32--- openssl-1.0.2.orig/test/Makefile 45--- a/test/Makefile
33+++ openssl-1.0.2/test/Makefile 46+++ b/test/Makefile
34@@ -137,7 +137,7 @@ tests: exe apps $(TESTS) 47@@ -150,7 +150,7 @@ tests: exe apps $(TESTS)
35 apps: 48 apps:
36 @(cd ..; $(MAKE) DIRS=apps all) 49 @(cd ..; $(MAKE) DIRS=apps all)
37 50
@@ -40,9 +53,9 @@ Index: openssl-1.0.2/test/Makefile
40 test_des test_idea test_sha test_md4 test_md5 test_hmac \ 53 test_des test_idea test_sha test_md4 test_md5 test_hmac \
41 test_md2 test_mdc2 test_wp \ 54 test_md2 test_mdc2 test_wp \
42 test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \ 55 test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \
43@@ -148,6 +148,11 @@ alltests: \ 56@@ -162,6 +162,11 @@ alltests: \
44 test_jpake test_srp test_cms test_ocsp test_v3name test_heartbeat \ 57 test_constant_time test_verify_extra test_clienthello test_sslv2conftest \
45 test_constant_time 58 test_dtls test_bad_dtls test_fatalerr
46 59
47+alltests: 60+alltests:
48+ @(for i in $(all-tests); do \ 61+ @(for i in $(all-tests); do \
@@ -52,7 +65,7 @@ Index: openssl-1.0.2/test/Makefile
52 test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt 65 test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt
53 ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt 66 ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
54 67
55@@ -213,7 +218,7 @@ test_x509: ../apps/openssl$(EXE_EXT) tx5 68@@ -230,7 +235,7 @@ test_x509: ../apps/openssl$(EXE_EXT) tx509 testx509.pem v3-cert1.pem v3-cert2.pe
56 echo test second x509v3 certificate 69 echo test second x509v3 certificate
57 sh ./tx509 v3-cert2.pem 2>/dev/null 70 sh ./tx509 v3-cert2.pem 2>/dev/null
58 71
@@ -61,7 +74,7 @@ Index: openssl-1.0.2/test/Makefile
61 @sh ./trsa 2>/dev/null 74 @sh ./trsa 2>/dev/null
62 ../util/shlib_wrap.sh ./$(RSATEST) 75 ../util/shlib_wrap.sh ./$(RSATEST)
63 76
64@@ -313,11 +318,11 @@ test_tsa: ../apps/openssl$(EXE_EXT) test 77@@ -331,11 +336,11 @@ test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh
65 sh ./testtsa; \ 78 sh ./testtsa; \
66 fi 79 fi
67 80
@@ -75,3 +88,6 @@ Index: openssl-1.0.2/test/Makefile
75 @echo "Test JPAKE" 88 @echo "Test JPAKE"
76 ../util/shlib_wrap.sh ./$(JPAKETEST) 89 ../util/shlib_wrap.sh ./$(JPAKETEST)
77 90
91--
922.15.1
93
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/Use-SHA256-not-MD5-as-default-digest.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/Use-SHA256-not-MD5-as-default-digest.patch
index 58c9ee7844..58c9ee7844 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/Use-SHA256-not-MD5-as-default-digest.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/Use-SHA256-not-MD5-as-default-digest.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-musl-target.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/configure-musl-target.patch
index f357b3f59f..f357b3f59f 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-musl-target.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/configure-musl-target.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/configure-targets.patch
index 1e01589722..1e01589722 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/configure-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch
index 68e54d561e..68e54d561e 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/c_rehash-compat.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/ca.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/ca.patch
index fb745e4394..fb745e4394 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/ca.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/ca.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch
index 39d4328184..39d4328184 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/debian-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-dir.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/man-dir.patch
index 4085e3b1d7..4085e3b1d7 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-dir.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/man-dir.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/man-section.patch
index 21c1d1a4eb..21c1d1a4eb 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-section.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/man-section.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-rpath.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/no-rpath.patch
index 1ccb3b86ee..1ccb3b86ee 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-rpath.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/no-rpath.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-symbolic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/no-symbolic.patch
index cc4408ab7d..cc4408ab7d 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-symbolic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/no-symbolic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/pic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/pic.patch
index bfda3888bf..bfda3888bf 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/pic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/pic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_digicert_malaysia.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/block_digicert_malaysia.patch
index c43bcd1c77..c43bcd1c77 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_digicert_malaysia.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/block_digicert_malaysia.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_diginotar.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/block_diginotar.patch
index d81e22cd8d..d81e22cd8d 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_diginotar.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/block_diginotar.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/soname.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/soname.patch
index 09dd9eaf86..09dd9eaf86 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/soname.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/soname.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/version-script.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/version-script.patch
index e404ee3312..e404ee3312 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/version-script.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/version-script.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/engines-install-in-libdir-ssl.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/engines-install-in-libdir-ssl.patch
index a5746483e6..a5746483e6 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/engines-install-in-libdir-ssl.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/engines-install-in-libdir-ssl.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/find.pl b/meta/recipes-connectivity/openssl/openssl-1.0.2n/find.pl
index 8e1b42c88a..8e1b42c88a 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/find.pl
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/find.pl
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/oe-ldflags.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/oe-ldflags.patch
index 292e13dc5f..292e13dc5f 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/oe-ldflags.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/oe-ldflags.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-1.0.2a-x32-asm.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-1.0.2a-x32-asm.patch
index 1e5bfa17d6..1e5bfa17d6 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-1.0.2a-x32-asm.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-1.0.2a-x32-asm.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-c_rehash.sh b/meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-c_rehash.sh
index 6620fdcb53..6620fdcb53 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-c_rehash.sh
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-c_rehash.sh
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-fix-des.pod-error.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-fix-des.pod-error.patch
index de49729e5e..de49729e5e 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-fix-des.pod-error.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-fix-des.pod-error.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-util-perlpath.pl-cwd.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-util-perlpath.pl-cwd.patch
index 065b9b122a..065b9b122a 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-util-perlpath.pl-cwd.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-util-perlpath.pl-cwd.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl_fix_for_x32.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl_fix_for_x32.patch
index 0f08a642f6..0f08a642f6 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl_fix_for_x32.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl_fix_for_x32.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/parallel.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/parallel.patch
index f3f4c99888..e5413bf389 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/parallel.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/parallel.patch
@@ -1,4 +1,7 @@
1Fix the parallel races in the Makefiles. 1From 7fb1192f112c1920bfd39f4185f34e9afff3cff2 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Sat, 5 Mar 2016 00:12:02 +0000
4Subject: [PATCH 24/28] 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
@@ -9,9 +12,82 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
9Refreshed for 1.0.2i 12Refreshed for 1.0.2i
10Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> 13Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
11 14
12--- openssl-1.0.2g/crypto/Makefile 15---
13+++ openssl-1.0.2g/crypto/Makefile 16 Makefile.org | 14 +-
14@@ -85,11 +85,11 @@ 17 Makefile.org.orig | 10 +-
18 Makefile.shared | 2 +
19 Makefile.shared.orig | 655 ++++++++++++++++++++++++++++++++++++++++++++++++++
20 crypto/Makefile | 10 +-
21 engines/Makefile | 6 +-
22 engines/Makefile.orig | 338 ++++++++++++++++++++++++++
23 test/Makefile | 92 +++----
24 test/Makefile.orig | 88 ++++---
25 9 files changed, 1108 insertions(+), 107 deletions(-)
26 create mode 100644 Makefile.shared.orig
27 create mode 100644 engines/Makefile.orig
28
29diff --git a/Makefile.org b/Makefile.org
30index 8e7936c..ed98d2a 100644
31--- a/Makefile.org
32+++ b/Makefile.org
33@@ -283,17 +283,17 @@ build_libcrypto: build_crypto build_engines libcrypto.pc
34 build_libssl: build_ssl libssl.pc
35
36 build_crypto:
37- @dir=crypto; target=all; $(BUILD_ONE_CMD)
38+ +@dir=crypto; target=all; $(BUILD_ONE_CMD)
39 build_ssl: build_crypto
40- @dir=ssl; target=all; $(BUILD_ONE_CMD)
41+ +@dir=ssl; target=all; $(BUILD_ONE_CMD)
42 build_engines: build_crypto
43- @dir=engines; target=all; $(BUILD_ONE_CMD)
44+ +@dir=engines; target=all; $(BUILD_ONE_CMD)
45 build_apps: build_libs
46- @dir=apps; target=all; $(BUILD_ONE_CMD)
47+ +@dir=apps; target=all; $(BUILD_ONE_CMD)
48 build_tests: build_libs
49- @dir=test; target=all; $(BUILD_ONE_CMD)
50+ +@dir=test; target=all; $(BUILD_ONE_CMD)
51 build_tools: build_libs
52- @dir=tools; target=all; $(BUILD_ONE_CMD)
53+ +@dir=tools; target=all; $(BUILD_ONE_CMD)
54
55 all_testapps: build_libs build_testapps
56 build_testapps:
57@@ -565,7 +565,7 @@ install_sw:
58 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
59 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
60 done;
61- @set -e; target=install; $(RECURSIVE_BUILD_CMD)
62+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
63 @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
64 do \
65 if [ -f "$$i" ]; then \
66diff --git a/Makefile.shared b/Makefile.shared
67index f6f92e7..8164186 100644
68--- a/Makefile.shared
69+++ b/Makefile.shared
70@@ -105,6 +105,7 @@ LINK_SO= \
71 SHAREDFLAGS="$(OE_LDFLAGS) $${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
72 LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
73 LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
74+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
75 LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
76 $${SHAREDCMD} $${SHAREDFLAGS} \
77 -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
78@@ -122,6 +123,7 @@ SYMLINK_SO= \
79 done; \
80 fi; \
81 if [ -n "$$SHLIB_SOVER" ]; then \
82+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
83 ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
84 ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
85 fi; \
86diff --git a/crypto/Makefile b/crypto/Makefile
87index 17a87f8..29c2dcf 100644
88--- a/crypto/Makefile
89+++ b/crypto/Makefile
90@@ -85,11 +85,11 @@ testapps:
15 @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi 91 @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
16 92
17 subdirs: 93 subdirs:
@@ -25,7 +101,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
25 101
26 links: 102 links:
27 @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) 103 @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
28@@ -100,7 +100,7 @@ 104@@ -100,7 +100,7 @@ links:
29 # lib: $(LIB): are splitted to avoid end-less loop 105 # lib: $(LIB): are splitted to avoid end-less loop
30 lib: $(LIB) 106 lib: $(LIB)
31 @touch lib 107 @touch lib
@@ -34,7 +110,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
34 $(AR) $(LIB) $(LIBOBJ) 110 $(AR) $(LIB) $(LIBOBJ)
35 test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o 111 test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
36 $(RANLIB) $(LIB) || echo Never mind. 112 $(RANLIB) $(LIB) || echo Never mind.
37@@ -111,7 +111,7 @@ 113@@ -111,7 +111,7 @@ shared: buildinf.h lib subdirs
38 fi 114 fi
39 115
40 libs: 116 libs:
@@ -43,7 +119,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
43 119
44 install: 120 install:
45 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... 121 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
46@@ -120,7 +120,7 @@ 122@@ -120,7 +120,7 @@ install:
47 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 123 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
48 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ 124 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
49 done; 125 done;
@@ -52,9 +128,11 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
52 128
53 lint: 129 lint:
54 @target=lint; $(RECURSIVE_MAKE) 130 @target=lint; $(RECURSIVE_MAKE)
55--- openssl-1.0.2g/engines/Makefile 131diff --git a/engines/Makefile b/engines/Makefile
56+++ openssl-1.0.2g/engines/Makefile 132index fe8e9ca..a43d21b 100644
57@@ -72,7 +72,7 @@ 133--- a/engines/Makefile
134+++ b/engines/Makefile
135@@ -72,7 +72,7 @@ top:
58 136
59 all: lib subdirs 137 all: lib subdirs
60 138
@@ -63,7 +141,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
63 @if [ -n "$(SHARED_LIBS)" ]; then \ 141 @if [ -n "$(SHARED_LIBS)" ]; then \
64 set -e; \ 142 set -e; \
65 for l in $(LIBNAMES); do \ 143 for l in $(LIBNAMES); do \
66@@ -89,7 +89,7 @@ 144@@ -89,7 +89,7 @@ lib: $(LIBOBJ)
67 145
68 subdirs: 146 subdirs:
69 echo $(EDIRS) 147 echo $(EDIRS)
@@ -72,8 +150,8 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
72 150
73 files: 151 files:
74 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO 152 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
75@@ -128,7 +128,7 @@ 153@@ -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 ); \ 154 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx ); \
77 done; \ 155 done; \
78 fi 156 fi
79- @target=install; $(RECURSIVE_MAKE) 157- @target=install; $(RECURSIVE_MAKE)
@@ -81,62 +159,11 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
81 159
82 tags: 160 tags:
83 ctags $(SRC) 161 ctags $(SRC)
84--- openssl-1.0.2g/Makefile.org 162diff --git a/test/Makefile b/test/Makefile
85+++ openssl-1.0.2g/Makefile.org 163index 40abd60..78d3788 100644
86@@ -279,17 +279,17 @@ 164--- a/test/Makefile
87 build_libssl: build_ssl libssl.pc 165+++ b/test/Makefile
88 166@@ -145,7 +145,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: 167 tags:
141 ctags $(SRC) 168 ctags $(SRC)
142 169
@@ -145,7 +172,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
145 172
146 apps: 173 apps:
147 @(cd ..; $(MAKE) DIRS=apps all) 174 @(cd ..; $(MAKE) DIRS=apps all)
148@@ -438,136 +438,136 @@ 175@@ -444,139 +444,139 @@ BUILD_CMD_STATIC=shlib_target=; \
149 link_app.$${shlib_target} 176 link_app.$${shlib_target}
150 177
151 $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) 178 $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
@@ -316,6 +343,9 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
316- @target=$(BADDTLSTEST) $(BUILD_CMD) 343- @target=$(BADDTLSTEST) $(BUILD_CMD)
317+ +@target=$(BADDTLSTEST) $(BUILD_CMD) 344+ +@target=$(BADDTLSTEST) $(BUILD_CMD)
318 345
346 $(FATALERRTEST)$(EXE_EXT): $(FATALERRTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO)
347 @target=$(FATALERRTEST); exobj=ssltestlib.o; $(BUILD_CMD)
348
319 $(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o 349 $(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o
320- @target=$(SSLV2CONFTEST) $(BUILD_CMD) 350- @target=$(SSLV2CONFTEST) $(BUILD_CMD)
321+ +@target=$(SSLV2CONFTEST) $(BUILD_CMD) 351+ +@target=$(SSLV2CONFTEST) $(BUILD_CMD)
@@ -326,7 +356,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
326 356
327 #$(AESTEST).o: $(AESTEST).c 357 #$(AESTEST).o: $(AESTEST).c
328 # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c 358 # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
329@@ -580,6 +580,6 @@ 359@@ -589,7 +589,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO)
330 # fi 360 # fi
331 361
332 dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) 362 dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
@@ -334,4 +364,7 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
334+ +@target=dummytest; $(BUILD_CMD) 364+ +@target=dummytest; $(BUILD_CMD)
335 365
336 # DO NOT DELETE THIS LINE -- make depend depends on it. 366 # DO NOT DELETE THIS LINE -- make depend depends on it.
337 \ No newline at end of file 367
368--
3692.15.1
370
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest-deps.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/ptest-deps.patch
index ef6d17934d..ef6d17934d 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest-deps.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/ptest-deps.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest_makefile_deps.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/ptest_makefile_deps.patch
index 4202e61d1e..4202e61d1e 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest_makefile_deps.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/ptest_makefile_deps.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/run-ptest b/meta/recipes-connectivity/openssl/openssl-1.0.2n/run-ptest
index 3b20fce1ee..3b20fce1ee 100755
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/run-ptest
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/run-ptest
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2m/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/shared-libs.patch
index a7ca0a3078..a7ca0a3078 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2m/shared-libs.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/shared-libs.patch
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2m.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2m.bb
deleted file mode 100644
index 9270f52bc6..0000000000
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2m.bb
+++ /dev/null
@@ -1,61 +0,0 @@
1require openssl10.inc
2
3# For target side versions of openssl enable support for OCF Linux driver
4# if they are available.
5
6CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
7CFLAG_append_class-native = " -fPIC"
8
9LIC_FILES_CHKSUM = "file://LICENSE;md5=057d9218c6180e1d9ee407572b2dd225"
10
11export DIRS = "crypto ssl apps engines"
12export OE_LDFLAGS="${LDFLAGS}"
13
14SRC_URI += "file://find.pl;subdir=openssl-${PV}/util/ \
15 file://run-ptest \
16 file://openssl-c_rehash.sh \
17 file://configure-targets.patch \
18 file://shared-libs.patch \
19 file://oe-ldflags.patch \
20 file://engines-install-in-libdir-ssl.patch \
21 file://debian1.0.2/block_diginotar.patch \
22 file://debian1.0.2/block_digicert_malaysia.patch \
23 file://debian/ca.patch \
24 file://debian/c_rehash-compat.patch \
25 file://debian/debian-targets.patch \
26 file://debian/man-dir.patch \
27 file://debian/man-section.patch \
28 file://debian/no-rpath.patch \
29 file://debian/no-symbolic.patch \
30 file://debian/pic.patch \
31 file://debian1.0.2/version-script.patch \
32 file://debian1.0.2/soname.patch \
33 file://openssl_fix_for_x32.patch \
34 file://openssl-fix-des.pod-error.patch \
35 file://Makefiles-ptest.patch \
36 file://ptest-deps.patch \
37 file://openssl-1.0.2a-x32-asm.patch \
38 file://ptest_makefile_deps.patch \
39 file://configure-musl-target.patch \
40 file://parallel.patch \
41 file://openssl-util-perlpath.pl-cwd.patch \
42 file://Use-SHA256-not-MD5-as-default-digest.patch \
43 file://0001-Fix-build-with-clang-using-external-assembler.patch \
44 file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \
45 file://0001-aes-armv4-bsaes-armv7-sha256-armv4-.pl-make-it-work-.patch \
46 "
47SRC_URI[md5sum] = "10e9e37f492094b9ef296f68f24a7666"
48SRC_URI[sha256sum] = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f"
49
50PACKAGES =+ "${PN}-engines"
51FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
52
53# The crypto_use_bigint patch means that perl's bignum module needs to be
54# installed, but some distributions (for example Fedora 23) don't ship it by
55# default. As the resulting error is very misleading check for bignum before
56# building.
57do_configure_prepend() {
58 if ! perl -Mbigint -e true; then
59 bbfatal "The perl module 'bignum' was not found but this is required to build openssl. Please install this module (often packaged as perl-bignum) and re-run bitbake."
60 fi
61}
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2n.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2n.bb
new file mode 100644
index 0000000000..32444c6092
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2n.bb
@@ -0,0 +1,60 @@
1require openssl10.inc
2
3# For target side versions of openssl enable support for OCF Linux driver
4# if they are available.
5
6CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
7CFLAG_append_class-native = " -fPIC"
8
9LIC_FILES_CHKSUM = "file://LICENSE;md5=057d9218c6180e1d9ee407572b2dd225"
10
11export DIRS = "crypto ssl apps engines"
12export OE_LDFLAGS="${LDFLAGS}"
13
14SRC_URI += "file://find.pl;subdir=openssl-${PV}/util/ \
15 file://run-ptest \
16 file://openssl-c_rehash.sh \
17 file://configure-targets.patch \
18 file://shared-libs.patch \
19 file://oe-ldflags.patch \
20 file://engines-install-in-libdir-ssl.patch \
21 file://debian1.0.2/block_diginotar.patch \
22 file://debian1.0.2/block_digicert_malaysia.patch \
23 file://debian/ca.patch \
24 file://debian/c_rehash-compat.patch \
25 file://debian/debian-targets.patch \
26 file://debian/man-dir.patch \
27 file://debian/man-section.patch \
28 file://debian/no-rpath.patch \
29 file://debian/no-symbolic.patch \
30 file://debian/pic.patch \
31 file://debian1.0.2/version-script.patch \
32 file://debian1.0.2/soname.patch \
33 file://openssl_fix_for_x32.patch \
34 file://openssl-fix-des.pod-error.patch \
35 file://Makefiles-ptest.patch \
36 file://ptest-deps.patch \
37 file://openssl-1.0.2a-x32-asm.patch \
38 file://ptest_makefile_deps.patch \
39 file://configure-musl-target.patch \
40 file://parallel.patch \
41 file://openssl-util-perlpath.pl-cwd.patch \
42 file://Use-SHA256-not-MD5-as-default-digest.patch \
43 file://0001-Fix-build-with-clang-using-external-assembler.patch \
44 file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \
45 "
46SRC_URI[md5sum] = "13bdc1b1d1ff39b6fd42a255e74676a4"
47SRC_URI[sha256sum] = "370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe"
48
49PACKAGES =+ "${PN}-engines"
50FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
51
52# The crypto_use_bigint patch means that perl's bignum module needs to be
53# installed, but some distributions (for example Fedora 23) don't ship it by
54# default. As the resulting error is very misleading check for bignum before
55# building.
56do_configure_prepend() {
57 if ! perl -Mbigint -e true; then
58 bbfatal "The perl module 'bignum' was not found but this is required to build openssl. Please install this module (often packaged as perl-bignum) and re-run bitbake."
59 fi
60}