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>
This commit is contained in:
Khem Raj
2024-01-18 14:59:17 -08:00
committed by Richard Purdie
parent 09b69a69f5
commit 101580d72f
2 changed files with 32 additions and 0 deletions

View File

@@ -0,0 +1,31 @@
From b51031b05f72923ff1cf3b6a4767450dee89d7f4 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.
CLA: trivial
Upstream-Status: Backport [https://github.com/openssl/openssl/pull/23139]
Signed-off-by: Khem Raj <raj.khem@gmail.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 564d6d6..4cf1361 100644
--- a/providers/implementations/ciphers/cipher_aes_xts_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c
@@ -225,7 +225,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

View File

@@ -13,6 +13,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
file://0001-Configure-do-not-tweak-mips-cflags.patch \
file://0001-Added-handshake-history-reporting-when-test-fails.patch \
file://aarch64-bti.patch \
file://0001-riscv-Fix-mispelling-of-extension-test-macro.patch \
"
SRC_URI:append:class-nativesdk = " \