summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch49
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch88
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.0h.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.1.0g.bb)10
3 files changed, 4 insertions, 143 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch b/meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch
deleted file mode 100644
index 736bb39acd..0000000000
--- a/meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 3fdb1e2a16ea405c6731447a8994f222808ef7e6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 7 Apr 2017 18:01:52 +0300
4Subject: [PATCH] Remove test that requires running as non-root
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 test/recipes/40-test_rehash.t | 17 +----------------
10 1 file changed, 1 insertion(+), 16 deletions(-)
11
12diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t
13index f902c23..c7567c1 100644
14--- a/test/recipes/40-test_rehash.t
15+++ b/test/recipes/40-test_rehash.t
16@@ -23,7 +23,7 @@ setup("test_rehash");
17 plan skip_all => "test_rehash is not available on this platform"
18 unless run(app(["openssl", "rehash", "-help"]));
19
20-plan tests => 5;
21+plan tests => 3;
22
23 indir "rehash.$$" => sub {
24 prepare();
25@@ -42,21 +42,6 @@ indir "rehash.$$" => sub {
26 'Testing rehash operations on empty directory');
27 }, create => 1, cleanup => 1;
28
29-indir "rehash.$$" => sub {
30- prepare();
31- chmod 0500, curdir();
32- SKIP: {
33- if (!ok(!open(FOO, ">unwritable.txt"),
34- "Testing that we aren't running as a privileged user, such as root")) {
35- close FOO;
36- skip "It's pointless to run the next test as root", 1;
37- }
38- isnt(run(app(["openssl", "rehash", curdir()])), 1,
39- 'Testing rehash operations on readonly directory');
40- }
41- chmod 0700, curdir(); # make it writable again, so cleanup works
42-}, create => 1, cleanup => 1;
43-
44 sub prepare {
45 my @pemsourcefiles = sort glob(srctop_file('test', "*.pem"));
46 my @destfiles = ();
47--
482.11.0
49
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch b/meta/recipes-connectivity/openssl/openssl/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch
deleted file mode 100644
index bb0a1689ed..0000000000
--- a/meta/recipes-connectivity/openssl/openssl/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch
+++ /dev/null
@@ -1,88 +0,0 @@
1From bcc096a50811bf0f0c4fd34b2993fed7a7015972 Mon Sep 17 00:00:00 2001
2From: Andy Polyakov <appro@openssl.org>
3Date: Fri, 3 Nov 2017 23:30:01 +0100
4Subject: [PATCH] aes/asm/{aes-armv4|bsaes-armv7}.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: Tim Hudson <tjh@openssl.org>
14Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
15Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
16(Merged from https://github.com/openssl/openssl/pull/4669)
17
18(cherry picked from commit b82acc3c1a7f304c9df31841753a0fa76b5b3cda)
19---
20 crypto/aes/asm/aes-armv4.pl | 6 +++---
21 crypto/aes/asm/bsaes-armv7.pl | 6 +++---
22 2 files changed, 6 insertions(+), 6 deletions(-)
23
24diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl
25index 16d79aae53..c6474b8aad 100644
26--- a/crypto/aes/asm/aes-armv4.pl
27+++ b/crypto/aes/asm/aes-armv4.pl
28@@ -200,7 +200,7 @@ AES_encrypt:
29 #ifndef __thumb2__
30 sub r3,pc,#8 @ AES_encrypt
31 #else
32- adr r3,AES_encrypt
33+ adr r3,.
34 #endif
35 stmdb sp!,{r1,r4-r12,lr}
36 #ifdef __APPLE__
37@@ -450,7 +450,7 @@ _armv4_AES_set_encrypt_key:
38 #ifndef __thumb2__
39 sub r3,pc,#8 @ AES_set_encrypt_key
40 #else
41- adr r3,AES_set_encrypt_key
42+ adr r3,.
43 #endif
44 teq r0,#0
45 #ifdef __thumb2__
46@@ -976,7 +976,7 @@ AES_decrypt:
47 #ifndef __thumb2__
48 sub r3,pc,#8 @ AES_decrypt
49 #else
50- adr r3,AES_decrypt
51+ adr r3,.
52 #endif
53 stmdb sp!,{r1,r4-r12,lr}
54 #ifdef __APPLE__
55diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl
56index 9f288660ef..a27bb4a179 100644
57--- a/crypto/aes/asm/bsaes-armv7.pl
58+++ b/crypto/aes/asm/bsaes-armv7.pl
59@@ -744,7 +744,7 @@ $code.=<<___;
60 .type _bsaes_decrypt8,%function
61 .align 4
62 _bsaes_decrypt8:
63- adr $const,_bsaes_decrypt8
64+ adr $const,.
65 vldmia $key!, {@XMM[9]} @ round 0 key
66 #ifdef __APPLE__
67 adr $const,.LM0ISR
68@@ -843,7 +843,7 @@ _bsaes_const:
69 .type _bsaes_encrypt8,%function
70 .align 4
71 _bsaes_encrypt8:
72- adr $const,_bsaes_encrypt8
73+ adr $const,.
74 vldmia $key!, {@XMM[9]} @ round 0 key
75 #ifdef __APPLE__
76 adr $const,.LM0SR
77@@ -951,7 +951,7 @@ $code.=<<___;
78 .type _bsaes_key_convert,%function
79 .align 4
80 _bsaes_key_convert:
81- adr $const,_bsaes_key_convert
82+ adr $const,.
83 vld1.8 {@XMM[7]}, [$inp]! @ load round 0 key
84 #ifdef __APPLE__
85 adr $const,.LM0
86--
872.15.0
88
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0g.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index 0fd6819fff..94b75eb92a 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0g.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
@@ -6,20 +6,18 @@ SECTION = "libs/network"
6 6
7# "openssl | SSLeay" dual license 7# "openssl | SSLeay" dual license
8LICENSE = "openssl" 8LICENSE = "openssl"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=cae6da10f4ffd9703214776d2aabce32" 9LIC_FILES_CHKSUM = "file://LICENSE;md5=d57d511030c9d66ef5f5966bee5a7eff"
10 10
11BBCLASSEXTEND = "native nativesdk" 11BBCLASSEXTEND = "native nativesdk"
12 12
13SRC_URI[md5sum] = "ba5f1b8b835b88cadbce9b35ed9531a6" 13SRC_URI[md5sum] = "5271477e4d93f4ea032b665ef095ff24"
14SRC_URI[sha256sum] = "de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af" 14SRC_URI[sha256sum] = "5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517"
15 15
16SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ 16SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
17 file://run-ptest \ 17 file://run-ptest \
18 file://openssl-c_rehash.sh \ 18 file://openssl-c_rehash.sh \
19 file://0001-Take-linking-flags-from-LDFLAGS-env-var.patch \ 19 file://0001-Take-linking-flags-from-LDFLAGS-env-var.patch \
20 file://0001-Remove-test-that-requires-running-as-non-root.patch \ 20 "
21 file://0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch \
22 "
23 21
24S = "${WORKDIR}/openssl-${PV}" 22S = "${WORKDIR}/openssl-${PV}"
25 23
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 07:31:59 +0000