Merge branch 'master' into upstream

Conflicts:

	net/ieee80211/ieee80211_crypt_tkip.c
	net/ieee80211/ieee80211_crypt_wep.c

1 files changed, 50 insertions, 35 deletions

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index fc2f8ce441de..b428489f6ccd 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -1,3 +1,4 @@
+#include <linux/err.h>
 #include <linux/module.h>
 #include <net/ip.h>
 #include <net/xfrm.h>
@@ -16,7 +17,8 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
         int err;
         struct iphdr *top_iph;
         struct ip_esp_hdr *esph;
-        struct crypto_tfm *tfm;
+        struct crypto_blkcipher *tfm;
+        struct blkcipher_desc desc;
         struct esp_data *esp;
         struct sk_buff *trailer;
         int blksize;
@@ -36,7 +38,9 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
         esp = x->data;
         alen = esp->auth.icv_trunc_len;
         tfm = esp->conf.tfm;
-        blksize = ALIGN(crypto_tfm_alg_blocksize(tfm), 4);
+        desc.tfm = tfm;
+        desc.flags = 0;
+        blksize = ALIGN(crypto_blkcipher_blocksize(tfm), 4);
         clen = ALIGN(clen + 2, blksize);
         if (esp->conf.padlen)
                 clen = ALIGN(clen, esp->conf.padlen);
@@ -92,7 +96,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
         xfrm_aevent_doreplay(x);
 
         if (esp->conf.ivlen)
-                crypto_cipher_set_iv(tfm, esp->conf.ivec, crypto_tfm_alg_ivsize(tfm));
+                crypto_blkcipher_set_iv(tfm, esp->conf.ivec, esp->conf.ivlen);
 
         do {
                 struct scatterlist *sg = &esp->sgbuf[0];
@@ -103,26 +107,27 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
                                 goto error;
                 }
                 skb_to_sgvec(skb, sg, esph->enc_data+esp->conf.ivlen-skb->data, clen);
-                crypto_cipher_encrypt(tfm, sg, sg, clen);
+                err = crypto_blkcipher_encrypt(&desc, sg, sg, clen);
                 if (unlikely(sg != &esp->sgbuf[0]))
                         kfree(sg);
         } while (0);
 
+        if (unlikely(err))
+                goto error;
+
         if (esp->conf.ivlen) {
-                memcpy(esph->enc_data, esp->conf.ivec, crypto_tfm_alg_ivsize(tfm));
-                crypto_cipher_get_iv(tfm, esp->conf.ivec, crypto_tfm_alg_ivsize(tfm));
+                memcpy(esph->enc_data, esp->conf.ivec, esp->conf.ivlen);
+                crypto_blkcipher_get_iv(tfm, esp->conf.ivec, esp->conf.ivlen);
         }
 
         if (esp->auth.icv_full_len) {
-                esp->auth.icv(esp, skb, (u8*)esph-skb->data,
-                              sizeof(struct ip_esp_hdr) + esp->conf.ivlen+clen, trailer->tail);
-                pskb_put(skb, trailer, alen);
+                err = esp_mac_digest(esp, skb, (u8 *)esph - skb->data,
+                                     sizeof(*esph) + esp->conf.ivlen + clen);
+                memcpy(pskb_put(skb, trailer, alen), esp->auth.work_icv, alen);
         }
 
         ip_send_check(top_iph);
 
-        err = 0;
-
 error:
         return err;
 }
@@ -137,8 +142,10 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
         struct iphdr *iph;
         struct ip_esp_hdr *esph;
         struct esp_data *esp = x->data;
+        struct crypto_blkcipher *tfm = esp->conf.tfm;
+        struct blkcipher_desc desc = { .tfm = tfm };
         struct sk_buff *trailer;
-        int blksize = ALIGN(crypto_tfm_alg_blocksize(esp->conf.tfm), 4);
+        int blksize = ALIGN(crypto_blkcipher_blocksize(tfm), 4);
         int alen = esp->auth.icv_trunc_len;
         int elen = skb->len - sizeof(struct ip_esp_hdr) - esp->conf.ivlen - alen;
         int nfrags;
@@ -146,6 +153,7 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
         u8 nexthdr[2];
         struct scatterlist *sg;
         int padlen;
+        int err;
 
         if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr)))
                 goto out;
@@ -155,15 +163,16 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
 
         /* If integrity check is required, do this. */
         if (esp->auth.icv_full_len) {
-                u8 sum[esp->auth.icv_full_len];
-                u8 sum1[alen];
-                
-                esp->auth.icv(esp, skb, 0, skb->len-alen, sum);
+                u8 sum[alen];
 
-                if (skb_copy_bits(skb, skb->len-alen, sum1, alen))
+                err = esp_mac_digest(esp, skb, 0, skb->len - alen);
+                if (err)
+                        goto out;
+
+                if (skb_copy_bits(skb, skb->len - alen, sum, alen))
                         BUG();
 
-                if (unlikely(memcmp(sum, sum1, alen))) {
+                if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) {
                         x->stats.integrity_failed++;
                         goto out;
                 }
@@ -178,7 +187,7 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
 
         /* Get ivec. This can be wrong, check against another impls. */
         if (esp->conf.ivlen)
-                crypto_cipher_set_iv(esp->conf.tfm, esph->enc_data, crypto_tfm_alg_ivsize(esp->conf.tfm));
+                crypto_blkcipher_set_iv(tfm, esph->enc_data, esp->conf.ivlen);
 
         sg = &esp->sgbuf[0];
 
@@ -188,9 +197,11 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
                         goto out;
         }
         skb_to_sgvec(skb, sg, sizeof(struct ip_esp_hdr) + esp->conf.ivlen, elen);
-        crypto_cipher_decrypt(esp->conf.tfm, sg, sg, elen);
+        err = crypto_blkcipher_decrypt(&desc, sg, sg, elen);
         if (unlikely(sg != &esp->sgbuf[0]))
                 kfree(sg);
+        if (unlikely(err))
+                return err;
 
         if (skb_copy_bits(skb, skb->len-alen-2, nexthdr, 2))
                 BUG();
@@ -254,7 +265,7 @@ out:
 static u32 esp4_get_max_size(struct xfrm_state *x, int mtu)
 {
         struct esp_data *esp = x->data;
-        u32 blksize = ALIGN(crypto_tfm_alg_blocksize(esp->conf.tfm), 4);
+        u32 blksize = ALIGN(crypto_blkcipher_blocksize(esp->conf.tfm), 4);
 
         if (x->props.mode) {
                 mtu = ALIGN(mtu + 2, blksize);
@@ -293,11 +304,11 @@ static void esp_destroy(struct xfrm_state *x)
         if (!esp)
                 return;
 
-        crypto_free_tfm(esp->conf.tfm);
+        crypto_free_blkcipher(esp->conf.tfm);
         esp->conf.tfm = NULL;
         kfree(esp->conf.ivec);
         esp->conf.ivec = NULL;
-        crypto_free_tfm(esp->auth.tfm);
+        crypto_free_hash(esp->auth.tfm);
         esp->auth.tfm = NULL;
         kfree(esp->auth.work_icv);
         esp->auth.work_icv = NULL;
@@ -307,6 +318,7 @@ static void esp_destroy(struct xfrm_state *x)
 static int esp_init_state(struct xfrm_state *x)
 {
         struct esp_data *esp = NULL;
+        struct crypto_blkcipher *tfm;
 
         /* null auth and encryption can have zero length keys */
         if (x->aalg) {
@@ -322,22 +334,27 @@ static int esp_init_state(struct xfrm_state *x)
 
         if (x->aalg) {
                 struct xfrm_algo_desc *aalg_desc;
+                struct crypto_hash *hash;
 
                 esp->auth.key = x->aalg->alg_key;
                 esp->auth.key_len = (x->aalg->alg_key_len+7)/8;
-                esp->auth.tfm = crypto_alloc_tfm(x->aalg->alg_name, 0);
-                if (esp->auth.tfm == NULL)
+                hash = crypto_alloc_hash(x->aalg->alg_name, 0,
+                                         CRYPTO_ALG_ASYNC);
+                if (IS_ERR(hash))
+                        goto error;
+
+                esp->auth.tfm = hash;
+                if (crypto_hash_setkey(hash, esp->auth.key, esp->auth.key_len))
                         goto error;
-                esp->auth.icv = esp_hmac_digest;
 
                 aalg_desc = xfrm_aalg_get_byname(x->aalg->alg_name, 0);
                 BUG_ON(!aalg_desc);
 
                 if (aalg_desc->uinfo.auth.icv_fullbits/8 !=
-                    crypto_tfm_alg_digestsize(esp->auth.tfm)) {
+                    crypto_hash_digestsize(hash)) {
                         NETDEBUG(KERN_INFO "ESP: %s digestsize %u != %hu\n",
                                  x->aalg->alg_name,
-                                 crypto_tfm_alg_digestsize(esp->auth.tfm),
+                                 crypto_hash_digestsize(hash),
                                  aalg_desc->uinfo.auth.icv_fullbits/8);
                         goto error;
                 }
@@ -351,13 +368,11 @@ static int esp_init_state(struct xfrm_state *x)
         }
         esp->conf.key = x->ealg->alg_key;
         esp->conf.key_len = (x->ealg->alg_key_len+7)/8;
-        if (x->props.ealgo == SADB_EALG_NULL)
-                esp->conf.tfm = crypto_alloc_tfm(x->ealg->alg_name, CRYPTO_TFM_MODE_ECB);
-        else
-                esp->conf.tfm = crypto_alloc_tfm(x->ealg->alg_name, CRYPTO_TFM_MODE_CBC);
-        if (esp->conf.tfm == NULL)
+        tfm = crypto_alloc_blkcipher(x->ealg->alg_name, 0, CRYPTO_ALG_ASYNC);
+        if (IS_ERR(tfm))
                 goto error;
-        esp->conf.ivlen = crypto_tfm_alg_ivsize(esp->conf.tfm);
+        esp->conf.tfm = tfm;
+        esp->conf.ivlen = crypto_blkcipher_ivsize(tfm);
         esp->conf.padlen = 0;
         if (esp->conf.ivlen) {
                 esp->conf.ivec = kmalloc(esp->conf.ivlen, GFP_KERNEL);
@@ -365,7 +380,7 @@ static int esp_init_state(struct xfrm_state *x)
                         goto error;
                 get_random_bytes(esp->conf.ivec, esp->conf.ivlen);
         }
-        if (crypto_cipher_setkey(esp->conf.tfm, esp->conf.key, esp->conf.key_len))
+        if (crypto_blkcipher_setkey(tfm, esp->conf.key, esp->conf.key_len))
                 goto error;
         x->props.header_len = sizeof(struct ip_esp_hdr) + esp->conf.ivlen;
         if (x->props.mode)