* [PATCH v3 1/8] s390/sha3: Rename conflicting functions [not found] <20250926141959.1272455-1-dhowells@redhat.com> @ 2025-09-26 14:19 ` David Howells 2025-09-29 11:39 ` Harald Freudenberger 0 siblings, 1 reply; 2+ messages in thread From: David Howells @ 2025-09-26 14:19 UTC (permalink / raw) Cc: David Howells, Eric Biggers, Jason A . Donenfeld, Ard Biesheuvel, Herbert Xu, Stephan Mueller, linux-crypto, linux-kernel, Harald Freudenberger, Holger Dengler, linux-s390 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 = { ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3 1/8] s390/sha3: Rename conflicting functions 2025-09-26 14:19 ` [PATCH v3 1/8] s390/sha3: Rename conflicting functions David Howells @ 2025-09-29 11:39 ` Harald Freudenberger 0 siblings, 0 replies; 2+ messages in thread From: Harald Freudenberger @ 2025-09-29 11:39 UTC (permalink / raw) To: David Howells Cc: Eric Biggers, Jason A . Donenfeld, Ard Biesheuvel, Herbert Xu, Stephan Mueller, linux-crypto, linux-kernel, Holger Dengler, linux-s390 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> ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-09-29 11:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20250926141959.1272455-1-dhowells@redhat.com>
2025-09-26 14:19 ` [PATCH v3 1/8] s390/sha3: Rename conflicting functions David Howells
2025-09-29 11:39 ` Harald Freudenberger
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).