ipsec: Use skcipher and ahash when probing algorithms

This patch removes the last reference to hash and ablkcipher from
IPsec and replaces them with ahash and skcipher respectively.  For
skcipher there is currently no difference at all, while for ahash
the current code is actually buggy and would prevent asynchronous
algorithms from being discovered.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 3 deletions

diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index f07224d8b88f..250e567ba3d6 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -9,6 +9,8 @@
  * any later version.
  */
 
+#include <crypto/hash.h>
+#include <crypto/skcipher.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/pfkeyv2.h>
@@ -782,14 +784,13 @@ void xfrm_probe_algs(void)
         BUG_ON(in_softirq());
 
         for (i = 0; i < aalg_entries(); i++) {
-                status = crypto_has_hash(aalg_list[i].name, 0,
-                                         CRYPTO_ALG_ASYNC);
+                status = crypto_has_ahash(aalg_list[i].name, 0, 0);
                 if (aalg_list[i].available != status)
                         aalg_list[i].available = status;
         }
 
         for (i = 0; i < ealg_entries(); i++) {
-                status = crypto_has_ablkcipher(ealg_list[i].name, 0, 0);
+                status = crypto_has_skcipher(ealg_list[i].name, 0, 0);
                 if (ealg_list[i].available != status)
                         ealg_list[i].available = status;
         }