OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Use crypto template array registering API to simplify the code.

Signed-off-by: Xiongfeng Wang <xiongfeng.wang@linaro.org>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Xiongfeng Wang 2019-01-18 13:58:12 +08:00 committed by Herbert Xu
parent 9572442dcf
commit 0db1903539
1 changed files with 23 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
crypto/ccm.c
View File

@ -589,12 +589,6 @@ static int crypto_ccm_create(struct crypto_template *tmpl, struct rtattr **tb)
mac_name); 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, static int crypto_ccm_base_create(struct crypto_template *tmpl,
struct rtattr **tb) struct rtattr **tb)
{ {
@ -618,12 +612,6 @@ static int crypto_ccm_base_create(struct crypto_template *tmpl,
cipher_name); 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, static int crypto_rfc4309_setkey(struct crypto_aead *parent, const u8 *key,
unsigned int keylen) unsigned int keylen)
{ {
@ -854,12 +842,6 @@ out_free_inst:
goto out; 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, static int crypto_cbcmac_digest_setkey(struct crypto_shash *parent,
const u8 *inkey, unsigned int keylen) const u8 *inkey, unsigned int keylen)
{ {
@ -999,51 +981,37 @@ out_put_alg:
return err; return err;
} }
static struct crypto_template crypto_cbcmac_tmpl = { static struct crypto_template crypto_ccm_tmpls[] = {
.name = "cbcmac", {
.create = cbcmac_create, .name = "cbcmac",
.free = shash_free_instance, .create = cbcmac_create,
.module = THIS_MODULE, .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) static int __init crypto_ccm_module_init(void)
{ {
int err; return crypto_register_templates(crypto_ccm_tmpls,
ARRAY_SIZE(crypto_ccm_tmpls));
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;
} }
static void __exit crypto_ccm_module_exit(void) static void __exit crypto_ccm_module_exit(void)
{ {
crypto_unregister_template(&crypto_rfc4309_tmpl); crypto_unregister_templates(crypto_ccm_tmpls,
crypto_unregister_template(&crypto_ccm_tmpl); ARRAY_SIZE(crypto_ccm_tmpls));
crypto_unregister_template(&crypto_ccm_base_tmpl);
crypto_unregister_template(&crypto_cbcmac_tmpl);
} }
module_init(crypto_ccm_module_init); module_init(crypto_ccm_module_init);