Commit e0583b6a authored by Tianjia Zhang's avatar Tianjia Zhang Committed by Herbert Xu
Browse files

crypto: sparc/sha - remove duplicate hash init function 



sha*_base_init() series functions has implemented the initialization
of the hash context, this commit use sha*_base_init() function to
replace repeated implementations.

Signed-off-by: default avatarTianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 41ea0f6c

arch/sparc/crypto/sha1_glue.c

+2 −12
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/mm.h>

#include <linux/types.h>

#include <crypto/sha1.h>

#include <crypto/sha1_base.h>



#include <asm/pstate.h>

#include <asm/elf.h>
@@ -26,17 +27,6 @@ 
asmlinkage void sha1_sparc64_transform(u32 *digest, const char *data,

				       unsigned int rounds);



static int sha1_sparc64_init(struct shash_desc *desc)

{

	struct sha1_state *sctx = shash_desc_ctx(desc);



	*sctx = (struct sha1_state){

		.state = { SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 },

	};



	return 0;

}



static void __sha1_sparc64_update(struct sha1_state *sctx, const u8 *data,

				  unsigned int len, unsigned int partial)

{
@@ -128,7 +118,7 @@ static int sha1_sparc64_import(struct shash_desc *desc, const void *in) 


static struct shash_alg alg = {

	.digestsize	=	SHA1_DIGEST_SIZE,

	.init		=	sha1_sparc64_init,

	.init		=	sha1_base_init,

	.update		=	sha1_sparc64_update,

	.final		=	sha1_sparc64_final,

	.export		=	sha1_sparc64_export,

arch/sparc/crypto/sha256_glue.c

+3 −34
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/mm.h>

#include <linux/types.h>

#include <crypto/sha2.h>

#include <crypto/sha256_base.h>



#include <asm/pstate.h>

#include <asm/elf.h>
@@ -26,38 +27,6 @@ 
asmlinkage void sha256_sparc64_transform(u32 *digest, const char *data,

					 unsigned int rounds);



static int sha224_sparc64_init(struct shash_desc *desc)

{

	struct sha256_state *sctx = shash_desc_ctx(desc);

	sctx->state[0] = SHA224_H0;

	sctx->state[1] = SHA224_H1;

	sctx->state[2] = SHA224_H2;

	sctx->state[3] = SHA224_H3;

	sctx->state[4] = SHA224_H4;

	sctx->state[5] = SHA224_H5;

	sctx->state[6] = SHA224_H6;

	sctx->state[7] = SHA224_H7;

	sctx->count = 0;



	return 0;

}



static int sha256_sparc64_init(struct shash_desc *desc)

{

	struct sha256_state *sctx = shash_desc_ctx(desc);

	sctx->state[0] = SHA256_H0;

	sctx->state[1] = SHA256_H1;

	sctx->state[2] = SHA256_H2;

	sctx->state[3] = SHA256_H3;

	sctx->state[4] = SHA256_H4;

	sctx->state[5] = SHA256_H5;

	sctx->state[6] = SHA256_H6;

	sctx->state[7] = SHA256_H7;

	sctx->count = 0;



	return 0;

}



static void __sha256_sparc64_update(struct sha256_state *sctx, const u8 *data,

				    unsigned int len, unsigned int partial)

{
@@ -158,7 +127,7 @@ static int sha256_sparc64_import(struct shash_desc *desc, const void *in) 


static struct shash_alg sha256_alg = {

	.digestsize	=	SHA256_DIGEST_SIZE,

	.init		=	sha256_sparc64_init,

	.init		=	sha256_base_init,

	.update		=	sha256_sparc64_update,

	.final		=	sha256_sparc64_final,

	.export		=	sha256_sparc64_export,
@@ -176,7 +145,7 @@ static struct shash_alg sha256_alg = { 


static struct shash_alg sha224_alg = {

	.digestsize	=	SHA224_DIGEST_SIZE,

	.init		=	sha224_sparc64_init,

	.init		=	sha224_base_init,

	.update		=	sha256_sparc64_update,

	.final		=	sha224_sparc64_final,

	.descsize	=	sizeof(struct sha256_state),

arch/sparc/crypto/sha512_glue.c

+3 −34
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/mm.h>

#include <linux/types.h>

#include <crypto/sha2.h>

#include <crypto/sha512_base.h>



#include <asm/pstate.h>

#include <asm/elf.h>
@@ -25,38 +26,6 @@ 
asmlinkage void sha512_sparc64_transform(u64 *digest, const char *data,

					 unsigned int rounds);



static int sha512_sparc64_init(struct shash_desc *desc)

{

	struct sha512_state *sctx = shash_desc_ctx(desc);

	sctx->state[0] = SHA512_H0;

	sctx->state[1] = SHA512_H1;

	sctx->state[2] = SHA512_H2;

	sctx->state[3] = SHA512_H3;

	sctx->state[4] = SHA512_H4;

	sctx->state[5] = SHA512_H5;

	sctx->state[6] = SHA512_H6;

	sctx->state[7] = SHA512_H7;

	sctx->count[0] = sctx->count[1] = 0;



	return 0;

}



static int sha384_sparc64_init(struct shash_desc *desc)

{

	struct sha512_state *sctx = shash_desc_ctx(desc);

	sctx->state[0] = SHA384_H0;

	sctx->state[1] = SHA384_H1;

	sctx->state[2] = SHA384_H2;

	sctx->state[3] = SHA384_H3;

	sctx->state[4] = SHA384_H4;

	sctx->state[5] = SHA384_H5;

	sctx->state[6] = SHA384_H6;

	sctx->state[7] = SHA384_H7;

	sctx->count[0] = sctx->count[1] = 0;



	return 0;

}



static void __sha512_sparc64_update(struct sha512_state *sctx, const u8 *data,

				    unsigned int len, unsigned int partial)

{
@@ -146,7 +115,7 @@ static int sha384_sparc64_final(struct shash_desc *desc, u8 *hash) 


static struct shash_alg sha512 = {

	.digestsize	=	SHA512_DIGEST_SIZE,

	.init		=	sha512_sparc64_init,

	.init		=	sha512_base_init,

	.update		=	sha512_sparc64_update,

	.final		=	sha512_sparc64_final,

	.descsize	=	sizeof(struct sha512_state),
@@ -161,7 +130,7 @@ static struct shash_alg sha512 = { 


static struct shash_alg sha384 = {

	.digestsize	=	SHA384_DIGEST_SIZE,

	.init		=	sha384_sparc64_init,

	.init		=	sha384_base_init,

	.update		=	sha512_sparc64_update,

	.final		=	sha384_sparc64_final,

	.descsize	=	sizeof(struct sha512_state),