aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2006-08-26 04:12:40 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2006-09-20 21:46:22 -0400
commite4d5b79c661c7cfca9d8d5afd040a295f128d3cb (patch)
tree55a19ceca1b51b26d1934d388b26f0b1bed99a3e /drivers
parentfce32d70ba834129b164c40c2d4260e5a7a7d850 (diff)
[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.c6
-rw-r--r--drivers/net/ppp_mppe.c4
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)
26{ 26{
27 int success = 0; 27 int success = 0;
28 28
29 if (crypto_alg_available("aes-padlock", 0)) 29 if (crypto_has_cipher("aes-padlock", 0, 0))
30 success++; 30 success++;
31 31
32 if (crypto_alg_available("sha1-padlock", 0)) 32 if (crypto_has_hash("sha1-padlock", 0, 0))
33 success++; 33 success++;
34 34
35 if (crypto_alg_available("sha256-padlock", 0)) 35 if (crypto_has_hash("sha256-padlock", 0, 0))
36 success++; 36 success++;
37 37
38 if (!success) { 38 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 = {
710static int __init ppp_mppe_init(void) 710static int __init ppp_mppe_init(void)
711{ 711{
712 int answer; 712 int answer;
713 if (!(crypto_alg_available("ecb(arc4)", 0) && 713 if (!(crypto_has_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC) &&
714 crypto_alg_available("sha1", 0))) 714 crypto_has_hash("sha1", 0, CRYPTO_ALG_ASYNC)))
715 return -ENODEV; 715 return -ENODEV;
716 716
717 sha_pad = kmalloc(sizeof(struct sha_pad), GFP_KERNEL); 717 sha_pad = kmalloc(sizeof(struct sha_pad), GFP_KERNEL);