Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93e919d9 authored by Corentin Labbe's avatar Corentin Labbe Committed by Greg Kroah-Hartman
Browse files

crypto: n2 - add missing hash statesize 



commit 76a4e874593543a2dff91d249c95bac728df2774 upstream.

Add missing statesize to hash templates.
This is mandatory otherwise no algorithms can be registered as the core
requires statesize to be set.

CC: stable@kernel.org # 4.3+
Reported-by: default avatarRolf Eike Beer <eike-kernel@sf-tec.de>
Tested-by: default avatarRolf Eike Beer <eike-kernel@sf-tec.de>
Fixes: 0a625fd2 ("crypto: n2 - Add Niagara2 crypto driver")
Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a5866d53

drivers/crypto/n2_core.c

+6 −0
Original line number Diff line number Diff line
@@ -1278,6 +1278,7 @@ struct n2_hash_tmpl { 
	const u32	*hash_init;

	u8		hw_op_hashsz;

	u8		digest_size;

	u8		statesize;

	u8		block_size;

	u8		auth_type;

	u8		hmac_type;
@@ -1309,6 +1310,7 @@ static const struct n2_hash_tmpl hash_tmpls[] = { 
	  .hmac_type	= AUTH_TYPE_HMAC_MD5,

	  .hw_op_hashsz	= MD5_DIGEST_SIZE,

	  .digest_size	= MD5_DIGEST_SIZE,

	  .statesize	= sizeof(struct md5_state),

	  .block_size	= MD5_HMAC_BLOCK_SIZE },

	{ .name		= "sha1",

	  .hash_zero	= sha1_zero_message_hash,
@@ -1317,6 +1319,7 @@ static const struct n2_hash_tmpl hash_tmpls[] = { 
	  .hmac_type	= AUTH_TYPE_HMAC_SHA1,

	  .hw_op_hashsz	= SHA1_DIGEST_SIZE,

	  .digest_size	= SHA1_DIGEST_SIZE,

	  .statesize	= sizeof(struct sha1_state),

	  .block_size	= SHA1_BLOCK_SIZE },

	{ .name		= "sha256",

	  .hash_zero	= sha256_zero_message_hash,
@@ -1325,6 +1328,7 @@ static const struct n2_hash_tmpl hash_tmpls[] = { 
	  .hmac_type	= AUTH_TYPE_HMAC_SHA256,

	  .hw_op_hashsz	= SHA256_DIGEST_SIZE,

	  .digest_size	= SHA256_DIGEST_SIZE,

	  .statesize	= sizeof(struct sha256_state),

	  .block_size	= SHA256_BLOCK_SIZE },

	{ .name		= "sha224",

	  .hash_zero	= sha224_zero_message_hash,
@@ -1333,6 +1337,7 @@ static const struct n2_hash_tmpl hash_tmpls[] = { 
	  .hmac_type	= AUTH_TYPE_RESERVED,

	  .hw_op_hashsz	= SHA256_DIGEST_SIZE,

	  .digest_size	= SHA224_DIGEST_SIZE,

	  .statesize	= sizeof(struct sha256_state),

	  .block_size	= SHA224_BLOCK_SIZE },

};

#define NUM_HASH_TMPLS ARRAY_SIZE(hash_tmpls)
@@ -1474,6 +1479,7 @@ static int __n2_register_one_ahash(const struct n2_hash_tmpl *tmpl) 


	halg = &ahash->halg;

	halg->digestsize = tmpl->digest_size;

	halg->statesize = tmpl->statesize;



	base = &halg->base;

	snprintf(base->cra_name, CRYPTO_MAX_ALG_NAME, "%s", tmpl->name);