diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-08-26 18:12:40 +1000 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2006-09-21 11:46:22 +1000 |
commit | e4d5b79c661c7cfca9d8d5afd040a295f128d3cb (patch) | |
tree | 55a19ceca1b51b26d1934d388b26f0b1bed99a3e /drivers | |
parent | fce32d70ba834129b164c40c2d4260e5a7a7d850 (diff) | |
download | linux-stable-e4d5b79c661c7cfca9d8d5afd040a295f128d3cb.tar.gz linux-stable-e4d5b79c661c7cfca9d8d5afd040a295f128d3cb.tar.bz2 linux-stable-e4d5b79c661c7cfca9d8d5afd040a295f128d3cb.zip |
[CRYPTO] users: Use crypto_comp and crypto_has_*
This patch converts all users to use the new crypto_comp type and the
crypto_has_* functions.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/crypto/padlock.c | 6 | ||||
-rw-r--r-- | drivers/net/ppp_mppe.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/crypto/padlock.c b/drivers/crypto/padlock.c index ce581684f4b4..d6d7dd5bb98c 100644 --- a/drivers/crypto/padlock.c +++ b/drivers/crypto/padlock.c @@ -26,13 +26,13 @@ static int __init padlock_init(void) { int success = 0; - if (crypto_alg_available("aes-padlock", 0)) + if (crypto_has_cipher("aes-padlock", 0, 0)) success++; - if (crypto_alg_available("sha1-padlock", 0)) + if (crypto_has_hash("sha1-padlock", 0, 0)) success++; - if (crypto_alg_available("sha256-padlock", 0)) + if (crypto_has_hash("sha256-padlock", 0, 0)) success++; if (!success) { diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c index e7a0eb4fca60..f3655fd772f5 100644 --- a/drivers/net/ppp_mppe.c +++ b/drivers/net/ppp_mppe.c @@ -710,8 +710,8 @@ static struct compressor ppp_mppe = { static int __init ppp_mppe_init(void) { int answer; - if (!(crypto_alg_available("ecb(arc4)", 0) && - crypto_alg_available("sha1", 0))) + if (!(crypto_has_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC) && + crypto_has_hash("sha1", 0, CRYPTO_ALG_ASYNC))) return -ENODEV; sha_pad = kmalloc(sizeof(struct sha_pad), GFP_KERNEL); |