From nobody Wed Oct 1 21:19:37 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFF042EC566 for ; Wed, 1 Oct 2025 13:09:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759324151; cv=none; b=lgWI5c55FCYDGbsHQFOJYdM+7YoTEK9/QxC+7uNwEvbeAub8uk7e+NQERreAL+ZetMuwPCydKfbTTO//I1essUrjEoAdeyiJFTjokP2uxcKVl4k7vHoymVRzwlbOADqUQdlJ3N3VlRAbN/e4ftXO+qDETUaWQQwXOZTBe5bcYUU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759324151; c=relaxed/simple; bh=NZEIOIblbdawTCrxGt/Ero7Fwtqw3BTyIDWtF6I6nvk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eG6TPdNhiIksObYHk2j+yP2d+TNF6IXjsijjk0N9uwWgshdOPdrDSr2xjABfTaoH5vMFnlCh3oklftKEbB1BkG3a6hbnSzI3m7xX3WW1u5SJRN8YtOguNQtbGd1RwIFeU1faoaJYYjf1w81EcLYKk03Hn7ZjW3b1FHVa77TZaVU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=DuNSMeXl; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DuNSMeXl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1759324148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gS6I9+pn+T6EshQ8kERlfqfUoiq0QQuAAxssnEC3ucQ=; b=DuNSMeXlj0leyPZsWi0/FkZDG0VukbFoj5i+thZ9j8zYRYkuyuQlUVOFU/6HzDgDn7kxtU oGk18XNYMk8FTVafKZ9sV4C9kKMYatYNRfljxeTOi5kGofoUorTGWcw3bDX3NMFRWTjGlv eqdWMEycEg+v5Pih0xabosSjKW2sPhg= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-354-9ISZppLGP6KdkYM6WRj1Ow-1; Wed, 01 Oct 2025 09:09:05 -0400 X-MC-Unique: 9ISZppLGP6KdkYM6WRj1Ow-1 X-Mimecast-MFC-AGG-ID: 9ISZppLGP6KdkYM6WRj1Ow_1759324143 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F16D118002C4; Wed, 1 Oct 2025 13:09:02 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.24]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7B7C9195608E; Wed, 1 Oct 2025 13:08:59 +0000 (UTC) From: David Howells To: Eric Biggers Cc: David Howells , "Jason A . Donenfeld" , Ard Biesheuvel , Herbert Xu , Stephan Mueller , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 2/5] arm64/sha3: Rename conflicting functions Date: Wed, 1 Oct 2025 14:08:41 +0100 Message-ID: <20251001130846.2284946-3-dhowells@redhat.com> In-Reply-To: <20251001130846.2284946-1-dhowells@redhat.com> References: <20251001130846.2284946-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" Rename the arm64 sha3_* functions to have an "arm64_" prefix to avoid conflict with generic code. Signed-off-by: David Howells cc: Eric Biggers cc: Jason A. Donenfeld cc: Ard Biesheuvel cc: Catalin Marinas cc: Will Deacon cc: Herbert Xu cc: Stephan Mueller cc: linux-crypto@vger.kernel.org cc: linux-arm-kernel@lists.infradead.org --- arch/arm64/crypto/sha3-ce-glue.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm64/crypto/sha3-ce-glue.c b/arch/arm64/crypto/sha3-ce-g= lue.c index b4f1001046c9..426d8044535a 100644 --- a/arch/arm64/crypto/sha3-ce-glue.c +++ b/arch/arm64/crypto/sha3-ce-glue.c @@ -31,7 +31,7 @@ MODULE_ALIAS_CRYPTO("sha3-512"); asmlinkage int sha3_ce_transform(u64 *st, const u8 *data, int blocks, int md_len); =20 -static int sha3_update(struct shash_desc *desc, const u8 *data, +static int arm64_sha3_update(struct shash_desc *desc, const u8 *data, unsigned int len) { struct sha3_state *sctx =3D shash_desc_ctx(desc); @@ -55,8 +55,8 @@ static int sha3_update(struct shash_desc *desc, const u8 = *data, return len; } =20 -static int sha3_finup(struct shash_desc *desc, const u8 *src, unsigned int= len, - u8 *out) +static int arm64_sha3_finup(struct shash_desc *desc, const u8 *src, unsign= ed int len, + u8 *out) { struct sha3_state *sctx =3D shash_desc_ctx(desc); struct crypto_shash *tfm =3D desc->tfm; @@ -90,8 +90,8 @@ static int sha3_finup(struct shash_desc *desc, const u8 *= src, unsigned int len, static struct shash_alg algs[] =3D { { .digestsize =3D SHA3_224_DIGEST_SIZE, .init =3D crypto_sha3_init, - .update =3D sha3_update, - .finup =3D sha3_finup, + .update =3D arm64_sha3_update, + .finup =3D arm64_sha3_finup, .descsize =3D SHA3_STATE_SIZE, .base.cra_name =3D "sha3-224", .base.cra_driver_name =3D "sha3-224-ce", @@ -102,8 +102,8 @@ static struct shash_alg algs[] =3D { { }, { .digestsize =3D SHA3_256_DIGEST_SIZE, .init =3D crypto_sha3_init, - .update =3D sha3_update, - .finup =3D sha3_finup, + .update =3D arm64_sha3_update, + .finup =3D arm64_sha3_finup, .descsize =3D SHA3_STATE_SIZE, .base.cra_name =3D "sha3-256", .base.cra_driver_name =3D "sha3-256-ce", @@ -114,8 +114,8 @@ static struct shash_alg algs[] =3D { { }, { .digestsize =3D SHA3_384_DIGEST_SIZE, .init =3D crypto_sha3_init, - .update =3D sha3_update, - .finup =3D sha3_finup, + .update =3D arm64_sha3_update, + .finup =3D arm64_sha3_finup, .descsize =3D SHA3_STATE_SIZE, .base.cra_name =3D "sha3-384", .base.cra_driver_name =3D "sha3-384-ce", @@ -126,8 +126,8 @@ static struct shash_alg algs[] =3D { { }, { .digestsize =3D SHA3_512_DIGEST_SIZE, .init =3D crypto_sha3_init, - .update =3D sha3_update, - .finup =3D sha3_finup, + .update =3D arm64_sha3_update, + .finup =3D arm64_sha3_finup, .descsize =3D SHA3_STATE_SIZE, .base.cra_name =3D "sha3-512", .base.cra_driver_name =3D "sha3-512-ce",