diff options
author | Khem Raj <raj.khem@gmail.com> | 2024-01-18 14:59:17 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-19 12:21:22 +0000 |
commit | 101580d72fb63a43ea35cb016b54ea40dc3b67d2 (patch) | |
tree | b270ac48be6a75ba96262f769c705708e2ee5e04 /meta/recipes-connectivity/openssl | |
parent | 09b69a69f57c053f7f3d032e508ab38139e57b1f (diff) | |
download | poky-101580d72fb63a43ea35cb016b54ea40dc3b67d2.tar.gz |
openssl: Fix build on riscv
Backport a typo fix RISCV_HAS_ZKND_ZKNE -> RISCV_HAS_ZKND_AND_ZKNE
(From OE-Core rev: 2b2bf78c7250a23a476f168d3f1789496c1c27e9)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/0001-riscv-Fix-mispelling-of-extension-test-macro.patch | 31 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_3.2.0.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-riscv-Fix-mispelling-of-extension-test-macro.patch b/meta/recipes-connectivity/openssl/openssl/0001-riscv-Fix-mispelling-of-extension-test-macro.patch new file mode 100644 index 0000000000..1d217bd8e3 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-riscv-Fix-mispelling-of-extension-test-macro.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From b51031b05f72923ff1cf3b6a4767450dee89d7f4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Grant Nichol <me@grantnichol.com> | ||
3 | Date: Fri, 22 Dec 2023 23:46:39 -0600 | ||
4 | Subject: [PATCH] riscv: Fix mispelling of extension test macro | ||
5 | |||
6 | When refactoring the riscv extension test macros, | ||
7 | RISCV_HAS_ZKND_AND_ZKNE was mispelled. | ||
8 | |||
9 | CLA: trivial | ||
10 | Upstream-Status: Backport [https://github.com/openssl/openssl/pull/23139] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | providers/implementations/ciphers/cipher_aes_xts_hw.c | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c | ||
17 | index 564d6d6..4cf1361 100644 | ||
18 | --- a/providers/implementations/ciphers/cipher_aes_xts_hw.c | ||
19 | +++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c | ||
20 | @@ -225,7 +225,7 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = { \ | ||
21 | # define PROV_CIPHER_HW_select_xts() \ | ||
22 | if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE()) \ | ||
23 | return &aes_xts_rv32i_zbkb_zknd_zkne; \ | ||
24 | -if (RISCV_HAS_ZKND_ZKNE()) \ | ||
25 | +if (RISCV_HAS_ZKND_AND_ZKNE()) \ | ||
26 | return &aes_xts_rv32i_zknd_zkne; | ||
27 | # else | ||
28 | /* The generic case */ | ||
29 | -- | ||
30 | 2.43.0 | ||
31 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_3.2.0.bb b/meta/recipes-connectivity/openssl/openssl_3.2.0.bb index d041d2d214..cf08cdbaa0 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.2.0.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.2.0.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ | 13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ |
14 | file://0001-Added-handshake-history-reporting-when-test-fails.patch \ | 14 | file://0001-Added-handshake-history-reporting-when-test-fails.patch \ |
15 | file://aarch64-bti.patch \ | 15 | file://aarch64-bti.patch \ |
16 | file://0001-riscv-Fix-mispelling-of-extension-test-macro.patch \ | ||
16 | " | 17 | " |
17 | 18 | ||
18 | SRC_URI:append:class-nativesdk = " \ | 19 | SRC_URI:append:class-nativesdk = " \ |