Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3a79227 authored by Herbert Xu's avatar Herbert Xu
Browse files

staging: rtl8192u: Use skcipher and ahash 



This patch replaces uses of blkcipher with skcipher, and the long
obsolete hash interface with ahash.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a60b7faf

drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c

+51 −41
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 


#include "ieee80211.h"



#include <linux/crypto.h>

#include <crypto/hash.h>

#include <crypto/skcipher.h>

	#include <linux/scatterlist.h>

#include <linux/crc32.h>
@@ -52,10 +53,10 @@ struct ieee80211_tkip_data { 


	int key_idx;



	struct crypto_blkcipher *rx_tfm_arc4;

	struct crypto_hash *rx_tfm_michael;

	struct crypto_blkcipher *tx_tfm_arc4;

	struct crypto_hash *tx_tfm_michael;

	struct crypto_skcipher *rx_tfm_arc4;

	struct crypto_ahash *rx_tfm_michael;

	struct crypto_skcipher *tx_tfm_arc4;

	struct crypto_ahash *tx_tfm_michael;



	/* scratch buffers for virt_to_page() (crypto API) */

	u8 rx_hdr[16], tx_hdr[16];
@@ -70,7 +71,7 @@ static void *ieee80211_tkip_init(int key_idx) 
		goto fail;

	priv->key_idx = key_idx;



	priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,

	priv->tx_tfm_arc4 = crypto_alloc_skcipher("ecb(arc4)", 0,

			CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->tx_tfm_arc4)) {

		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
@@ -79,7 +80,7 @@ static void *ieee80211_tkip_init(int key_idx) 
		goto fail;

	}



	priv->tx_tfm_michael = crypto_alloc_hash("michael_mic", 0,

	priv->tx_tfm_michael = crypto_alloc_ahash("michael_mic", 0,

			CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->tx_tfm_michael)) {

		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
@@ -88,7 +89,7 @@ static void *ieee80211_tkip_init(int key_idx) 
		goto fail;

	}



	priv->rx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,

	priv->rx_tfm_arc4 = crypto_alloc_skcipher("ecb(arc4)", 0,

			CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->rx_tfm_arc4)) {

		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
@@ -97,7 +98,7 @@ static void *ieee80211_tkip_init(int key_idx) 
		goto fail;

	}



	priv->rx_tfm_michael = crypto_alloc_hash("michael_mic", 0,

	priv->rx_tfm_michael = crypto_alloc_ahash("michael_mic", 0,

			CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->rx_tfm_michael)) {

		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
@@ -110,14 +111,10 @@ static void *ieee80211_tkip_init(int key_idx) 


fail:

	if (priv) {

		if (priv->tx_tfm_michael)

			crypto_free_hash(priv->tx_tfm_michael);

		if (priv->tx_tfm_arc4)

			crypto_free_blkcipher(priv->tx_tfm_arc4);

		if (priv->rx_tfm_michael)

			crypto_free_hash(priv->rx_tfm_michael);

		if (priv->rx_tfm_arc4)

			crypto_free_blkcipher(priv->rx_tfm_arc4);

		crypto_free_ahash(priv->tx_tfm_michael);

		crypto_free_skcipher(priv->tx_tfm_arc4);

		crypto_free_ahash(priv->rx_tfm_michael);

		crypto_free_skcipher(priv->rx_tfm_arc4);

		kfree(priv);

	}
@@ -130,14 +127,10 @@ static void ieee80211_tkip_deinit(void *priv) 
	struct ieee80211_tkip_data *_priv = priv;



	if (_priv) {

		if (_priv->tx_tfm_michael)

			crypto_free_hash(_priv->tx_tfm_michael);

		if (_priv->tx_tfm_arc4)

			crypto_free_blkcipher(_priv->tx_tfm_arc4);

		if (_priv->rx_tfm_michael)

			crypto_free_hash(_priv->rx_tfm_michael);

		if (_priv->rx_tfm_arc4)

			crypto_free_blkcipher(_priv->rx_tfm_arc4);

		crypto_free_ahash(_priv->tx_tfm_michael);

		crypto_free_skcipher(_priv->tx_tfm_arc4);

		crypto_free_ahash(_priv->rx_tfm_michael);

		crypto_free_skcipher(_priv->rx_tfm_arc4);

	}

	kfree(priv);

}
@@ -312,7 +305,6 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	u8 *pos;

	struct rtl_80211_hdr_4addr *hdr;

	cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);

	struct blkcipher_desc desc = {.tfm = tkey->tx_tfm_arc4};

	int ret = 0;

	u8 rc4key[16],  *icv;

	u32 crc;
@@ -357,15 +349,21 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	*pos++ = (tkey->tx_iv32 >> 24) & 0xff;



	if (!tcb_desc->bHwSec) {

		SKCIPHER_REQUEST_ON_STACK(req, tkey->tx_tfm_arc4);



		icv = skb_put(skb, 4);

		crc = ~crc32_le(~0, pos, len);

		icv[0] = crc;

		icv[1] = crc >> 8;

		icv[2] = crc >> 16;

		icv[3] = crc >> 24;

		crypto_blkcipher_setkey(tkey->tx_tfm_arc4, rc4key, 16);

		crypto_skcipher_setkey(tkey->tx_tfm_arc4, rc4key, 16);

		sg_init_one(&sg, pos, len+4);

		ret = crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4);

		skcipher_request_set_tfm(req, tkey->tx_tfm_arc4);

		skcipher_request_set_callback(req, 0, NULL, NULL);

		skcipher_request_set_crypt(req, &sg, &sg, len + 4, NULL);

		ret = crypto_skcipher_encrypt(req);

		skcipher_request_zero(req);

	}



	tkey->tx_iv16++;
@@ -390,12 +388,12 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	u16 iv16;

	struct rtl_80211_hdr_4addr *hdr;

	cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);

	struct blkcipher_desc desc = {.tfm = tkey->rx_tfm_arc4};

	u8 rc4key[16];

	u8 icv[4];

	u32 crc;

	struct scatterlist sg;

	int plen;

	int err;



	if (skb->len < hdr_len + 8 + 4)

		return -1;
@@ -429,6 +427,8 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	pos += 8;



	if (!tcb_desc->bHwSec) {

		SKCIPHER_REQUEST_ON_STACK(req, tkey->rx_tfm_arc4);



		if (iv32 < tkey->rx_iv32 ||

		(iv32 == tkey->rx_iv32 && iv16 <= tkey->rx_iv16)) {

			if (net_ratelimit()) {
@@ -449,10 +449,16 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 


		plen = skb->len - hdr_len - 12;



		crypto_blkcipher_setkey(tkey->rx_tfm_arc4, rc4key, 16);

		crypto_skcipher_setkey(tkey->rx_tfm_arc4, rc4key, 16);

		sg_init_one(&sg, pos, plen+4);



		if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) {

		skcipher_request_set_tfm(req, tkey->rx_tfm_arc4);

		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) {

			if (net_ratelimit()) {

				printk(KERN_DEBUG ": TKIP: failed to decrypt "

						"received packet from %pM\n",
@@ -501,11 +507,12 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	return keyidx;

}



static int michael_mic(struct crypto_hash *tfm_michael, u8 *key, u8 *hdr,

static int michael_mic(struct crypto_ahash *tfm_michael, u8 *key, u8 *hdr,

		       u8 *data, size_t data_len, u8 *mic)

{

	struct hash_desc desc;

	AHASH_REQUEST_ON_STACK(req, tfm_michael);

	struct scatterlist sg[2];

	int err;



	if (tfm_michael == NULL) {

		printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n");
@@ -516,12 +523,15 @@ static int michael_mic(struct crypto_hash *tfm_michael, u8 *key, u8 *hdr, 
	sg_set_buf(&sg[0], hdr, 16);

	sg_set_buf(&sg[1], data, data_len);



	if (crypto_hash_setkey(tfm_michael, key, 8))

	if (crypto_ahash_setkey(tfm_michael, key, 8))

		return -1;



	desc.tfm = tfm_michael;

	desc.flags = 0;

	return crypto_hash_digest(&desc, sg, data_len + 16, mic);

	ahash_request_set_tfm(req, tfm_michael);

	ahash_request_set_callback(req, 0, NULL, NULL);

	ahash_request_set_crypt(req, sg, mic, data_len + 16);

	err = crypto_ahash_digest(req);

	ahash_request_zero(req);

	return err;

}



static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr)
@@ -660,10 +670,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_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;

	struct crypto_ahash *tfm = tkey->tx_tfm_michael;

	struct crypto_skcipher *tfm2 = tkey->tx_tfm_arc4;

	struct crypto_ahash *tfm3 = tkey->rx_tfm_michael;

	struct crypto_skcipher *tfm4 = tkey->rx_tfm_arc4;



	keyidx = tkey->key_idx;

	memset(tkey, 0, sizeof(*tkey));

drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c

+30 −16
Original line number Diff line number Diff line
@@ -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);