Skip to content

Commit

Permalink
crypto: sha256 - use crypto_[un]register_shashes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jussi Kivilinna authored and Herbert Xu committed Aug 1, 2012
1 parent a5e7a2d commit 6aeb49b
Showing 1 changed file with 5 additions and 20 deletions.
25 changes: 5 additions & 20 deletions crypto/sha256_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ static int sha256_import(struct shash_desc *desc, const void *in)
return 0;
}

static struct shash_alg sha256 = {
static struct shash_alg sha256_algs[2] = { {
.digestsize = SHA256_DIGEST_SIZE,
.init = sha256_init,
.update = sha256_update,
Expand All @@ -352,9 +352,7 @@ static struct shash_alg sha256 = {
.cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE,
}
};

static struct shash_alg sha224 = {
}, {
.digestsize = SHA224_DIGEST_SIZE,
.init = sha224_init,
.update = sha256_update,
Expand All @@ -367,29 +365,16 @@ static struct shash_alg sha224 = {
.cra_blocksize = SHA224_BLOCK_SIZE,
.cra_module = THIS_MODULE,
}
};
} };

static int __init sha256_generic_mod_init(void)
{
int ret = 0;

ret = crypto_register_shash(&sha224);

if (ret < 0)
return ret;

ret = crypto_register_shash(&sha256);

if (ret < 0)
crypto_unregister_shash(&sha224);

return ret;
return crypto_register_shashes(sha256_algs, ARRAY_SIZE(sha256_algs));
}

static void __exit sha256_generic_mod_fini(void)
{
crypto_unregister_shash(&sha224);
crypto_unregister_shash(&sha256);
crypto_unregister_shashes(sha256_algs, ARRAY_SIZE(sha256_algs));
}

module_init(sha256_generic_mod_init);
Expand Down

0 comments on commit 6aeb49b

Please sign in to comment.