Commit 50e109b5 authored by Adrian-Ken Rueegsegger's avatar Adrian-Ken Rueegsegger Committed by Herbert Xu
Browse files

crypto: sha256 - Switch to shash 



This patch changes sha256 and sha224 to the new shash interface.

Signed-off-by: default avatarAdrian-Ken Rueegsegger <ken@codelabs.ch>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 14b75ba7

crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ config CRYPTO_SHA1 


config CRYPTO_SHA256

	tristate "SHA224 and SHA256 digest algorithm"

	select CRYPTO_ALGAPI

	select CRYPTO_HASH

	help

	  SHA256 secure hash standard (DFIPS 180-2).

crypto/sha256_generic.c

+56 −48
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
 * any later version.

 *

 */

#include <crypto/internal/hash.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/mm.h>

#include <linux/crypto.h>

#include <linux/types.h>

#include <crypto/sha.h>

#include <asm/byteorder.h>
@@ -220,9 +220,9 @@ static void sha256_transform(u32 *state, const u8 *input) 
}





static void sha224_init(struct crypto_tfm *tfm)

static int sha224_init(struct shash_desc *desc)

{

	struct sha256_ctx *sctx = crypto_tfm_ctx(tfm);

	struct sha256_ctx *sctx = shash_desc_ctx(desc);

	sctx->state[0] = SHA224_H0;

	sctx->state[1] = SHA224_H1;

	sctx->state[2] = SHA224_H2;
@@ -233,11 +233,13 @@ static void sha224_init(struct crypto_tfm *tfm) 
	sctx->state[7] = SHA224_H7;

	sctx->count[0] = 0;

	sctx->count[1] = 0;



	return 0;

}



static void sha256_init(struct crypto_tfm *tfm)

static int sha256_init(struct shash_desc *desc)

{

	struct sha256_ctx *sctx = crypto_tfm_ctx(tfm);

	struct sha256_ctx *sctx = shash_desc_ctx(desc);

	sctx->state[0] = SHA256_H0;

	sctx->state[1] = SHA256_H1;

	sctx->state[2] = SHA256_H2;
@@ -247,12 +249,14 @@ static void sha256_init(struct crypto_tfm *tfm) 
	sctx->state[6] = SHA256_H6;

	sctx->state[7] = SHA256_H7;

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



	return 0;

}



static void sha256_update(struct crypto_tfm *tfm, const u8 *data,

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

			  unsigned int len)

{

	struct sha256_ctx *sctx = crypto_tfm_ctx(tfm);

	struct sha256_ctx *sctx = shash_desc_ctx(desc);

	unsigned int i, index, part_len;



	/* Compute number of bytes mod 128 */
@@ -280,11 +284,13 @@ static void sha256_update(struct crypto_tfm *tfm, const u8 *data, 


	/* Buffer remaining input */

	memcpy(&sctx->buf[index], &data[i], len-i);



	return 0;

}



static void sha256_final(struct crypto_tfm *tfm, u8 *out)

static int sha256_final(struct shash_desc *desc, u8 *out)

{

	struct sha256_ctx *sctx = crypto_tfm_ctx(tfm);

	struct sha256_ctx *sctx = shash_desc_ctx(desc);

	__be32 *dst = (__be32 *)out;

	__be32 bits[2];

	unsigned int index, pad_len;
@@ -298,10 +304,10 @@ static void sha256_final(struct crypto_tfm *tfm, u8 *out) 
	/* Pad out to 56 mod 64. */

	index = (sctx->count[0] >> 3) & 0x3f;

	pad_len = (index < 56) ? (56 - index) : ((64+56) - index);

	sha256_update(tfm, padding, pad_len);

	sha256_update(desc, padding, pad_len);



	/* Append length (before padding) */

	sha256_update(tfm, (const u8 *)bits, sizeof(bits));

	sha256_update(desc, (const u8 *)bits, sizeof(bits));



	/* Store state in digest */

	for (i = 0; i < 8; i++)
@@ -309,71 +315,73 @@ static void sha256_final(struct crypto_tfm *tfm, u8 *out) 


	/* Zeroize sensitive information. */

	memset(sctx, 0, sizeof(*sctx));



	return 0;

}



static void sha224_final(struct crypto_tfm *tfm, u8 *hash)

static int sha224_final(struct shash_desc *desc, u8 *hash)

{

	u8 D[SHA256_DIGEST_SIZE];



	sha256_final(tfm, D);

	sha256_final(desc, D);



	memcpy(hash, D, SHA224_DIGEST_SIZE);

	memset(D, 0, SHA256_DIGEST_SIZE);



	return 0;

}



static struct crypto_alg sha256 = {

static struct shash_alg sha256 = {

	.digestsize	=	SHA256_DIGEST_SIZE,

	.init		=	sha256_init,

	.update		=	sha256_update,

	.final		=	sha256_final,

	.descsize	=	sizeof(struct sha256_ctx),

	.base		=	{

		.cra_name	=	"sha256",

		.cra_driver_name=	"sha256-generic",

	.cra_flags	=	CRYPTO_ALG_TYPE_DIGEST,

		.cra_flags	=	CRYPTO_ALG_TYPE_SHASH,

		.cra_blocksize	=	SHA256_BLOCK_SIZE,

	.cra_ctxsize	=	sizeof(struct sha256_ctx),

		.cra_module	=	THIS_MODULE,

	.cra_alignmask	=	3,

	.cra_list	=	LIST_HEAD_INIT(sha256.cra_list),

	.cra_u		=	{ .digest = {

	.dia_digestsize	=	SHA256_DIGEST_SIZE,

	.dia_init	=	sha256_init,

	.dia_update	=	sha256_update,

	.dia_final	=	sha256_final } }

	}

};



static struct crypto_alg sha224 = {

static struct shash_alg sha224 = {

	.digestsize	=	SHA224_DIGEST_SIZE,

	.init		=	sha224_init,

	.update		=	sha256_update,

	.final		=	sha224_final,

	.descsize	=	sizeof(struct sha256_ctx),

	.base		=	{

		.cra_name	=	"sha224",

		.cra_driver_name=	"sha224-generic",

	.cra_flags	= CRYPTO_ALG_TYPE_DIGEST,

		.cra_flags	=	CRYPTO_ALG_TYPE_SHASH,

		.cra_blocksize	=	SHA224_BLOCK_SIZE,

	.cra_ctxsize	= sizeof(struct sha256_ctx),

		.cra_module	=	THIS_MODULE,

	.cra_alignmask	= 3,

	.cra_list	= LIST_HEAD_INIT(sha224.cra_list),

	.cra_u		= { .digest = {

	.dia_digestsize = SHA224_DIGEST_SIZE,

	.dia_init	= sha224_init,

	.dia_update	= sha256_update,

	.dia_final	= sha224_final } }

	}

};



static int __init sha256_generic_mod_init(void)

{

	int ret = 0;



	ret = crypto_register_alg(&sha224);

	ret = crypto_register_shash(&sha224);



	if (ret < 0)

		return ret;



	ret = crypto_register_alg(&sha256);

	ret = crypto_register_shash(&sha256);



	if (ret < 0)

		crypto_unregister_alg(&sha224);

		crypto_unregister_shash(&sha224);



	return ret;

}



static void __exit sha256_generic_mod_fini(void)

{

	crypto_unregister_alg(&sha224);

	crypto_unregister_alg(&sha256);

	crypto_unregister_shash(&sha224);

	crypto_unregister_shash(&sha256);

}



module_init(sha256_generic_mod_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE