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

Commit 7af6c245 authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by Herbert Xu
Browse files

crypto: arch/x86 - cleanup - remove unneeded crypto_alg.cra_list initializations 



Initialization of cra_list is currently mixed, most ciphers initialize this
field and most shashes do not. Initialization however is not needed at all
since cra_list is initialized/overwritten in __crypto_register_alg() with
list_add(). Therefore perform cleanup to remove all unneeded initializations
of this field in 'arch/x86/crypto/'.

Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 77ec2e73

arch/x86/crypto/aes_glue.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,6 @@ static struct crypto_alg aes_alg = { 
	.cra_blocksize		= AES_BLOCK_SIZE,

	.cra_blocksize		= AES_BLOCK_SIZE,

	.cra_ctxsize		= sizeof(struct crypto_aes_ctx),

	.cra_ctxsize		= sizeof(struct crypto_aes_ctx),

	.cra_module		= THIS_MODULE,

	.cra_module		= THIS_MODULE,

	.cra_list		= LIST_HEAD_INIT(aes_alg.cra_list),

	.cra_u	= {

	.cra_u	= {

		.cipher	= {

		.cipher	= {

			.cia_min_keysize	= AES_MIN_KEY_SIZE,

			.cia_min_keysize	= AES_MIN_KEY_SIZE,

arch/x86/crypto/aesni-intel_glue.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -1118,7 +1118,7 @@ MODULE_DEVICE_TABLE(x86cpu, aesni_cpu_id); 




static int __init aesni_init(void)

static int __init aesni_init(void)

{

{

	int err, i;

	int err;





	if (!x86_match_cpu(aesni_cpu_id))

	if (!x86_match_cpu(aesni_cpu_id))

		return -ENODEV;

		return -ENODEV;
@@ -1127,9 +1127,6 @@ static int __init aesni_init(void) 
	if (err)

	if (err)

		return err;

		return err;





	for (i = 0; i < ARRAY_SIZE(aesni_algs); i++)

		INIT_LIST_HEAD(&aesni_algs[i].cra_list);



	return crypto_register_algs(aesni_algs, ARRAY_SIZE(aesni_algs));

	return crypto_register_algs(aesni_algs, ARRAY_SIZE(aesni_algs));

}

}

arch/x86/crypto/blowfish_glue.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -367,7 +367,6 @@ static struct crypto_alg bf_algs[4] = { { 
	.cra_ctxsize		= sizeof(struct bf_ctx),

	.cra_ctxsize		= sizeof(struct bf_ctx),

	.cra_alignmask		= 0,

	.cra_alignmask		= 0,

	.cra_module		= THIS_MODULE,

	.cra_module		= THIS_MODULE,

	.cra_list		= LIST_HEAD_INIT(bf_algs[0].cra_list),

	.cra_u = {

	.cra_u = {

		.cipher = {

		.cipher = {

			.cia_min_keysize	= BF_MIN_KEY_SIZE,

			.cia_min_keysize	= BF_MIN_KEY_SIZE,
@@ -387,7 +386,6 @@ static struct crypto_alg bf_algs[4] = { { 
	.cra_alignmask		= 0,

	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_module		= THIS_MODULE,

	.cra_list		= LIST_HEAD_INIT(bf_algs[1].cra_list),

	.cra_u = {

	.cra_u = {

		.blkcipher = {

		.blkcipher = {

			.min_keysize	= BF_MIN_KEY_SIZE,

			.min_keysize	= BF_MIN_KEY_SIZE,
@@ -407,7 +405,6 @@ static struct crypto_alg bf_algs[4] = { { 
	.cra_alignmask		= 0,

	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_module		= THIS_MODULE,

	.cra_list		= LIST_HEAD_INIT(bf_algs[2].cra_list),

	.cra_u = {

	.cra_u = {

		.blkcipher = {

		.blkcipher = {

			.min_keysize	= BF_MIN_KEY_SIZE,

			.min_keysize	= BF_MIN_KEY_SIZE,
@@ -428,7 +425,6 @@ static struct crypto_alg bf_algs[4] = { { 
	.cra_alignmask		= 0,

	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_module		= THIS_MODULE,

	.cra_list		= LIST_HEAD_INIT(bf_algs[3].cra_list),

	.cra_u = {

	.cra_u = {

		.blkcipher = {

		.blkcipher = {

			.min_keysize	= BF_MIN_KEY_SIZE,

			.min_keysize	= BF_MIN_KEY_SIZE,

arch/x86/crypto/camellia_glue.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -1601,7 +1601,6 @@ static struct crypto_alg camellia_algs[6] = { { 
	.cra_ctxsize		= sizeof(struct camellia_ctx),

	.cra_ctxsize		= sizeof(struct camellia_ctx),

	.cra_alignmask		= 0,

	.cra_alignmask		= 0,

	.cra_module		= THIS_MODULE,

	.cra_module		= THIS_MODULE,

	.cra_list		= LIST_HEAD_INIT(camellia_algs[0].cra_list),

	.cra_u			= {

	.cra_u			= {

		.cipher = {

		.cipher = {

			.cia_min_keysize = CAMELLIA_MIN_KEY_SIZE,

			.cia_min_keysize = CAMELLIA_MIN_KEY_SIZE,
@@ -1621,7 +1620,6 @@ static struct crypto_alg camellia_algs[6] = { { 
	.cra_alignmask		= 0,

	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_module		= THIS_MODULE,

	.cra_list		= LIST_HEAD_INIT(camellia_algs[1].cra_list),

	.cra_u = {

	.cra_u = {

		.blkcipher = {

		.blkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE,

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE,
@@ -1641,7 +1639,6 @@ static struct crypto_alg camellia_algs[6] = { { 
	.cra_alignmask		= 0,

	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_module		= THIS_MODULE,

	.cra_list		= LIST_HEAD_INIT(camellia_algs[2].cra_list),

	.cra_u = {

	.cra_u = {

		.blkcipher = {

		.blkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE,

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE,
@@ -1662,7 +1659,6 @@ static struct crypto_alg camellia_algs[6] = { { 
	.cra_alignmask		= 0,

	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_module		= THIS_MODULE,

	.cra_list		= LIST_HEAD_INIT(camellia_algs[3].cra_list),

	.cra_u = {

	.cra_u = {

		.blkcipher = {

		.blkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE,

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE,
@@ -1683,7 +1679,6 @@ static struct crypto_alg camellia_algs[6] = { { 
	.cra_alignmask		= 0,

	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_module		= THIS_MODULE,

	.cra_list		= LIST_HEAD_INIT(camellia_algs[4].cra_list),

	.cra_exit		= lrw_exit_tfm,

	.cra_exit		= lrw_exit_tfm,

	.cra_u = {

	.cra_u = {

		.blkcipher = {

		.blkcipher = {
@@ -1707,7 +1702,6 @@ static struct crypto_alg camellia_algs[6] = { { 
	.cra_alignmask		= 0,

	.cra_alignmask		= 0,

	.cra_type		= &crypto_blkcipher_type,

	.cra_type		= &crypto_blkcipher_type,

	.cra_module		= THIS_MODULE,

	.cra_module		= THIS_MODULE,

	.cra_list		= LIST_HEAD_INIT(camellia_algs[5].cra_list),

	.cra_u = {

	.cra_u = {

		.blkcipher = {

		.blkcipher = {

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE * 2,

			.min_keysize	= CAMELLIA_MIN_KEY_SIZE * 2,

arch/x86/crypto/ghash-clmulni-intel_glue.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -150,7 +150,6 @@ static struct shash_alg ghash_alg = { 
		.cra_blocksize		= GHASH_BLOCK_SIZE,

		.cra_blocksize		= GHASH_BLOCK_SIZE,

		.cra_ctxsize		= sizeof(struct ghash_ctx),

		.cra_ctxsize		= sizeof(struct ghash_ctx),

		.cra_module		= THIS_MODULE,

		.cra_module		= THIS_MODULE,

		.cra_list		= LIST_HEAD_INIT(ghash_alg.base.cra_list),

	},

	},

};

};
@@ -288,7 +287,6 @@ static struct ahash_alg ghash_async_alg = { 
			.cra_blocksize		= GHASH_BLOCK_SIZE,

			.cra_blocksize		= GHASH_BLOCK_SIZE,

			.cra_type		= &crypto_ahash_type,

			.cra_type		= &crypto_ahash_type,

			.cra_module		= THIS_MODULE,

			.cra_module		= THIS_MODULE,

			.cra_list		= LIST_HEAD_INIT(ghash_async_alg.halg.base.cra_list),

			.cra_init		= ghash_async_init_tfm,

			.cra_init		= ghash_async_init_tfm,

			.cra_exit		= ghash_async_exit_tfm,

			.cra_exit		= ghash_async_exit_tfm,

		},

		},