[PATCH v2 02/15] crypto: arm64/sha3 - Rename conflicting function
From: Eric Biggers <ebiggers@kernel.org>
Date: 2025-10-26 05:53:04
Also in:
linux-crypto, linux-s390, lkml
Subsystem:
arm64 port (aarch64 architecture), the rest · Maintainers:
Catalin Marinas, Will Deacon, Linus Torvalds
From: David Howells <dhowells@redhat.com>
Rename the arm64 sha3_update() function to have an "arm64_" prefix to
avoid a name conflict with the upcoming SHA-3 library.
Note: this code will be superseded later. This commit simply keeps the
kernel building for the initial introduction of the library.
Signed-off-by: David Howells <dhowells@redhat.com>
[EB: dropped unnecessary rename of sha3_finup(), and improved commit
message]
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
---
arch/arm64/crypto/sha3-ce-glue.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/crypto/sha3-ce-glue.c b/arch/arm64/crypto/sha3-ce-glue.c
index b4f1001046c9a..f5c8302349337 100644
--- a/arch/arm64/crypto/sha3-ce-glue.c
+++ b/arch/arm64/crypto/sha3-ce-glue.c@@ -29,12 +29,12 @@ MODULE_ALIAS_CRYPTO("sha3-384"); MODULE_ALIAS_CRYPTO("sha3-512"); asmlinkage int sha3_ce_transform(u64 *st, const u8 *data, int blocks, int md_len); -static int sha3_update(struct shash_desc *desc, const u8 *data, - unsigned int len) +static int arm64_sha3_update(struct shash_desc *desc, const u8 *data, + unsigned int len) { struct sha3_state *sctx = shash_desc_ctx(desc); struct crypto_shash *tfm = desc->tfm; unsigned int bs, ds; int blocks;
@@ -88,11 +88,11 @@ static int sha3_finup(struct shash_desc *desc, const u8 *src, unsigned int len, } static struct shash_alg algs[] = { { .digestsize = SHA3_224_DIGEST_SIZE, .init = crypto_sha3_init, - .update = sha3_update, + .update = arm64_sha3_update, .finup = sha3_finup, .descsize = SHA3_STATE_SIZE, .base.cra_name = "sha3-224", .base.cra_driver_name = "sha3-224-ce", .base.cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY,
@@ -100,11 +100,11 @@ static struct shash_alg algs[] = { { .base.cra_module = THIS_MODULE, .base.cra_priority = 200, }, { .digestsize = SHA3_256_DIGEST_SIZE, .init = crypto_sha3_init, - .update = sha3_update, + .update = arm64_sha3_update, .finup = sha3_finup, .descsize = SHA3_STATE_SIZE, .base.cra_name = "sha3-256", .base.cra_driver_name = "sha3-256-ce", .base.cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY,
@@ -112,11 +112,11 @@ static struct shash_alg algs[] = { { .base.cra_module = THIS_MODULE, .base.cra_priority = 200, }, { .digestsize = SHA3_384_DIGEST_SIZE, .init = crypto_sha3_init, - .update = sha3_update, + .update = arm64_sha3_update, .finup = sha3_finup, .descsize = SHA3_STATE_SIZE, .base.cra_name = "sha3-384", .base.cra_driver_name = "sha3-384-ce", .base.cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY,
@@ -124,11 +124,11 @@ static struct shash_alg algs[] = { { .base.cra_module = THIS_MODULE, .base.cra_priority = 200, }, { .digestsize = SHA3_512_DIGEST_SIZE, .init = crypto_sha3_init, - .update = sha3_update, + .update = arm64_sha3_update, .finup = sha3_finup, .descsize = SHA3_STATE_SIZE, .base.cra_name = "sha3-512", .base.cra_driver_name = "sha3-512-ce", .base.cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY,
--
2.51.1.dirty