Merge remote-tracking branch 'jc_docs/docs-next'

[karo-tx-linux.git] / drivers / staging / rtl8192u / ieee80211 / ieee80211_crypt_wep.c

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c
index 681611dc93d39c9c070af9c63e401365fda48653..ababb6de125bf12c6ae16b63a0ce82be943e6e92 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c
@@ -18,7 +18,7 @@
 
 #include "ieee80211.h"
 
-#include <linux/crypto.h>
+#include <crypto/skcipher.h>
 #include <linux/scatterlist.h>
 #include <linux/crc32.h>
 
@@ -32,8 +32,8 @@ struct prism2_wep_data {
        u8 key[WEP_KEY_LEN + 1];
        u8 key_len;
        u8 key_idx;
-       struct crypto_blkcipher *tx_tfm;
-       struct crypto_blkcipher *rx_tfm;
+       struct crypto_skcipher *tx_tfm;
+       struct crypto_skcipher *rx_tfm;
 };
 
 
@@ -46,10 +46,10 @@ static void *prism2_wep_init(int keyidx)
                return NULL;
        priv->key_idx = keyidx;
 
-       priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
+       priv->tx_tfm = crypto_alloc_skcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
        if (IS_ERR(priv->tx_tfm))
                goto free_priv;
-       priv->rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
+       priv->rx_tfm = crypto_alloc_skcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
        if (IS_ERR(priv->rx_tfm))
                goto free_tx;
 
@@ -58,7 +58,7 @@ static void *prism2_wep_init(int keyidx)
 
        return priv;
 free_tx:
-       crypto_free_blkcipher(priv->tx_tfm);
+       crypto_free_skcipher(priv->tx_tfm);
 free_priv:
        kfree(priv);
        return NULL;
@@ -70,10 +70,8 @@ static void prism2_wep_deinit(void *priv)
        struct prism2_wep_data *_priv = priv;
 
        if (_priv) {
-               if (_priv->tx_tfm)
-                       crypto_free_blkcipher(_priv->tx_tfm);
-               if (_priv->rx_tfm)
-                       crypto_free_blkcipher(_priv->rx_tfm);
+               crypto_free_skcipher(_priv->tx_tfm);
+               crypto_free_skcipher(_priv->rx_tfm);
        }
        kfree(priv);
 }
@@ -91,10 +89,10 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
        u8 key[WEP_KEY_LEN + 3];
        u8 *pos;
        cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
-       struct blkcipher_desc desc = {.tfm = wep->tx_tfm};
        u32 crc;
        u8 *icv;
        struct scatterlist sg;
+       int err;
 
        if (skb_headroom(skb) < 4 || skb_tailroom(skb) < 4 ||
            skb->len < hdr_len)
@@ -129,6 +127,8 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
        memcpy(key + 3, wep->key, wep->key_len);
 
        if (!tcb_desc->bHwSec) {
+               SKCIPHER_REQUEST_ON_STACK(req, wep->tx_tfm);
+
                /* Append little-endian CRC32 and encrypt it to produce ICV */
                crc = ~crc32_le(~0, pos, len);
                icv = skb_put(skb, 4);
@@ -137,10 +137,16 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
                icv[2] = crc >> 16;
                icv[3] = crc >> 24;
 
-               crypto_blkcipher_setkey(wep->tx_tfm, key, klen);
+               crypto_skcipher_setkey(wep->tx_tfm, key, klen);
                sg_init_one(&sg, pos, len+4);
 
-               return crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4);
+               skcipher_request_set_tfm(req, wep->tx_tfm);
+               skcipher_request_set_callback(req, 0, NULL, NULL);
+               skcipher_request_set_crypt(req, &sg, &sg, len + 4, NULL);
+
+               err = crypto_skcipher_encrypt(req);
+               skcipher_request_zero(req);
+               return err;
        }
 
        return 0;
@@ -161,10 +167,10 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
        u8 key[WEP_KEY_LEN + 3];
        u8 keyidx, *pos;
        cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
-       struct blkcipher_desc desc = {.tfm = wep->rx_tfm};
        u32 crc;
        u8 icv[4];
        struct scatterlist sg;
+       int err;
 
        if (skb->len < hdr_len + 8)
                return -1;
@@ -186,10 +192,18 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
        plen = skb->len - hdr_len - 8;
 
        if (!tcb_desc->bHwSec) {
-               crypto_blkcipher_setkey(wep->rx_tfm, key, klen);
+               SKCIPHER_REQUEST_ON_STACK(req, wep->rx_tfm);
+
+               crypto_skcipher_setkey(wep->rx_tfm, key, klen);
                sg_init_one(&sg, pos, plen+4);
 
-               if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4))
+               skcipher_request_set_tfm(req, wep->rx_tfm);
+               skcipher_request_set_callback(req, 0, NULL, NULL);
+               skcipher_request_set_crypt(req, &sg, &sg, plen + 4, NULL);
+
+               err = crypto_skcipher_decrypt(req);
+               skcipher_request_zero(req);
+               if (err)
                        return -7;
 
                crc = ~crc32_le(~0, pos, plen);