linux-crypto.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
To: linux-crypto@vger.kernel.org
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
	"David S. Miller" <davem@davemloft.net>
Subject: [PATCH 07/14] crypto: tiger - use crypto_[un]register_shashes
Date: Wed, 11 Jul 2012 14:20:25 +0300	[thread overview]
Message-ID: <20120711112025.6875.23184.stgit@localhost6.localdomain6> (raw)
In-Reply-To: <20120711111949.6875.60269.stgit@localhost6.localdomain6>

Combine all shash algs to be registered and use new crypto_[un]register_shashes
functions. This simplifies init/exit code.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
---
 crypto/tgr192.c |   38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/crypto/tgr192.c b/crypto/tgr192.c
index cbca4f20..8740355 100644
--- a/crypto/tgr192.c
+++ b/crypto/tgr192.c
@@ -628,7 +628,7 @@ static int tgr128_final(struct shash_desc *desc, u8 * out)
 	return 0;
 }
 
-static struct shash_alg tgr192 = {
+static struct shash_alg tgr_algs[3] = { {
 	.digestsize	=	TGR192_DIGEST_SIZE,
 	.init		=	tgr192_init,
 	.update		=	tgr192_update,
@@ -640,9 +640,7 @@ static struct shash_alg tgr192 = {
 		.cra_blocksize	=	TGR192_BLOCK_SIZE,
 		.cra_module	=	THIS_MODULE,
 	}
-};
-
-static struct shash_alg tgr160 = {
+}, {
 	.digestsize	=	TGR160_DIGEST_SIZE,
 	.init		=	tgr192_init,
 	.update		=	tgr192_update,
@@ -654,9 +652,7 @@ static struct shash_alg tgr160 = {
 		.cra_blocksize	=	TGR192_BLOCK_SIZE,
 		.cra_module	=	THIS_MODULE,
 	}
-};
-
-static struct shash_alg tgr128 = {
+}, {
 	.digestsize	=	TGR128_DIGEST_SIZE,
 	.init		=	tgr192_init,
 	.update		=	tgr192_update,
@@ -668,38 +664,16 @@ static struct shash_alg tgr128 = {
 		.cra_blocksize	=	TGR192_BLOCK_SIZE,
 		.cra_module	=	THIS_MODULE,
 	}
-};
+} };
 
 static int __init tgr192_mod_init(void)
 {
-	int ret = 0;
-
-	ret = crypto_register_shash(&tgr192);
-
-	if (ret < 0) {
-		goto out;
-	}
-
-	ret = crypto_register_shash(&tgr160);
-	if (ret < 0) {
-		crypto_unregister_shash(&tgr192);
-		goto out;
-	}
-
-	ret = crypto_register_shash(&tgr128);
-	if (ret < 0) {
-		crypto_unregister_shash(&tgr192);
-		crypto_unregister_shash(&tgr160);
-	}
-      out:
-	return ret;
+	return crypto_register_shashes(tgr_algs, ARRAY_SIZE(tgr_algs));
 }
 
 static void __exit tgr192_mod_fini(void)
 {
-	crypto_unregister_shash(&tgr192);
-	crypto_unregister_shash(&tgr160);
-	crypto_unregister_shash(&tgr128);
+	crypto_unregister_shashes(tgr_algs, ARRAY_SIZE(tgr_algs));
 }
 
 MODULE_ALIAS("tgr160");

  parent reply	other threads:[~2012-07-11 11:20 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-11 11:19 [PATCH 00/14] crypto: cleanup - alg and shash init/exit cleanups and remove unneeded cra_list initializations Jussi Kivilinna
2012-07-11 11:19 ` [PATCH 01/14] crypto: tea - use crypto_[un]register_algs Jussi Kivilinna
2012-07-11 11:20 ` [PATCH 02/14] crypto: crypto_null " Jussi Kivilinna
2012-07-11 11:20 ` [PATCH 03/14] crypto: des " Jussi Kivilinna
2012-07-11 11:20 ` [PATCH 04/14] crypto: serpent " Jussi Kivilinna
2012-07-11 11:20 ` [PATCH 05/14] crypto: ansi_cprng " Jussi Kivilinna
2012-07-11 11:20 ` [PATCH 06/14] crypto: add crypto_[un]register_shashes for [un]registering multiple shash entries at once Jussi Kivilinna
2012-07-11 11:20 ` Jussi Kivilinna [this message]
2012-07-11 11:20 ` [PATCH 08/14] crypto: sha256 - use crypto_[un]register_shashes Jussi Kivilinna
2012-07-11 11:20 ` [PATCH 09/14] crypto: sha512 " Jussi Kivilinna
2012-07-11 11:20 ` [PATCH 10/14] crypto: whirlpool " Jussi Kivilinna
2012-07-11 11:20 ` [PATCH 11/14] crypto: cleanup - remove unneeded crypto_alg.cra_list initializations Jussi Kivilinna
2012-07-11 11:20 ` [PATCH 12/14] crypto: arch/x86 - " Jussi Kivilinna
2012-07-11 11:20 ` [PATCH 13/14] crypto: drivers - remove cra_list initialization Jussi Kivilinna
2012-07-13 17:00   ` Kent Yoder
2012-07-18  1:04   ` Vladimir Zapolskiy
2012-07-11 11:21 ` [PATCH 14/14] crypto: arch/s390 - cleanup - remove unneeded " Jussi Kivilinna
2012-07-12  9:28   ` Jan Glauber
2012-07-30  7:52 ` [PATCH 00/14] crypto: cleanup - alg and shash init/exit cleanups and remove unneeded cra_list initializations Herbert Xu

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=20120711112025.6875.23184.stgit@localhost6.localdomain6 \
    --to=jussi.kivilinna@mbnet.fi \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    /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).