Commit 4d21e594 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: s390/sha1 - prefix the "sha1_" functions 



Prefix the s390 SHA-1 functions with "s390_sha1_" rather than "sha1_".
This allows us to rename the library function sha_init() to sha1_init()
without causing a naming collision.

Cc: linux-s390@vger.kernel.org
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 23dc2a0d

arch/s390/crypto/sha1_s390.c

+6 −6
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


#include "sha.h"



static int sha1_init(struct shash_desc *desc)

static int s390_sha1_init(struct shash_desc *desc)

{

	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
@@ -42,7 +42,7 @@ static int sha1_init(struct shash_desc *desc) 
	return 0;

}



static int sha1_export(struct shash_desc *desc, void *out)

static int s390_sha1_export(struct shash_desc *desc, void *out)

{

	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);

	struct sha1_state *octx = out;
@@ -53,7 +53,7 @@ static int sha1_export(struct shash_desc *desc, void *out) 
	return 0;

}



static int sha1_import(struct shash_desc *desc, const void *in)

static int s390_sha1_import(struct shash_desc *desc, const void *in)

{

	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);

	const struct sha1_state *ictx = in;
@@ -67,11 +67,11 @@ static int sha1_import(struct shash_desc *desc, const void *in) 


static struct shash_alg alg = {

	.digestsize	=	SHA1_DIGEST_SIZE,

	.init		=	sha1_init,

	.init		=	s390_sha1_init,

	.update		=	s390_sha_update,

	.final		=	s390_sha_final,

	.export		=	sha1_export,

	.import		=	sha1_import,

	.export		=	s390_sha1_export,

	.import		=	s390_sha1_import,

	.descsize	=	sizeof(struct s390_sha_ctx),

	.statesize	=	sizeof(struct sha1_state),

	.base		=	{

CRA Git | Maintained and supported by SUSTech CRA and CCSE