dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

crypto: sha256 - use crypto_[un]register_shashes 

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>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Jussi Kivilinna 2012-07-11 14:20:30 +03:00 committed by Herbert Xu
parent a5e7a2dcfc
commit 6aeb49bc5a
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crypto/sha256_generic.c
View File

@ -336,7 +336,7 @@ static int sha256_import(struct shash_desc *desc, const void *in)
return 0; return 0;
} }
static struct shash_alg sha256 = { static struct shash_alg sha256_algs[2] = { {
.digestsize = SHA256_DIGEST_SIZE, .digestsize = SHA256_DIGEST_SIZE,
.init = sha256_init, .init = sha256_init,
.update = sha256_update, .update = sha256_update,
@ -352,9 +352,7 @@ static struct shash_alg sha256 = {
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
}; }, {
static struct shash_alg sha224 = {
.digestsize = SHA224_DIGEST_SIZE, .digestsize = SHA224_DIGEST_SIZE,
.init = sha224_init, .init = sha224_init,
.update = sha256_update, .update = sha256_update,
@ -367,29 +365,16 @@ static struct shash_alg sha224 = {
.cra_blocksize = SHA224_BLOCK_SIZE, .cra_blocksize = SHA224_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
}; } };
static int __init sha256_generic_mod_init(void) static int __init sha256_generic_mod_init(void)
{ {
int ret = 0; return crypto_register_shashes(sha256_algs, ARRAY_SIZE(sha256_algs));
ret = crypto_register_shash(&sha224);
if (ret < 0)
return ret;
ret = crypto_register_shash(&sha256);
if (ret < 0)
crypto_unregister_shash(&sha224);
return ret;
} }
static void __exit sha256_generic_mod_fini(void) static void __exit sha256_generic_mod_fini(void)
{ {
crypto_unregister_shash(&sha224); crypto_unregister_shashes(sha256_algs, ARRAY_SIZE(sha256_algs));
crypto_unregister_shash(&sha256);
} }
module_init(sha256_generic_mod_init); module_init(sha256_generic_mod_init);