Commit 0db19035 authored by Xiongfeng Wang's avatar Xiongfeng Wang Committed by Herbert Xu
Browse files

crypto: ccm - use template array registering API to simplify the code 



Use crypto template array registering API to simplify the code.

Signed-off-by: default avatarXiongfeng Wang <xiongfeng.wang@linaro.org>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9572442d

crypto/ccm.c

+23 −55
Original line number Diff line number Diff line
@@ -589,12 +589,6 @@ static int crypto_ccm_create(struct crypto_template *tmpl, struct rtattr **tb) 
					mac_name);

}



static struct crypto_template crypto_ccm_tmpl = {

	.name = "ccm",

	.create = crypto_ccm_create,

	.module = THIS_MODULE,

};



static int crypto_ccm_base_create(struct crypto_template *tmpl,

				  struct rtattr **tb)

{
@@ -618,12 +612,6 @@ static int crypto_ccm_base_create(struct crypto_template *tmpl, 
					cipher_name);

}



static struct crypto_template crypto_ccm_base_tmpl = {

	.name = "ccm_base",

	.create = crypto_ccm_base_create,

	.module = THIS_MODULE,

};



static int crypto_rfc4309_setkey(struct crypto_aead *parent, const u8 *key,

				 unsigned int keylen)

{
@@ -854,12 +842,6 @@ static int crypto_rfc4309_create(struct crypto_template *tmpl, 
	goto out;

}



static struct crypto_template crypto_rfc4309_tmpl = {

	.name = "rfc4309",

	.create = crypto_rfc4309_create,

	.module = THIS_MODULE,

};



static int crypto_cbcmac_digest_setkey(struct crypto_shash *parent,

				     const u8 *inkey, unsigned int keylen)

{
@@ -999,51 +981,37 @@ static int cbcmac_create(struct crypto_template *tmpl, struct rtattr **tb) 
	return err;

}



static struct crypto_template crypto_cbcmac_tmpl = {

static struct crypto_template crypto_ccm_tmpls[] = {

	{

		.name = "cbcmac",

		.create = cbcmac_create,

		.free = shash_free_instance,

		.module = THIS_MODULE,

	}, {

		.name = "ccm_base",

		.create = crypto_ccm_base_create,

		.module = THIS_MODULE,

	}, {

		.name = "ccm",

		.create = crypto_ccm_create,

		.module = THIS_MODULE,

	}, {

		.name = "rfc4309",

		.create = crypto_rfc4309_create,

		.module = THIS_MODULE,

	},

};



static int __init crypto_ccm_module_init(void)

{

	int err;



	err = crypto_register_template(&crypto_cbcmac_tmpl);

	if (err)

		goto out;



	err = crypto_register_template(&crypto_ccm_base_tmpl);

	if (err)

		goto out_undo_cbcmac;



	err = crypto_register_template(&crypto_ccm_tmpl);

	if (err)

		goto out_undo_base;



	err = crypto_register_template(&crypto_rfc4309_tmpl);

	if (err)

		goto out_undo_ccm;



out:

	return err;



out_undo_ccm:

	crypto_unregister_template(&crypto_ccm_tmpl);

out_undo_base:

	crypto_unregister_template(&crypto_ccm_base_tmpl);

out_undo_cbcmac:

	crypto_register_template(&crypto_cbcmac_tmpl);

	goto out;

	return crypto_register_templates(crypto_ccm_tmpls,

					 ARRAY_SIZE(crypto_ccm_tmpls));

}



static void __exit crypto_ccm_module_exit(void)

{

	crypto_unregister_template(&crypto_rfc4309_tmpl);

	crypto_unregister_template(&crypto_ccm_tmpl);

	crypto_unregister_template(&crypto_ccm_base_tmpl);

	crypto_unregister_template(&crypto_cbcmac_tmpl);

	crypto_unregister_templates(crypto_ccm_tmpls,

				    ARRAY_SIZE(crypto_ccm_tmpls));

}



module_init(crypto_ccm_module_init);