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

crypto: powerpc/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 63bdbfc1

arch/powerpc/crypto/sha1-spe-glue.c

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

#include <linux/types.h>

#include <crypto/sha1.h>

#include <crypto/sha1_base.h>

#include <asm/byteorder.h>

#include <asm/switch_to.h>

#include <linux/hardirq.h>
@@ -55,20 +56,6 @@ static inline void ppc_sha1_clear_context(struct sha1_state *sctx) 
	do { *ptr++ = 0; } while (--count);

}



static int ppc_spe_sha1_init(struct shash_desc *desc)

{

	struct sha1_state *sctx = shash_desc_ctx(desc);



	sctx->state[0] = SHA1_H0;

	sctx->state[1] = SHA1_H1;

	sctx->state[2] = SHA1_H2;

	sctx->state[3] = SHA1_H3;

	sctx->state[4] = SHA1_H4;

	sctx->count = 0;



	return 0;

}



static int ppc_spe_sha1_update(struct shash_desc *desc, const u8 *data,

			unsigned int len)

{
@@ -168,7 +155,7 @@ static int ppc_spe_sha1_import(struct shash_desc *desc, const void *in) 


static struct shash_alg alg = {

	.digestsize	=	SHA1_DIGEST_SIZE,

	.init		=	ppc_spe_sha1_init,

	.init		=	sha1_base_init,

	.update		=	ppc_spe_sha1_update,

	.final		=	ppc_spe_sha1_final,

	.export		=	ppc_spe_sha1_export,

arch/powerpc/crypto/sha1.c

+2 −12
Original line number Diff line number Diff line
@@ -18,21 +18,11 @@ 
#include <linux/mm.h>

#include <linux/types.h>

#include <crypto/sha1.h>

#include <crypto/sha1_base.h>

#include <asm/byteorder.h>



void powerpc_sha_transform(u32 *state, const u8 *src);



static int powerpc_sha1_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 int powerpc_sha1_update(struct shash_desc *desc, const u8 *data,

			       unsigned int len)

{
@@ -114,7 +104,7 @@ static int powerpc_sha1_import(struct shash_desc *desc, const void *in) 


static struct shash_alg alg = {

	.digestsize	=	SHA1_DIGEST_SIZE,

	.init		=	powerpc_sha1_init,

	.init		=	sha1_base_init,

	.update		=	powerpc_sha1_update,

	.final		=	powerpc_sha1_final,

	.export		=	powerpc_sha1_export,

arch/powerpc/crypto/sha256-spe-glue.c

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

#include <linux/types.h>

#include <crypto/sha2.h>

#include <crypto/sha256_base.h>

#include <asm/byteorder.h>

#include <asm/switch_to.h>

#include <linux/hardirq.h>
@@ -56,40 +57,6 @@ static inline void ppc_sha256_clear_context(struct sha256_state *sctx) 
	do { *ptr++ = 0; } while (--count);

}



static int ppc_spe_sha256_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 int ppc_spe_sha224_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 ppc_spe_sha256_update(struct shash_desc *desc, const u8 *data,

			unsigned int len)

{
@@ -214,7 +181,7 @@ static int ppc_spe_sha256_import(struct shash_desc *desc, const void *in) 


static struct shash_alg algs[2] = { {

	.digestsize	=	SHA256_DIGEST_SIZE,

	.init		=	ppc_spe_sha256_init,

	.init		=	sha256_base_init,

	.update		=	ppc_spe_sha256_update,

	.final		=	ppc_spe_sha256_final,

	.export		=	ppc_spe_sha256_export,
@@ -230,7 +197,7 @@ static struct shash_alg algs[2] = { { 
	}

}, {

	.digestsize	=	SHA224_DIGEST_SIZE,

	.init		=	ppc_spe_sha224_init,

	.init		=	sha224_base_init,

	.update		=	ppc_spe_sha256_update,

	.final		=	ppc_spe_sha224_final,

	.export		=	ppc_spe_sha256_export,