Merge branch 'mainline' into upstream-linus

1 files changed, 63 insertions, 31 deletions

diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 04e1aea58bc9..5a0dbeb6bbe8 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -30,7 +30,8 @@
  */
 static struct xfrm_algo_desc aalg_list[] = {
 {
-        .name = "digest_null",
+        .name = "hmac(digest_null)",
+        .compat = "digest_null",
         
         .uinfo = {
                 .auth = {
@@ -47,7 +48,8 @@ static struct xfrm_algo_desc aalg_list[] = {
         }
 },
 {
-        .name = "md5",
+        .name = "hmac(md5)",
+        .compat = "md5",
 
         .uinfo = {
                 .auth = {
@@ -64,7 +66,8 @@ static struct xfrm_algo_desc aalg_list[] = {
         }
 },
 {
-        .name = "sha1",
+        .name = "hmac(sha1)",
+        .compat = "sha1",
 
         .uinfo = {
                 .auth = {
@@ -81,7 +84,8 @@ static struct xfrm_algo_desc aalg_list[] = {
         }
 },
 {
-        .name = "sha256",
+        .name = "hmac(sha256)",
+        .compat = "sha256",
 
         .uinfo = {
                 .auth = {
@@ -98,7 +102,8 @@ static struct xfrm_algo_desc aalg_list[] = {
         }
 },
 {
-        .name = "ripemd160",
+        .name = "hmac(ripemd160)",
+        .compat = "ripemd160",
 
         .uinfo = {
                 .auth = {
@@ -118,7 +123,8 @@ static struct xfrm_algo_desc aalg_list[] = {
 
 static struct xfrm_algo_desc ealg_list[] = {
 {
-        .name = "cipher_null",
+        .name = "ecb(cipher_null)",
+        .compat = "cipher_null",
         
         .uinfo = {
                 .encr = {
@@ -135,7 +141,8 @@ static struct xfrm_algo_desc ealg_list[] = {
         }
 },
 {
-        .name = "des",
+        .name = "cbc(des)",
+        .compat = "des",
 
         .uinfo = {
                 .encr = {
@@ -152,7 +159,8 @@ static struct xfrm_algo_desc ealg_list[] = {
         }
 },
 {
-        .name = "des3_ede",
+        .name = "cbc(des3_ede)",
+        .compat = "des3_ede",
 
         .uinfo = {
                 .encr = {
@@ -169,7 +177,8 @@ static struct xfrm_algo_desc ealg_list[] = {
         }
 },
 {
-        .name = "cast128",
+        .name = "cbc(cast128)",
+        .compat = "cast128",
 
         .uinfo = {
                 .encr = {
@@ -186,7 +195,8 @@ static struct xfrm_algo_desc ealg_list[] = {
         }
 },
 {
-        .name = "blowfish",
+        .name = "cbc(blowfish)",
+        .compat = "blowfish",
 
         .uinfo = {
                 .encr = {
@@ -203,7 +213,8 @@ static struct xfrm_algo_desc ealg_list[] = {
         }
 },
 {
-        .name = "aes",
+        .name = "cbc(aes)",
+        .compat = "aes",
 
         .uinfo = {
                 .encr = {
@@ -220,7 +231,8 @@ static struct xfrm_algo_desc ealg_list[] = {
         }
 },
 {
-        .name = "serpent",
+        .name = "cbc(serpent)",
+        .compat = "serpent",
 
         .uinfo = {
                 .encr = {
@@ -237,7 +249,8 @@ static struct xfrm_algo_desc ealg_list[] = {
         }
 },
 {
-        .name = "twofish",
+        .name = "cbc(twofish)",
+        .compat = "twofish",
                  
         .uinfo = {
                 .encr = {
@@ -350,8 +363,8 @@ struct xfrm_algo_desc *xfrm_calg_get_byid(int alg_id)
 EXPORT_SYMBOL_GPL(xfrm_calg_get_byid);
 
 static struct xfrm_algo_desc *xfrm_get_byname(struct xfrm_algo_desc *list,
-                                              int entries, char *name,
-                                              int probe)
+                                              int entries, u32 type, u32 mask,
+                                              char *name, int probe)
 {
         int i, status;
 
@@ -359,7 +372,8 @@ static struct xfrm_algo_desc *xfrm_get_byname(struct xfrm_algo_desc *list,
                 return NULL;
 
         for (i = 0; i < entries; i++) {
-                if (strcmp(name, list[i].name))
+                if (strcmp(name, list[i].name) &&
+                    (!list[i].compat || strcmp(name, list[i].compat)))
                         continue;
 
                 if (list[i].available)
@@ -368,7 +382,7 @@ static struct xfrm_algo_desc *xfrm_get_byname(struct xfrm_algo_desc *list,
                 if (!probe)
                         break;
 
-                status = crypto_alg_available(name, 0);
+                status = crypto_has_alg(name, type, mask | CRYPTO_ALG_ASYNC);
                 if (!status)
                         break;
 
@@ -380,19 +394,25 @@ static struct xfrm_algo_desc *xfrm_get_byname(struct xfrm_algo_desc *list,
 
 struct xfrm_algo_desc *xfrm_aalg_get_byname(char *name, int probe)
 {
-        return xfrm_get_byname(aalg_list, aalg_entries(), name, probe);
+        return xfrm_get_byname(aalg_list, aalg_entries(),
+                               CRYPTO_ALG_TYPE_HASH, CRYPTO_ALG_TYPE_HASH_MASK,
+                               name, probe);
 }
 EXPORT_SYMBOL_GPL(xfrm_aalg_get_byname);
 
 struct xfrm_algo_desc *xfrm_ealg_get_byname(char *name, int probe)
 {
-        return xfrm_get_byname(ealg_list, ealg_entries(), name, probe);
+        return xfrm_get_byname(ealg_list, ealg_entries(),
+                               CRYPTO_ALG_TYPE_BLKCIPHER, CRYPTO_ALG_TYPE_MASK,
+                               name, probe);
 }
 EXPORT_SYMBOL_GPL(xfrm_ealg_get_byname);
 
 struct xfrm_algo_desc *xfrm_calg_get_byname(char *name, int probe)
 {
-        return xfrm_get_byname(calg_list, calg_entries(), name, probe);
+        return xfrm_get_byname(calg_list, calg_entries(),
+                               CRYPTO_ALG_TYPE_COMPRESS, CRYPTO_ALG_TYPE_MASK,
+                               name, probe);
 }
 EXPORT_SYMBOL_GPL(xfrm_calg_get_byname);
 
@@ -427,19 +447,22 @@ void xfrm_probe_algs(void)
         BUG_ON(in_softirq());
 
         for (i = 0; i < aalg_entries(); i++) {
-                status = crypto_alg_available(aalg_list[i].name, 0);
+                status = crypto_has_hash(aalg_list[i].name, 0,
+                                         CRYPTO_ALG_ASYNC);
                 if (aalg_list[i].available != status)
                         aalg_list[i].available = status;
         }
         
         for (i = 0; i < ealg_entries(); i++) {
-                status = crypto_alg_available(ealg_list[i].name, 0);
+                status = crypto_has_blkcipher(ealg_list[i].name, 0,
+                                              CRYPTO_ALG_ASYNC);
                 if (ealg_list[i].available != status)
                         ealg_list[i].available = status;
         }
         
         for (i = 0; i < calg_entries(); i++) {
-                status = crypto_alg_available(calg_list[i].name, 0);
+                status = crypto_has_comp(calg_list[i].name, 0,
+                                         CRYPTO_ALG_ASYNC);
                 if (calg_list[i].available != status)
                         calg_list[i].available = status;
         }
@@ -471,11 +494,12 @@ EXPORT_SYMBOL_GPL(xfrm_count_enc_supported);
 
 /* Move to common area: it is shared with AH. */
 
-void skb_icv_walk(const struct sk_buff *skb, struct crypto_tfm *tfm,
-                  int offset, int len, icv_update_fn_t icv_update)
+int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc,
+                 int offset, int len, icv_update_fn_t icv_update)
 {
         int start = skb_headlen(skb);
         int i, copy = start - offset;
+        int err;
         struct scatterlist sg;
 
         /* Checksum header. */
@@ -487,10 +511,12 @@ void skb_icv_walk(const struct sk_buff *skb, struct crypto_tfm *tfm,
                 sg.offset = (unsigned long)(skb->data + offset) % PAGE_SIZE;
                 sg.length = copy;
                 
-                icv_update(tfm, &sg, 1);
+                err = icv_update(desc, &sg, copy);
+                if (unlikely(err))
+                        return err;
                 
                 if ((len -= copy) == 0)
-                        return;
+                        return 0;
                 offset += copy;
         }
 
@@ -510,10 +536,12 @@ void skb_icv_walk(const struct sk_buff *skb, struct crypto_tfm *tfm,
                         sg.offset = frag->page_offset + offset-start;
                         sg.length = copy;
                         
-                        icv_update(tfm, &sg, 1);
+                        err = icv_update(desc, &sg, copy);
+                        if (unlikely(err))
+                                return err;
 
                         if (!(len -= copy))
-                                return;
+                                return 0;
                         offset += copy;
                 }
                 start = end;
@@ -531,15 +559,19 @@ void skb_icv_walk(const struct sk_buff *skb, struct crypto_tfm *tfm,
                         if ((copy = end - offset) > 0) {
                                 if (copy > len)
                                         copy = len;
-                                skb_icv_walk(list, tfm, offset-start, copy, icv_update);
+                                err = skb_icv_walk(list, desc, offset-start,
+                                                   copy, icv_update);
+                                if (unlikely(err))
+                                        return err;
                                 if ((len -= copy) == 0)
-                                        return;
+                                        return 0;
                                 offset += copy;
                         }
                         start = end;
                 }
         }
         BUG_ON(len);
+        return 0;
 }
 EXPORT_SYMBOL_GPL(skb_icv_walk);