Adds BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH for riscv32 and riscv64. Otherwise, riscv targets fall back to the linux-generic libopenssl configs. This exacerbates the issue partially addressed in openssl/openssl#22871 which causes build failures. Fixes a mispelling in upstream causing 0builds for riscv32 to fail when linking. Signed-off-by: Grant Nichol <me@grantnichol.com> [yann.morin.1998@free.fr: squash the two commits together] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
31 lines
1.4 KiB
Diff
31 lines
1.4 KiB
Diff
From 68c549df05892c16b99603b9a831c79c540f268c Mon Sep 17 00:00:00 2001
|
|
From: Grant Nichol <me@grantnichol.com>
|
|
Date: Fri, 22 Dec 2023 23:46:39 -0600
|
|
Subject: [PATCH] riscv: Fix mispelling of extension test macro
|
|
|
|
When refactoring the riscv extension test macros,
|
|
RISCV_HAS_ZKND_AND_ZKNE was mispelled.
|
|
|
|
Upstream: https://github.com/openssl/openssl/pull/23139
|
|
Signed-off-by: Grant Nichol <me@grantnichol.com>
|
|
---
|
|
providers/implementations/ciphers/cipher_aes_xts_hw.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c
|
|
index b35b71020e..65adc47d1f 100644
|
|
--- a/providers/implementations/ciphers/cipher_aes_xts_hw.c
|
|
+++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c
|
|
@@ -285,7 +285,7 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = { \
|
|
# define PROV_CIPHER_HW_select_xts() \
|
|
if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE()) \
|
|
return &aes_xts_rv32i_zbkb_zknd_zkne; \
|
|
-if (RISCV_HAS_ZKND_ZKNE()) \
|
|
+if (RISCV_HAS_ZKND_AND_ZKNE()) \
|
|
return &aes_xts_rv32i_zknd_zkne;
|
|
# else
|
|
/* The generic case */
|
|
--
|
|
2.43.0
|
|
|