tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

crypto: arm64/sha3 - Rename conflicting function

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.

[EB: dropped unnecessary rename of sha3_finup(), and improved commit
message]

Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20251026055032.1413733-3-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>

authored by

David Howells and committed by
Eric Biggers 41412119 863ee5a3

+6 -6
+6 -6
arch/arm64/crypto/sha3-ce-glue.c
··· 31 31 asmlinkage int sha3_ce_transform(u64 *st, const u8 *data, int blocks, 32 32 int md_len); 33 33 34 - static int sha3_update(struct shash_desc *desc, const u8 *data, 35 - unsigned int len) 34 + static int arm64_sha3_update(struct shash_desc *desc, const u8 *data, 35 + unsigned int len) 36 36 { 37 37 struct sha3_state *sctx = shash_desc_ctx(desc); 38 38 struct crypto_shash *tfm = desc->tfm; ··· 90 90 static struct shash_alg algs[] = { { 91 91 .digestsize = SHA3_224_DIGEST_SIZE, 92 92 .init = crypto_sha3_init, 93 - .update = sha3_update, 93 + .update = arm64_sha3_update, 94 94 .finup = sha3_finup, 95 95 .descsize = SHA3_STATE_SIZE, 96 96 .base.cra_name = "sha3-224", ··· 102 102 }, { 103 103 .digestsize = SHA3_256_DIGEST_SIZE, 104 104 .init = crypto_sha3_init, 105 - .update = sha3_update, 105 + .update = arm64_sha3_update, 106 106 .finup = sha3_finup, 107 107 .descsize = SHA3_STATE_SIZE, 108 108 .base.cra_name = "sha3-256", ··· 114 114 }, { 115 115 .digestsize = SHA3_384_DIGEST_SIZE, 116 116 .init = crypto_sha3_init, 117 - .update = sha3_update, 117 + .update = arm64_sha3_update, 118 118 .finup = sha3_finup, 119 119 .descsize = SHA3_STATE_SIZE, 120 120 .base.cra_name = "sha3-384", ··· 126 126 }, { 127 127 .digestsize = SHA3_512_DIGEST_SIZE, 128 128 .init = crypto_sha3_init, 129 - .update = sha3_update, 129 + .update = arm64_sha3_update, 130 130 .finup = sha3_finup, 131 131 .descsize = SHA3_STATE_SIZE, 132 132 .base.cra_name = "sha3-512",