From: Xiongfeng Wang <wangxiongfeng2@huawei.com>
To: <agk@redhat.com>, <snitzer@redhat.com>, <herbert@gondor.apana.org.au>
Cc: <dm-devel@redhat.com>, <linux-kernel@vger.kernel.org>,
<wangxiongfeng2@huawei.com>, <broonie@kernel.org>,
<arnd@arndb.de>, <jonathan.cameron@huawei.com>
Subject: [PATCH 2/5] crypto: ccm - use template array registering API to simplify the code
Date: Wed, 18 Jul 2018 15:30:52 +0800 [thread overview]
Message-ID: <1531899055-29362-3-git-send-email-wangxiongfeng2@huawei.com> (raw)
In-Reply-To: <1531899055-29362-1-git-send-email-wangxiongfeng2@huawei.com>
Use crypto template array registering API to simplify the code.
Signed-off-by: Xiongfeng Wang <xiongfeng.wang@linaro.org>
---
crypto/ccm.c | 82 ++++++++++++++++++++----------------------------------------
1 file changed, 27 insertions(+), 55 deletions(-)
diff --git a/crypto/ccm.c b/crypto/ccm.c
index 0a08334..1742d41 100644
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -586,12 +586,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)
{
@@ -615,12 +609,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)
{
@@ -851,12 +839,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)
{
@@ -996,51 +978,41 @@ static int cbcmac_create(struct crypto_template *tmpl, struct rtattr **tb)
return err;
}
-static struct crypto_template crypto_cbcmac_tmpl = {
- .name = "cbcmac",
- .create = cbcmac_create,
- .free = shash_free_instance,
- .module = THIS_MODULE,
+#define CCM_TEMPLATE_NUM 4
+
+static struct crypto_template crypto_ccm_tmpl[CCM_TEMPLATE_NUM] = {
+ {
+ .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_template_array(crypto_ccm_tmpl,
+ CCM_TEMPLATE_NUM);
}
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_template_array(crypto_ccm_tmpl, CCM_TEMPLATE_NUM);
}
module_init(crypto_ccm_module_init);
--
1.7.12.4
next prev parent reply other threads:[~2018-07-18 7:42 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-18 7:30 [PATCH 0/5] crypto: add IV generation templates Xiongfeng Wang
2018-07-18 7:30 ` [PATCH 1/5] crypto: api - introduce API to (un)register a array of templates Xiongfeng Wang
2018-07-18 7:30 ` Xiongfeng Wang [this message]
2018-07-18 7:30 ` [PATCH 3/5] crypto: gcm - use template array registering API to simplify the code Xiongfeng Wang
2018-07-18 7:30 ` [PATCH 4/5] crypto: Add IV generation templates Xiongfeng Wang
2018-07-18 8:16 ` Milan Broz
2018-07-18 8:48 ` Xiongfeng Wang
2018-07-18 13:11 ` Mike Snitzer
2018-07-18 16:46 ` Mark Brown
2018-07-18 17:17 ` Milan Broz
2018-07-18 17:47 ` Mark Brown
2018-07-19 1:46 ` Xiongfeng Wang
2018-07-19 8:50 ` Arnd Bergmann
2018-07-19 8:54 ` Herbert Xu
2018-07-19 13:30 ` Mark Brown
2018-07-19 18:14 ` kbuild test robot
2018-07-18 7:30 ` [PATCH 5/5] dm-crypt: modify dm-crypt to rely on " Xiongfeng Wang
2018-07-18 10:59 ` [PATCH 0/5] crypto: add " Arnd Bergmann
2018-07-18 15:34 ` Ard Biesheuvel
2018-07-19 10:55 ` Xiongfeng Wang
2018-07-19 14:08 ` Ard Biesheuvel
2018-07-19 15:50 ` Mark Brown
2018-07-20 1:02 ` Ard Biesheuvel
2018-07-20 11:45 ` Mark Brown
2018-07-20 12:23 ` Ard Biesheuvel
2018-07-20 12:32 ` Mark Brown
2018-07-22 13:39 ` Gilad Ben-Yossef
2018-07-23 0:13 ` Ard Biesheuvel
2019-01-16 2:50 [PATCH 0/5] Crypto Cleanup Xiongfeng Wang
2019-01-16 2:50 ` [PATCH 2/5] crypto: ccm - use template array registering API to simplify the code Xiongfeng Wang
2019-01-16 17:57 ` Eric Biggers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1531899055-29362-3-git-send-email-wangxiongfeng2@huawei.com \
--to=wangxiongfeng2@huawei.com \
--cc=agk@redhat.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=dm-devel@redhat.com \
--cc=herbert@gondor.apana.org.au \
--cc=jonathan.cameron@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=snitzer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).