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

Commit d0833a6a authored by Andriy Tkachuk's avatar Andriy Tkachuk Committed by John W. Linville
Browse files

lib80211: Cosmetics - make room for MIC/CRC near the actual calculation 



Signed-off-by: default avatarAndriy V. Tkachuk <andrit@ukr.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ab5132a2

net/wireless/lib80211_crypt_ccmp.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ static int lib80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) 
		return -1;



	pos = skb->data + hdr_len + CCMP_HDR_LEN;

	mic = skb_put(skb, CCMP_MIC_LEN);

	hdr = (struct ieee80211_hdr *)skb->data;

	ccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);
@@ -257,6 +256,7 @@ static int lib80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) 
		pos += len;

	}



	mic = skb_put(skb, CCMP_MIC_LEN);

	for (i = 0; i < CCMP_MIC_LEN; i++)

		mic[i] = b[i] ^ s0[i];

net/wireless/lib80211_crypt_tkip.c

+1 −2
Original line number Diff line number Diff line
@@ -384,9 +384,8 @@ static int lib80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	if ((lib80211_tkip_hdr(skb, hdr_len, rc4key, 16, priv)) < 0)

		return -1;



	icv = skb_put(skb, 4);



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

	icv = skb_put(skb, 4);

	icv[0] = crc;

	icv[1] = crc >> 8;

	icv[2] = crc >> 16;