summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-Link-libatomic-on-riscv32.patch35
-rw-r--r--meta/recipes-connectivity/openssl/openssl/fix_random_labels.patch22
2 files changed, 0 insertions, 57 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Link-libatomic-on-riscv32.patch b/meta/recipes-connectivity/openssl/openssl/0001-Link-libatomic-on-riscv32.patch
deleted file mode 100644
index 2c54d8f685..0000000000
--- a/meta/recipes-connectivity/openssl/openssl/0001-Link-libatomic-on-riscv32.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 73266b8573c71e6720453c4c5a9e6e8fa4daec65 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 21 Oct 2023 13:03:52 -0700
4Subject: [PATCH] Link libatomic on riscv32
5
6GCC toolchains on linux are not able to build libcrypto without linking
7to libatomic as it does not have all needed atomics implemented as
8intrinsics
9
10Fixes errors like
11
12| ld: ./libcrypto.so: undefined reference to `__atomic_is_lock_free'
13
14Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/22460]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 Configurations/10-main.conf | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
21index 46094f59c2..d1a15a1152 100644
22--- a/Configurations/10-main.conf
23+++ b/Configurations/10-main.conf
24@@ -816,7 +816,7 @@ my %targets = (
25 },
26
27 "linux32-riscv32" => {
28- inherit_from => [ "linux-generic32"],
29+ inherit_from => [ "linux-latomic" ],
30 perlasm_scheme => "linux32",
31 asm_arch => 'riscv32',
32 },
33--
342.42.0
35
diff --git a/meta/recipes-connectivity/openssl/openssl/fix_random_labels.patch b/meta/recipes-connectivity/openssl/openssl/fix_random_labels.patch
deleted file mode 100644
index 78dcd81685..0000000000
--- a/meta/recipes-connectivity/openssl/openssl/fix_random_labels.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1The perl script adds random suffixes to the local function names to ensure
2it doesn't clash with other parts of openssl. Set the random number seed
3to something predictable so the assembler files are generated consistently
4and our own reproducible builds tests pass.
5
6Upstream-Status: Pending
7Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
8
9Index: openssl-3.1.0/crypto/modes/asm/aes-gcm-avx512.pl
10===================================================================
11--- openssl-3.1.0.orig/crypto/modes/asm/aes-gcm-avx512.pl
12+++ openssl-3.1.0/crypto/modes/asm/aes-gcm-avx512.pl
13@@ -191,6 +191,9 @@ my $CTX_OFFSET_HTable = (16 * 6);
14 # ;;; Helper functions
15 # ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
16
17+# Ensure the local labels are reproduicble
18+srand(10000);
19+
20 # ; Generates "random" local labels
21 sub random_string() {
22 my @chars = ('a' .. 'z', 'A' .. 'Z', '0' .. '9', '_');