diff options
author | Ross Burton <ross@burtonini.com> | 2021-11-02 16:57:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-03 10:12:42 +0000 |
commit | bc18edd076a929f19a11e22407e4a283e90263a5 (patch) | |
tree | a4011f08a48dcdecd15e672f8e4cac24ecfefe60 /meta/recipes-connectivity | |
parent | 4f0400c3e5de50788c0b6250f587f459afcaed6d (diff) | |
download | poky-bc18edd076a929f19a11e22407e4a283e90263a5.tar.gz |
openssl: fix builds on ARMv8 targets without Aarch64
ARMv8 doesn't imply Aarch64, so correct a check that was making that
assumption. This fixes the build on 32-bit ARMv8 targets such as
Cortex-A32.
(From OE-Core rev: 78ae8b02bfbf0d98ae481682179439845d30c797)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/armv8-32bit.patch | 29 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_3.0.0.bb | 1 |
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 @@ | |||
1 | Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/16951] | ||
2 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
3 | |||
4 | From 5118e96a3dbedde2523e7726fa34af30923a9add Mon Sep 17 00:00:00 2001 | ||
5 | From: Tom Cosgrove <tom.cosgrove@arm.com> | ||
6 | Date: Tue, 2 Nov 2021 15:26:21 +0000 | ||
7 | Subject: [PATCH] Fix builds on Armv8 systems without AArch64 | ||
8 | |||
9 | This fixes "undefined reference to `aes_gcm_dec_128_kernel' in function | ||
10 | `armv8_aes_gcm_decrypt'" and similar | ||
11 | |||
12 | Fixes #16949 | ||
13 | --- | ||
14 | include/crypto/aes_platform.h | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h | ||
18 | index 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 | ||
17 | SRC_URI:append:class-nativesdk = " \ | 18 | SRC_URI:append:class-nativesdk = " \ |