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/armv8-32bit.patch29
-rw-r--r--meta/recipes-connectivity/openssl/openssl_3.0.0.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/armv8-32bit.patch b/meta/recipes-connectivity/openssl/openssl/armv8-32bit.patch
new file mode 100644
index 0000000000..1935651be0
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/armv8-32bit.patch
@@ -0,0 +1,29 @@
1Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/16951]
2Signed-off-by: Ross Burton <ross.burton@arm.com>
3
4From 5118e96a3dbedde2523e7726fa34af30923a9add Mon Sep 17 00:00:00 2001
5From: Tom Cosgrove <tom.cosgrove@arm.com>
6Date: Tue, 2 Nov 2021 15:26:21 +0000
7Subject: [PATCH] Fix builds on Armv8 systems without AArch64
8
9This fixes "undefined reference to `aes_gcm_dec_128_kernel' in function
10`armv8_aes_gcm_decrypt'" and similar
11
12Fixes #16949
13---
14 include/crypto/aes_platform.h | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h
18index 015c3bd4ab91..e95ad5aa5de6 100644
19--- a/include/crypto/aes_platform.h
20+++ b/include/crypto/aes_platform.h
21@@ -100,7 +100,7 @@ void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len,
22 # define AES_PMULL_CAPABLE ((OPENSSL_armcap_P & ARMV8_PMULL) && (OPENSSL_armcap_P & ARMV8_AES))
23 # define AES_GCM_ENC_BYTES 512
24 # define AES_GCM_DEC_BYTES 512
25-# if __ARM_MAX_ARCH__>=8
26+# if __ARM_MAX_ARCH__>=8 && defined(__aarch64__)
27 # define AES_gcm_encrypt armv8_aes_gcm_encrypt
28 # define AES_gcm_decrypt armv8_aes_gcm_decrypt
29 # define AES_GCM_ASM(gctx) ((gctx)->ctr==aes_v8_ctr32_encrypt_blocks && \
diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.0.bb b/meta/recipes-connectivity/openssl/openssl_3.0.0.bb
index 67343bedcc..8852a51ca8 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.0.0.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.0.0.bb
@@ -12,6 +12,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
12 file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ 12 file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
13 file://afalg.patch \ 13 file://afalg.patch \
14 file://0001-Configure-do-not-tweak-mips-cflags.patch \ 14 file://0001-Configure-do-not-tweak-mips-cflags.patch \
15 file://armv8-32bit.patch \
15 " 16 "
16 17
17SRC_URI:append:class-nativesdk = " \ 18SRC_URI:append:class-nativesdk = " \