Merge branch 'master' into upstream

Conflicts:

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

3 files changed, 82 insertions, 85 deletions

diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c
index 098c66846339..35aa3426c3fa 100644
--- a/net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -9,6 +9,7 @@
  * more details.
  */
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -48,7 +49,7 @@ struct ieee80211_ccmp_data {
 
         int key_idx;
 
-        struct crypto_tfm *tfm;
+        struct crypto_cipher *tfm;
 
         /* scratch buffers for virt_to_page() (crypto API) */
         u8 tx_b0[AES_BLOCK_LEN], tx_b[AES_BLOCK_LEN],
@@ -56,20 +57,10 @@ struct ieee80211_ccmp_data {
         u8 rx_b0[AES_BLOCK_LEN], rx_b[AES_BLOCK_LEN], rx_a[AES_BLOCK_LEN];
 };
 
-static void ieee80211_ccmp_aes_encrypt(struct crypto_tfm *tfm,
-                                       const u8 pt[16], u8 ct[16])
+static inline void ieee80211_ccmp_aes_encrypt(struct crypto_cipher *tfm,
+                                              const u8 pt[16], u8 ct[16])
 {
-        struct scatterlist src, dst;
-
-        src.page = virt_to_page(pt);
-        src.offset = offset_in_page(pt);
-        src.length = AES_BLOCK_LEN;
-
-        dst.page = virt_to_page(ct);
-        dst.offset = offset_in_page(ct);
-        dst.length = AES_BLOCK_LEN;
-
-        crypto_cipher_encrypt(tfm, &dst, &src, AES_BLOCK_LEN);
+        crypto_cipher_encrypt_one(tfm, ct, pt);
 }
 
 static void *ieee80211_ccmp_init(int key_idx)
@@ -81,10 +72,11 @@ static void *ieee80211_ccmp_init(int key_idx)
                 goto fail;
         priv->key_idx = key_idx;
 
-        priv->tfm = crypto_alloc_tfm("aes", 0);
-        if (priv->tfm == NULL) {
+        priv->tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
+        if (IS_ERR(priv->tfm)) {
                 printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate "
                        "crypto API aes\n");
+                priv->tfm = NULL;
                 goto fail;
         }
 
@@ -93,7 +85,7 @@ static void *ieee80211_ccmp_init(int key_idx)
       fail:
         if (priv) {
                 if (priv->tfm)
-                        crypto_free_tfm(priv->tfm);
+                        crypto_free_cipher(priv->tfm);
                 kfree(priv);
         }
 
@@ -104,7 +96,7 @@ static void ieee80211_ccmp_deinit(void *priv)
 {
         struct ieee80211_ccmp_data *_priv = priv;
         if (_priv && _priv->tfm)
-                crypto_free_tfm(_priv->tfm);
+                crypto_free_cipher(_priv->tfm);
         kfree(priv);
 }
 
@@ -115,7 +107,7 @@ static inline void xor_block(u8 * b, u8 * a, size_t len)
                 b[i] ^= a[i];
 }
 
-static void ccmp_init_blocks(struct crypto_tfm *tfm,
+static void ccmp_init_blocks(struct crypto_cipher *tfm,
                              struct ieee80211_hdr_4addr *hdr,
                              u8 * pn, size_t dlen, u8 * b0, u8 * auth, u8 * s0)
 {
@@ -398,7 +390,7 @@ static int ieee80211_ccmp_set_key(void *key, int len, u8 * seq, void *priv)
 {
         struct ieee80211_ccmp_data *data = priv;
         int keyidx;
-        struct crypto_tfm *tfm = data->tfm;
+        struct crypto_cipher *tfm = data->tfm;
 
         keyidx = data->key_idx;
         memset(data, 0, sizeof(*data));
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
index f2df2f5b3e4c..259572dfd4f1 100644
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -9,6 +9,7 @@
  * more details.
  */
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -52,10 +53,10 @@ struct ieee80211_tkip_data {
 
         int key_idx;
 
-        struct crypto_tfm *tx_tfm_arc4;
-        struct crypto_tfm *tx_tfm_michael;
-        struct crypto_tfm *rx_tfm_arc4;
-        struct crypto_tfm *rx_tfm_michael;
+        struct crypto_blkcipher *rx_tfm_arc4;
+        struct crypto_hash *rx_tfm_michael;
+        struct crypto_blkcipher *tx_tfm_arc4;
+        struct crypto_hash *tx_tfm_michael;
 
         /* scratch buffers for virt_to_page() (crypto API) */
         u8 rx_hdr[16], tx_hdr[16];
@@ -87,31 +88,37 @@ static void *ieee80211_tkip_init(int key_idx)
 
         priv->key_idx = key_idx;
 
-        priv->tx_tfm_arc4 = crypto_alloc_tfm("arc4", 0);
-        if (priv->tx_tfm_arc4 == NULL) {
+        priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,
+                                                CRYPTO_ALG_ASYNC);
+        if (IS_ERR(priv->tx_tfm_arc4)) {
                 printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
                        "crypto API arc4\n");
+                priv->tfm_arc4 = NULL;
                 goto fail;
         }
 
-        priv->tx_tfm_michael = crypto_alloc_tfm("michael_mic", 0);
-        if (priv->tx_tfm_michael == NULL) {
+        priv->tx_tfm_michael = crypto_alloc_hash("michael_mic", 0,
+                                                 CRYPTO_ALG_ASYNC);
+        if (IS_ERR(priv->tx_tfm_michael)) {
                 printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
                        "crypto API michael_mic\n");
                 goto fail;
         }
 
-        priv->rx_tfm_arc4 = crypto_alloc_tfm("arc4", 0);
-        if (priv->rx_tfm_arc4 == NULL) {
+        priv->rx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,
+                                                CRYPTO_ALG_ASYNC);
+        if (IS_ERR(priv->rx_tfm_arc4)) {
                 printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
                        "crypto API arc4\n");
                 goto fail;
         }
 
-        priv->rx_tfm_michael = crypto_alloc_tfm("michael_mic", 0);
-        if (priv->rx_tfm_michael == NULL) {
+        priv->rx_tfm_michael = crypto_alloc_hash("michael_mic", 0,
+                                                 CRYPTO_ALG_ASYNC);
+        if (IS_ERR(priv->rx_tfm_michael)) {
                 printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
                        "crypto API michael_mic\n");
+                priv->tfm_michael = NULL;
                 goto fail;
         }
 
@@ -120,13 +127,13 @@ static void *ieee80211_tkip_init(int key_idx)
       fail:
         if (priv) {
                 if (priv->tx_tfm_michael)
-                        crypto_free_tfm(priv->tx_tfm_michael);
+                        crypto_free_hash(priv->tx_tfm_michael);
                 if (priv->tx_tfm_arc4)
-                        crypto_free_tfm(priv->tx_tfm_arc4);
+                        crypto_free_blkcipher(priv->tx_tfm_arc4);
                 if (priv->rx_tfm_michael)
-                        crypto_free_tfm(priv->rx_tfm_michael);
+                        crypto_free_hash(priv->rx_tfm_michael);
                 if (priv->rx_tfm_arc4)
-                        crypto_free_tfm(priv->rx_tfm_arc4);
+                        crypto_free_blkcipher(priv->rx_tfm_arc4);
                 kfree(priv);
         }
 
@@ -138,13 +145,13 @@ static void ieee80211_tkip_deinit(void *priv)
         struct ieee80211_tkip_data *_priv = priv;
         if (_priv) {
                 if (_priv->tx_tfm_michael)
-                        crypto_free_tfm(_priv->tx_tfm_michael);
+                        crypto_free_hash(_priv->tx_tfm_michael);
                 if (_priv->tx_tfm_arc4)
-                        crypto_free_tfm(_priv->tx_tfm_arc4);
+                        crypto_free_blkcipher(_priv->tx_tfm_arc4);
                 if (_priv->rx_tfm_michael)
-                        crypto_free_tfm(_priv->rx_tfm_michael);
+                        crypto_free_hash(_priv->rx_tfm_michael);
                 if (_priv->rx_tfm_arc4)
-                        crypto_free_tfm(_priv->rx_tfm_arc4);
+                        crypto_free_blkcipher(_priv->rx_tfm_arc4);
         }
         kfree(priv);
 }
@@ -344,6 +351,7 @@ static int ieee80211_tkip_hdr(struct sk_buff *skb, int hdr_len,
 static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
 {
         struct ieee80211_tkip_data *tkey = priv;
+        struct blkcipher_desc desc = { .tfm = tkey->tx_tfm_arc4 };
         int len;
         u8 rc4key[16], *pos, *icv;
         u32 crc;
@@ -377,31 +385,17 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
         icv[2] = crc >> 16;
         icv[3] = crc >> 24;
 
-        crypto_cipher_setkey(tkey->tx_tfm_arc4, rc4key, 16);
+        crypto_blkcipher_setkey(tkey->tx_tfm_arc4, rc4key, 16);
         sg.page = virt_to_page(pos);
         sg.offset = offset_in_page(pos);
         sg.length = len + 4;
-        crypto_cipher_encrypt(tkey->tx_tfm_arc4, &sg, &sg, len + 4);
-
-        return 0;
-}
-
-/*
- * deal with seq counter wrapping correctly.
- * refer to timer_after() for jiffies wrapping handling
- */
-static inline int tkip_replay_check(u32 iv32_n, u16 iv16_n,
-                                    u32 iv32_o, u16 iv16_o)
-{
-        if ((s32)iv32_n - (s32)iv32_o < 0 ||
-            (iv32_n == iv32_o && iv16_n <= iv16_o))
-                return 1;
-        return 0;
+        return crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4);
 }
 
 static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 {
         struct ieee80211_tkip_data *tkey = priv;
+        struct blkcipher_desc desc = { .tfm = tkey->rx_tfm_arc4 };
         u8 rc4key[16];
         u8 keyidx, *pos;
         u32 iv32;
@@ -472,11 +466,18 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
         plen = skb->len - hdr_len - 12;
 
-        crypto_cipher_setkey(tkey->rx_tfm_arc4, rc4key, 16);
+        crypto_blkcipher_setkey(tkey->rx_tfm_arc4, rc4key, 16);
         sg.page = virt_to_page(pos);
         sg.offset = offset_in_page(pos);
         sg.length = plen + 4;
-        crypto_cipher_decrypt(tkey->rx_tfm_arc4, &sg, &sg, plen + 4);
+        if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG ": TKIP: failed to decrypt "
+                               "received packet from " MAC_FMT "\n",
+                               MAC_ARG(hdr->addr2));
+                }
+                return -7;
+        }
 
         crc = ~crc32_le(~0, pos, plen);
         icv[0] = crc;
@@ -510,9 +511,10 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         return keyidx;
 }
 
-static int michael_mic(struct crypto_tfm *tfm_michael, u8 * key, u8 * hdr,
+static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr,
                        u8 * data, size_t data_len, u8 * mic)
 {
+        struct hash_desc desc;
         struct scatterlist sg[2];
 
         if (tfm_michael == NULL) {
@@ -527,12 +529,12 @@ static int michael_mic(struct crypto_tfm *tfm_michael, u8 * key, u8 * hdr,
         sg[1].offset = offset_in_page(data);
         sg[1].length = data_len;
 
-        crypto_digest_init(tfm_michael);
-        crypto_digest_setkey(tfm_michael, key, 8);
-        crypto_digest_update(tfm_michael, sg, 2);
-        crypto_digest_final(tfm_michael, mic);
+        if (crypto_hash_setkey(tfm_michael, key, 8))
+                return -1;
 
-        return 0;
+        desc.tfm = tfm_michael;
+        desc.flags = 0;
+        return crypto_hash_digest(&desc, sg, data_len + 16, mic);
 }
 
 static void michael_mic_hdr(struct sk_buff *skb, u8 * hdr)
@@ -656,10 +658,10 @@ static int ieee80211_tkip_set_key(void *key, int len, u8 * seq, void *priv)
 {
         struct ieee80211_tkip_data *tkey = priv;
         int keyidx;
-        struct crypto_tfm *tfm = tkey->tx_tfm_michael;
-        struct crypto_tfm *tfm2 = tkey->tx_tfm_arc4;
-        struct crypto_tfm *tfm3 = tkey->rx_tfm_michael;
-        struct crypto_tfm *tfm4 = tkey->rx_tfm_arc4;
+        struct crypto_hash *tfm = tkey->tx_tfm_michael;
+        struct crypto_blkcipher *tfm2 = tkey->tx_tfm_arc4;
+        struct crypto_hash *tfm3 = tkey->rx_tfm_michael;
+        struct crypto_blkcipher *tfm4 = tkey->rx_tfm_arc4;
 
         keyidx = tkey->key_idx;
         memset(tkey, 0, sizeof(*tkey));
diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c
index b435b28857ed..9eeec13c28b0 100644
--- a/net/ieee80211/ieee80211_crypt_wep.c
+++ b/net/ieee80211/ieee80211_crypt_wep.c
@@ -9,6 +9,7 @@
  * more details.
  */
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -32,8 +33,8 @@ struct prism2_wep_data {
         u8 key[WEP_KEY_LEN + 1];
         u8 key_len;
         u8 key_idx;
-        struct crypto_tfm *tx_tfm;
-        struct crypto_tfm *rx_tfm;
+        struct crypto_blkcipher *tx_tfm;
+        struct crypto_blkcipher *rx_tfm;
 };
 
 static void *prism2_wep_init(int keyidx)
@@ -45,15 +46,16 @@ static void *prism2_wep_init(int keyidx)
                 goto fail;
         priv->key_idx = keyidx;
 
-        priv->tx_tfm = crypto_alloc_tfm("arc4", 0);
-        if (priv->tx_tfm == NULL) {
+        priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
+        if (IS_ERR(priv->tx_tfm)) {
                 printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
                        "crypto API arc4\n");
+                priv->tfm = NULL;
                 goto fail;
         }
 
-        priv->rx_tfm = crypto_alloc_tfm("arc4", 0);
-        if (priv->rx_tfm == NULL) {
+        priv->rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
+        if (IS_ERR(priv->rx_tfm)) {
                 printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
                        "crypto API arc4\n");
                 goto fail;
@@ -66,9 +68,9 @@ static void *prism2_wep_init(int keyidx)
       fail:
         if (priv) {
                 if (priv->tx_tfm)
-                        crypto_free_tfm(priv->tx_tfm);
+                        crypto_free_blkcipher(priv->tx_tfm);
                 if (priv->rx_tfm)
-                        crypto_free_tfm(priv->rx_tfm);
+                        crypto_free_blkcipher(priv->rx_tfm);
                 kfree(priv);
         }
         return NULL;
@@ -79,9 +81,9 @@ static void prism2_wep_deinit(void *priv)
         struct prism2_wep_data *_priv = priv;
         if (_priv) {
                 if (_priv->tx_tfm)
-                        crypto_free_tfm(_priv->tx_tfm);
+                        crypto_free_blkcipher(_priv->tx_tfm);
                 if (_priv->rx_tfm)
-                        crypto_free_tfm(_priv->rx_tfm);
+                        crypto_free_blkcipher(_priv->rx_tfm);
         }
         kfree(priv);
 }
@@ -133,6 +135,7 @@ static int prism2_wep_build_iv(struct sk_buff *skb, int hdr_len,
 static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
 {
         struct prism2_wep_data *wep = priv;
+        struct blkcipher_desc desc = { .tfm = wep->tx_tfm };
         u32 crc, klen, len;
         u8 *pos, *icv;
         struct scatterlist sg;
@@ -164,13 +167,11 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
         icv[2] = crc >> 16;
         icv[3] = crc >> 24;
 
-        crypto_cipher_setkey(wep->tx_tfm, key, klen);
+        crypto_blkcipher_setkey(wep->tx_tfm, key, klen);
         sg.page = virt_to_page(pos);
         sg.offset = offset_in_page(pos);
         sg.length = len + 4;
-        crypto_cipher_encrypt(wep->tx_tfm, &sg, &sg, len + 4);
-
-        return 0;
+        return crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4);
 }
 
 /* Perform WEP decryption on given buffer. Buffer includes whole WEP part of
@@ -183,6 +184,7 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
 static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 {
         struct prism2_wep_data *wep = priv;
+        struct blkcipher_desc desc = { .tfm = wep->rx_tfm };
         u32 crc, klen, plen;
         u8 key[WEP_KEY_LEN + 3];
         u8 keyidx, *pos, icv[4];
@@ -207,11 +209,12 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         /* Apply RC4 to data and compute CRC32 over decrypted data */
         plen = skb->len - hdr_len - 8;
 
-        crypto_cipher_setkey(wep->rx_tfm, key, klen);
+        crypto_blkcipher_setkey(wep->rx_tfm, key, klen);
         sg.page = virt_to_page(pos);
         sg.offset = offset_in_page(pos);
         sg.length = plen + 4;
-        crypto_cipher_decrypt(wep->rx_tfm, &sg, &sg, plen + 4);
+        if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4))
+                return -7;
 
         crc = ~crc32_le(~0, pos, plen);
         icv[0] = crc;