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

Commit 7537c648 authored by Eric Biggers's avatar Eric Biggers Committed by Alistair Delva
Browse files

UPSTREAM: crypto: x86/blake2s - define shash_alg structs using macros 



The shash_alg structs for the four variants of BLAKE2s are identical
except for the algorithm name, driver name, and digest size.  So, avoid
code duplication by using a macro to define these structs.

Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>

(cherry picked from commit 1aa90f4cf034ed4f016a02330820ac0551a6c13c)
Bug: 152722841
Bug: 178411248
Change-Id: Ibba710056182a609defca0a53133387153f0f63d
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent b54930b3

arch/x86/crypto/blake2s-glue.c

+23 −61
Original line number Diff line number Diff line
@@ -132,67 +132,29 @@ static int crypto_blake2s_final(struct shash_desc *desc, u8 *out) 
	return 0;

}



static struct shash_alg blake2s_algs[] = {{

	.base.cra_name		= "blake2s-128",

	.base.cra_driver_name	= "blake2s-128-x86",

	.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,

	.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx),

	.base.cra_priority	= 200,

	.base.cra_blocksize     = BLAKE2S_BLOCK_SIZE,

	.base.cra_module	= THIS_MODULE,



	.digestsize		= BLAKE2S_128_HASH_SIZE,

	.setkey			= crypto_blake2s_setkey,

	.init			= crypto_blake2s_init,

	.update			= crypto_blake2s_update,

	.final			= crypto_blake2s_final,

	.descsize		= sizeof(struct blake2s_state),

}, {

	.base.cra_name		= "blake2s-160",

	.base.cra_driver_name	= "blake2s-160-x86",

	.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,

	.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx),

	.base.cra_priority	= 200,

	.base.cra_blocksize     = BLAKE2S_BLOCK_SIZE,

	.base.cra_module	= THIS_MODULE,



	.digestsize		= BLAKE2S_160_HASH_SIZE,

	.setkey			= crypto_blake2s_setkey,

	.init			= crypto_blake2s_init,

	.update			= crypto_blake2s_update,

	.final			= crypto_blake2s_final,

	.descsize		= sizeof(struct blake2s_state),

}, {

	.base.cra_name		= "blake2s-224",

	.base.cra_driver_name	= "blake2s-224-x86",

	.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,

	.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx),

	.base.cra_priority	= 200,

	.base.cra_blocksize     = BLAKE2S_BLOCK_SIZE,

	.base.cra_module	= THIS_MODULE,



	.digestsize		= BLAKE2S_224_HASH_SIZE,

	.setkey			= crypto_blake2s_setkey,

	.init			= crypto_blake2s_init,

	.update			= crypto_blake2s_update,

	.final			= crypto_blake2s_final,

	.descsize		= sizeof(struct blake2s_state),

}, {

	.base.cra_name		= "blake2s-256",

	.base.cra_driver_name	= "blake2s-256-x86",

	.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,

	.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx),

	.base.cra_priority	= 200,

	.base.cra_blocksize     = BLAKE2S_BLOCK_SIZE,

	.base.cra_module	= THIS_MODULE,



	.digestsize		= BLAKE2S_256_HASH_SIZE,

	.setkey			= crypto_blake2s_setkey,

	.init			= crypto_blake2s_init,

	.update			= crypto_blake2s_update,

	.final			= crypto_blake2s_final,

	.descsize		= sizeof(struct blake2s_state),

}};

#define BLAKE2S_ALG(name, driver_name, digest_size)			\

	{								\

		.base.cra_name		= name,				\

		.base.cra_driver_name	= driver_name,			\

		.base.cra_priority	= 200,				\

		.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,	\

		.base.cra_blocksize	= BLAKE2S_BLOCK_SIZE,		\

		.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx), \

		.base.cra_module	= THIS_MODULE,			\

		.digestsize		= digest_size,			\

		.setkey			= crypto_blake2s_setkey,	\

		.init			= crypto_blake2s_init,		\

		.update			= crypto_blake2s_update,	\

		.final			= crypto_blake2s_final,		\

		.descsize		= sizeof(struct blake2s_state),	\

	}



static struct shash_alg blake2s_algs[] = {

	BLAKE2S_ALG("blake2s-128", "blake2s-128-x86", BLAKE2S_128_HASH_SIZE),

	BLAKE2S_ALG("blake2s-160", "blake2s-160-x86", BLAKE2S_160_HASH_SIZE),

	BLAKE2S_ALG("blake2s-224", "blake2s-224-x86", BLAKE2S_224_HASH_SIZE),

	BLAKE2S_ALG("blake2s-256", "blake2s-256-x86", BLAKE2S_256_HASH_SIZE),

};



static int __init blake2s_mod_init(void)

{