From: Harald Freudenberger <freude@linux.ibm.com>
To: David Howells <dhowells@redhat.com>
Cc: Eric Biggers <ebiggers@kernel.org>,
"Jason A . Donenfeld" <Jason@zx2c4.com>,
Ard Biesheuvel <ardb@kernel.org>,
Herbert Xu <herbert@gondor.apana.org.au>,
Stephan Mueller <smueller@chronox.de>,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
Holger Dengler <dengler@linux.ibm.com>,
linux-s390@vger.kernel.org
Subject: Re: [PATCH v3 1/8] s390/sha3: Rename conflicting functions
Date: Mon, 29 Sep 2025 13:39:27 +0200 [thread overview]
Message-ID: <88913f4419f2f7cd29b57539c3726251@linux.ibm.com> (raw)
In-Reply-To: <20250926141959.1272455-2-dhowells@redhat.com>
On 2025-09-26 16:19, David Howells wrote:
> Rename the s390 sha3_* functions to have an "s390_" prefix to avoid
> conflict with generic code.
>
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Eric Biggers <ebiggers@kernel.org>
> cc: Jason A. Donenfeld <Jason@zx2c4.com>
> cc: Ard Biesheuvel <ardb@kernel.org>
> cc: Harald Freudenberger <freude@linux.ibm.com>
> cc: Holger Dengler <dengler@linux.ibm.com>
> cc: Herbert Xu <herbert@gondor.apana.org.au>
> cc: Stephan Mueller <smueller@chronox.de>
> cc: linux-crypto@vger.kernel.org
> cc: linux-s390@vger.kernel.org
> ---
> arch/s390/crypto/sha3_256_s390.c | 26 +++++++++++++-------------
> arch/s390/crypto/sha3_512_s390.c | 26 +++++++++++++-------------
> 2 files changed, 26 insertions(+), 26 deletions(-)
>
> diff --git a/arch/s390/crypto/sha3_256_s390.c
> b/arch/s390/crypto/sha3_256_s390.c
> index 03bb4f4bab70..fd5ecae60a57 100644
> --- a/arch/s390/crypto/sha3_256_s390.c
> +++ b/arch/s390/crypto/sha3_256_s390.c
> @@ -19,7 +19,7 @@
>
> #include "sha.h"
>
> -static int sha3_256_init(struct shash_desc *desc)
> +static int s390_sha3_256_init(struct shash_desc *desc)
> {
> struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
>
> @@ -32,7 +32,7 @@ static int sha3_256_init(struct shash_desc *desc)
> return 0;
> }
>
> -static int sha3_256_export(struct shash_desc *desc, void *out)
> +static int s390_sha3_256_export(struct shash_desc *desc, void *out)
> {
> struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
> union {
> @@ -50,7 +50,7 @@ static int sha3_256_export(struct shash_desc *desc,
> void *out)
> return 0;
> }
>
> -static int sha3_256_import(struct shash_desc *desc, const void *in)
> +static int s390_sha3_256_import(struct shash_desc *desc, const void
> *in)
> {
> struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
> union {
> @@ -68,22 +68,22 @@ static int sha3_256_import(struct shash_desc
> *desc, const void *in)
> return 0;
> }
>
> -static int sha3_224_import(struct shash_desc *desc, const void *in)
> +static int s390_sha3_224_import(struct shash_desc *desc, const void
> *in)
> {
> struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
>
> - sha3_256_import(desc, in);
> + s390_sha3_256_import(desc, in);
> sctx->func = CPACF_KIMD_SHA3_224;
> return 0;
> }
>
> static struct shash_alg sha3_256_alg = {
> .digestsize = SHA3_256_DIGEST_SIZE, /* = 32 */
> - .init = sha3_256_init,
> + .init = s390_sha3_256_init,
> .update = s390_sha_update_blocks,
> .finup = s390_sha_finup,
> - .export = sha3_256_export,
> - .import = sha3_256_import,
> + .export = s390_sha3_256_export,
> + .import = s390_sha3_256_import,
> .descsize = S390_SHA_CTX_SIZE,
> .statesize = SHA3_STATE_SIZE,
> .base = {
> @@ -96,22 +96,22 @@ static struct shash_alg sha3_256_alg = {
> }
> };
>
> -static int sha3_224_init(struct shash_desc *desc)
> +static int s390_sha3_224_init(struct shash_desc *desc)
> {
> struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
>
> - sha3_256_init(desc);
> + s390_sha3_256_init(desc);
> sctx->func = CPACF_KIMD_SHA3_224;
> return 0;
> }
>
> static struct shash_alg sha3_224_alg = {
> .digestsize = SHA3_224_DIGEST_SIZE,
> - .init = sha3_224_init,
> + .init = s390_sha3_224_init,
> .update = s390_sha_update_blocks,
> .finup = s390_sha_finup,
> - .export = sha3_256_export, /* same as for 256 */
> - .import = sha3_224_import, /* function code different! */
> + .export = s390_sha3_256_export, /* same as for 256 */
> + .import = s390_sha3_224_import, /* function code different! */
> .descsize = S390_SHA_CTX_SIZE,
> .statesize = SHA3_STATE_SIZE,
> .base = {
> diff --git a/arch/s390/crypto/sha3_512_s390.c
> b/arch/s390/crypto/sha3_512_s390.c
> index a5c9690eecb1..f4b52a3a0433 100644
> --- a/arch/s390/crypto/sha3_512_s390.c
> +++ b/arch/s390/crypto/sha3_512_s390.c
> @@ -18,7 +18,7 @@
>
> #include "sha.h"
>
> -static int sha3_512_init(struct shash_desc *desc)
> +static int s390_sha3_512_init(struct shash_desc *desc)
> {
> struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
>
> @@ -31,7 +31,7 @@ static int sha3_512_init(struct shash_desc *desc)
> return 0;
> }
>
> -static int sha3_512_export(struct shash_desc *desc, void *out)
> +static int s390_sha3_512_export(struct shash_desc *desc, void *out)
> {
> struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
> union {
> @@ -49,7 +49,7 @@ static int sha3_512_export(struct shash_desc *desc,
> void *out)
> return 0;
> }
>
> -static int sha3_512_import(struct shash_desc *desc, const void *in)
> +static int s390_sha3_512_import(struct shash_desc *desc, const void
> *in)
> {
> struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
> union {
> @@ -67,22 +67,22 @@ static int sha3_512_import(struct shash_desc
> *desc, const void *in)
> return 0;
> }
>
> -static int sha3_384_import(struct shash_desc *desc, const void *in)
> +static int s390_sha3_384_import(struct shash_desc *desc, const void
> *in)
> {
> struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
>
> - sha3_512_import(desc, in);
> + s390_sha3_512_import(desc, in);
> sctx->func = CPACF_KIMD_SHA3_384;
> return 0;
> }
>
> static struct shash_alg sha3_512_alg = {
> .digestsize = SHA3_512_DIGEST_SIZE,
> - .init = sha3_512_init,
> + .init = s390_sha3_512_init,
> .update = s390_sha_update_blocks,
> .finup = s390_sha_finup,
> - .export = sha3_512_export,
> - .import = sha3_512_import,
> + .export = s390_sha3_512_export,
> + .import = s390_sha3_512_import,
> .descsize = S390_SHA_CTX_SIZE,
> .statesize = SHA3_STATE_SIZE,
> .base = {
> @@ -97,22 +97,22 @@ static struct shash_alg sha3_512_alg = {
>
> MODULE_ALIAS_CRYPTO("sha3-512");
>
> -static int sha3_384_init(struct shash_desc *desc)
> +static int s390_sha3_384_init(struct shash_desc *desc)
> {
> struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
>
> - sha3_512_init(desc);
> + s390_sha3_512_init(desc);
> sctx->func = CPACF_KIMD_SHA3_384;
> return 0;
> }
>
> static struct shash_alg sha3_384_alg = {
> .digestsize = SHA3_384_DIGEST_SIZE,
> - .init = sha3_384_init,
> + .init = s390_sha3_384_init,
> .update = s390_sha_update_blocks,
> .finup = s390_sha_finup,
> - .export = sha3_512_export, /* same as for 512 */
> - .import = sha3_384_import, /* function code different! */
> + .export = s390_sha3_512_export, /* same as for 512 */
> + .import = s390_sha3_384_import, /* function code different! */
> .descsize = S390_SHA_CTX_SIZE,
> .statesize = SHA3_STATE_SIZE,
> .base = {
Acked-By: Harald Freudenberger <freude@linux.ibm.com>
next prev parent reply other threads:[~2025-09-29 11:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-26 14:19 [PATCH v3 0/8] crypto, lib/crypto: Add SHAKE128/256 support and move SHA3 to lib/crypto David Howells
2025-09-26 14:19 ` [PATCH v3 1/8] s390/sha3: Rename conflicting functions David Howells
2025-09-29 11:39 ` Harald Freudenberger [this message]
2025-09-26 14:19 ` [PATCH v3 2/8] arm64/sha3: " David Howells
2025-09-26 14:19 ` [PATCH v3 3/8] lib/crypto: Add SHA3-224, SHA3-256, SHA3-384, SHA-512, SHAKE128, SHAKE256 David Howells
2025-09-26 21:09 ` Eric Biggers
2025-09-26 14:19 ` [PATCH v3 4/8] lib/crypto: Move the SHA3 Iota transform into the single round function David Howells
2025-09-26 14:19 ` [PATCH v3 5/8] lib/crypto: Add SHA3 kunit tests David Howells
2025-10-01 16:04 ` Eric Biggers
2025-10-01 16:08 ` Eric Biggers
2025-10-02 13:05 ` David Howells
2025-10-02 16:07 ` Eric Biggers
2025-09-26 14:19 ` [PATCH v3 6/8] crypto/sha3: Use lib/crypto/sha3 David Howells
2025-09-26 21:25 ` Eric Biggers
2025-09-26 14:19 ` [PATCH v3 7/8] crypto/sha3: Add SHAKE128/256 support David Howells
2025-09-26 21:14 ` Eric Biggers
2025-10-01 13:02 ` David Howells
2025-10-01 15:25 ` Eric Biggers
2025-09-26 14:19 ` [PATCH v3 8/8] crypto: SHAKE tests David Howells
2025-09-26 19:59 ` [PATCH v3 0/8] crypto, lib/crypto: Add SHAKE128/256 support and move SHA3 to lib/crypto Eric Biggers
2025-10-01 15:28 ` Eric Biggers
2025-10-02 13:14 ` David Howells
2025-10-02 16:27 ` Eric Biggers
2025-10-11 0:26 ` Eric Biggers
2025-10-16 12:35 ` David Howells
2025-10-16 14:34 ` David Howells
2025-10-16 14:56 ` Stephan Mueller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=88913f4419f2f7cd29b57539c3726251@linux.ibm.com \
--to=freude@linux.ibm.com \
--cc=Jason@zx2c4.com \
--cc=ardb@kernel.org \
--cc=dengler@linux.ibm.com \
--cc=dhowells@redhat.com \
--cc=ebiggers@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=smueller@chronox.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.