From: Eric Biggers Date: Sun, 9 Nov 2025 23:47:16 +0000 (-0800) Subject: crypto: polyval - Rename conflicting functions X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1c360849794c2e638cff5486e4ee256568dd3b3;p=thirdparty%2Flinux.git crypto: polyval - Rename conflicting functions Rename polyval_init() and polyval_update(), in preparation for adding library functions with the same name to . Note that polyval-generic.c will be removed later, as it will be superseded by the library. This commit just keeps the kernel building for the initial introduction of the library. Reviewed-by: Ard Biesheuvel Link: https://lore.kernel.org/r/20251109234726.638437-2-ebiggers@kernel.org Signed-off-by: Eric Biggers --- diff --git a/crypto/polyval-generic.c b/crypto/polyval-generic.c index db8adb56e4cac..fe5b01a4000d1 100644 --- a/crypto/polyval-generic.c +++ b/crypto/polyval-generic.c @@ -99,7 +99,7 @@ static int polyval_setkey(struct crypto_shash *tfm, return 0; } -static int polyval_init(struct shash_desc *desc) +static int polyval_generic_init(struct shash_desc *desc) { struct polyval_desc_ctx *dctx = shash_desc_ctx(desc); @@ -108,8 +108,8 @@ static int polyval_init(struct shash_desc *desc) return 0; } -static int polyval_update(struct shash_desc *desc, - const u8 *src, unsigned int srclen) +static int polyval_generic_update(struct shash_desc *desc, + const u8 *src, unsigned int srclen) { struct polyval_desc_ctx *dctx = shash_desc_ctx(desc); const struct polyval_tfm_ctx *ctx = crypto_shash_ctx(desc->tfm); @@ -135,7 +135,7 @@ static int polyval_finup(struct shash_desc *desc, const u8 *src, u8 tmp[POLYVAL_BLOCK_SIZE] = {}; memcpy(tmp, src, len); - polyval_update(desc, tmp, POLYVAL_BLOCK_SIZE); + polyval_generic_update(desc, tmp, POLYVAL_BLOCK_SIZE); } copy_and_reverse(dst, dctx->buffer); return 0; @@ -166,8 +166,8 @@ static void polyval_exit_tfm(struct crypto_shash *tfm) static struct shash_alg polyval_alg = { .digestsize = POLYVAL_DIGEST_SIZE, - .init = polyval_init, - .update = polyval_update, + .init = polyval_generic_init, + .update = polyval_generic_update, .finup = polyval_finup, .setkey = polyval_setkey, .export = polyval_export,