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

crypto: mips/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 96ede30f

arch/mips/cavium-octeon/crypto/octeon-sha1.c

+2 −15
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/mm.h>

#include <crypto/sha1.h>

#include <crypto/sha1_base.h>

#include <linux/init.h>

#include <linux/types.h>

#include <linux/module.h>
@@ -71,20 +72,6 @@ static void octeon_sha1_transform(const void *_block) 
	octeon_sha1_start(block[7]);

}



static int octeon_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 void __octeon_sha1_update(struct sha1_state *sctx, const u8 *data,

				 unsigned int len)

{
@@ -200,7 +187,7 @@ static int octeon_sha1_import(struct shash_desc *desc, const void *in) 


static struct shash_alg octeon_sha1_alg = {

	.digestsize	=	SHA1_DIGEST_SIZE,

	.init		=	octeon_sha1_init,

	.init		=	sha1_base_init,

	.update		=	octeon_sha1_update,

	.final		=	octeon_sha1_final,

	.export		=	octeon_sha1_export,

arch/mips/cavium-octeon/crypto/octeon-sha256.c

+3 −36
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include <linux/mm.h>

#include <crypto/sha2.h>

#include <crypto/sha256_base.h>

#include <linux/init.h>

#include <linux/types.h>

#include <linux/module.h>
@@ -63,40 +64,6 @@ static void octeon_sha256_transform(const void *_block) 
	octeon_sha256_start(block[7]);

}



static int octeon_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 octeon_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 void __octeon_sha256_update(struct sha256_state *sctx, const u8 *data,

				   unsigned int len)

{
@@ -224,7 +191,7 @@ static int octeon_sha256_import(struct shash_desc *desc, const void *in) 


static struct shash_alg octeon_sha256_algs[2] = { {

	.digestsize	=	SHA256_DIGEST_SIZE,

	.init		=	octeon_sha256_init,

	.init		=	sha256_base_init,

	.update		=	octeon_sha256_update,

	.final		=	octeon_sha256_final,

	.export		=	octeon_sha256_export,
@@ -240,7 +207,7 @@ static struct shash_alg octeon_sha256_algs[2] = { { 
	}

}, {

	.digestsize	=	SHA224_DIGEST_SIZE,

	.init		=	octeon_sha224_init,

	.init		=	sha224_base_init,

	.update		=	octeon_sha256_update,

	.final		=	octeon_sha224_final,

	.descsize	=	sizeof(struct sha256_state),

arch/mips/cavium-octeon/crypto/octeon-sha512.c

+3 −36
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/mm.h>

#include <crypto/sha2.h>

#include <crypto/sha512_base.h>

#include <linux/init.h>

#include <linux/types.h>

#include <linux/module.h>
@@ -74,40 +75,6 @@ static void octeon_sha512_transform(const void *_block) 
	octeon_sha512_start(block[15]);

}



static int octeon_sha512_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 octeon_sha384_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 __octeon_sha512_update(struct sha512_state *sctx, const u8 *data,

				   unsigned int len)

{
@@ -223,7 +190,7 @@ static int octeon_sha384_final(struct shash_desc *desc, u8 *hash) 


static struct shash_alg octeon_sha512_algs[2] = { {

	.digestsize	=	SHA512_DIGEST_SIZE,

	.init		=	octeon_sha512_init,

	.init		=	sha512_base_init,

	.update		=	octeon_sha512_update,

	.final		=	octeon_sha512_final,

	.descsize	=	sizeof(struct sha512_state),
@@ -236,7 +203,7 @@ static struct shash_alg octeon_sha512_algs[2] = { { 
	}

}, {

	.digestsize	=	SHA384_DIGEST_SIZE,

	.init		=	octeon_sha384_init,

	.init		=	sha384_base_init,

	.update		=	octeon_sha512_update,

	.final		=	octeon_sha384_final,

	.descsize	=	sizeof(struct sha512_state),