TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: riscv/sha512 - Stop depending on sha512_generic_block_fn

Browse Source 
sha512_generic_block_fn() will no longer be available when the SHA-512
support in the old-school crypto API is changed to just wrap the SHA-512
library.  Replace the use of sha512_generic_block_fn() in
sha512-riscv64-glue.c with temporary code that uses the library's
__sha512_update().  This is just a temporary workaround to keep the
kernel building and functional at each commit; this code gets superseded
when the RISC-V optimized SHA-512 is migrated to lib/crypto/ anyway.

Acked-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20250630160320.2888-5-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
This commit is contained in:
Eric Biggers
2025-06-30 09:03:08 -07:00
parent 23e8b4371d
commit 485deceec0
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/riscv/crypto/Kconfig
+1
View File
@@ -31,6 +31,7 @@ config CRYPTO_GHASH_RISCV64
config CRYPTO_SHA512_RISCV64
tristate "Hash functions: SHA-384 and SHA-512"
depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO
select CRYPTO_LIB_SHA512
select CRYPTO_SHA512
help
SHA-384 and SHA-512 secure hash algorithm (FIPS 180)
arch/riscv/crypto/sha512-riscv64-glue.c
+7 -1
View File
@@ -38,7 +38,13 @@ static void sha512_block(struct sha512_state *state, const u8 *data,
sha512_transform_zvknhb_zvkb(state, data, num_blocks);
kernel_vector_end();
} else {
sha512_generic_block_fn(state, data, num_blocks);
struct __sha512_ctx ctx = {};
static_assert(sizeof(ctx.state) == sizeof(state->state));
memcpy(&ctx.state, state->state, sizeof(ctx.state));
__sha512_update(&ctx, data,
(size_t)num_blocks * SHA512_BLOCK_SIZE);
memcpy(state->state, &ctx.state, sizeof(state->state));
}
}