Skip to contentSkip to conversation

d80211: Fix TKIP phase1 key mixing for hwcrypto

RFC PATCH In review Michael Buesch 4 participants 9 messages Feb 3, 2007 – Feb 8, 2007 Networking

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 d80211: Fix TKIP phase1 key mixing for hwcrypto

This patch is not runtime tested, as I did not implement tkip support in bcm43xx, yet.

--

This fixes TKIP phase1 key mixing for hwcrypto on BigEndian platforms.
Casting an u8 array to u16* is wrong and will only work on le platforms.
Make it explicit and expect an u8* parameter for ieee80211_tkip_gen_phase1key(). The function will take care to return an u8 array, instead of an u16 array, as that's what drivers assume.

net/d80211/tkip.c +7 -2
Index: bu3sch-wireless-dev/net/d80211/tkip.c
===================================================================
@@ -192,10 +192,15 @@ u8 * ieee80211_tkip_add_iv(u8 *pos, stru
 
 
 void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
-				  u16 *phase1key)
+				  u8 *phase1key)
 {
+	__le16 *k = (__le16 *)phase1key;
+	int i;
+
 	tkip_mixing_phase1(ta, &key->key[ALG_TKIP_TEMP_ENCR_KEY],
-			   key->u.tkip.iv32, phase1key);
+			   key->u.tkip.iv32, (u16 *)k);
+	for (i = 0; i < 5; i++)
+		k[i] = cpu_to_le16(k[i]);
 }
 
 void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,
net/d80211/tkip.h +1 -1
Index: bu3sch-wireless-dev/net/d80211/tkip.h
===================================================================
@@ -16,7 +16,7 @@
 u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
 			   u8 iv0, u8 iv1, u8 iv2);
 void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
-				  u16 *phase1key);
+				  u8 *phase1key);
 void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,
 			       u8 *rc4key);
 void ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm,
net/d80211/wpa.c +1 -1
Index: bu3sch-wireless-dev/net/d80211/wpa.c
===================================================================
@@ -349,7 +349,7 @@ skip_iv_inc:
 			if (key->u.tkip.iv16 == 0 ||
 			    !key->u.tkip.tx_initialized) {
 				ieee80211_tkip_gen_phase1key(key, hdr->addr2,
-					    (u16 *)tx->u.tx.control->tkip_key);
+					tx->u.tx.control->tkip_key);
 				key->u.tkip.tx_initialized = 1;
 				tx->u.tx.control->flags |=
 					    IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY;
Signature · 1 line
Greetings Michael.
#1 lore raw
Quoted 6 lines · Michael Buesch
net/d80211/tkip.c +1 -1
@@ -192,10 +192,15 @@ u8 * ieee80211_tkip_add_iv(u8 *pos, stru
 
 
 void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
-				  u16 *phase1key)
+				  u8 *phase1key)

net/d80211/tkip.c u8 * ieee80211_tkip_add_iv(u8 *pos, stru · line 204

Quoted 10 lines
net/d80211/tkip.c +6 -1
 {
+	__le16 *k = (__le16 *)phase1key;
+	int i;
+
 	tkip_mixing_phase1(ta, &key->key[ALG_TKIP_TEMP_ENCR_KEY],
-			   key->u.tkip.iv32, phase1key);
+			   key->u.tkip.iv32, (u16 *)k);
+	for (i = 0; i < 5; i++)
+		k[i] = cpu_to_le16(k[i]);
 }

Maybe a slightly better type checking but still looks ugly:

@@ -192,10 +192,16 @@ u8 * ieee80211_tkip_add_iv(u8 *pos, stru

void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
- u16 *phase1key)
+ u8 *phase1key)
{
+ u16 *tmp_result = (u16 *)phase1key;
+ __le16 *k = (__le16 *)phase1key;
+ int i;
+
tkip_mixing_phase1(ta, &key->key[ALG_TKIP_TEMP_ENCR_KEY],
- key->u.tkip.iv32, phase1key);
+ key->u.tkip.iv32, tmp_result);
+ for (i = 0; i < 5; i++)
+ k[i] = cpu_to_le16(tmp_result[i]);
}

void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,

Moreover, I'm not sure if GCC is able to optimize out the for loop in this case :-(

Jiri

Signature · 2 lines
Jiri Benc
SUSE Labs
#2 lore raw
Quoted 4 lines · Jiri Benc
Quoted 3 lines · Michael Buesch
(quoted diff) +0 -0
@@ -192,10 +192,15 @@ u8 * ieee80211_tkip_add_iv(u8 *pos, stru
 
 
Quoted 15 lines

net/d80211/tkip.c u8 * ieee80211_tkip_add_iv(u8 *pos, stru · line 204

Quoted 13 lines
net/d80211/tkip.c +7 -2
 void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
-				  u16 *phase1key)
+				  u8 *phase1key)
 {
+	__le16 *k = (__le16 *)phase1key;
+	int i;
+
 	tkip_mixing_phase1(ta, &key->key[ALG_TKIP_TEMP_ENCR_KEY],
-			   key->u.tkip.iv32, phase1key);
+			   key->u.tkip.iv32, (u16 *)k);
+	for (i = 0; i < 5; i++)
+		k[i] = cpu_to_le16(k[i]);
 }

Maybe a slightly better type checking but still looks ugly:

Hm, well. I don't really see how typechecking is better in this case, but if you like it more, I'm ok with it. ;)

Quoted 21 lines
net/d80211/tkip.c +8 -2
@@ -192,10 +192,16 @@ u8 * ieee80211_tkip_add_iv(u8 *pos, stru
 
 
 void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
-				  u16 *phase1key)
+				  u8 *phase1key)
 {
+	u16 *tmp_result = (u16 *)phase1key;
+	__le16 *k = (__le16 *)phase1key;
+	int i;
+
 	tkip_mixing_phase1(ta, &key->key[ALG_TKIP_TEMP_ENCR_KEY],
-			   key->u.tkip.iv32, phase1key);
+			   key->u.tkip.iv32, tmp_result);
+	for (i = 0; i < 5; i++)
+		k[i] = cpu_to_le16(tmp_result[i]);
 }
 
 void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,
Quoted 2 lines

Moreover, I'm not sure if GCC is able to optimize out the for loop in this case :-(

Yeah, I was going to check this and was going to add #ifdefs if it doesn't. But that was not my major concern at this point.
It was more that people agree to me that it _is_ broken on BE platforms. (I cannot test it, yet, as tkip has other problems for bcm43xx).

Signature · 1 line
Greetings Michael.
#3 lore raw
Quoted 21 lines · Michael Buesch
Quoted 4 lines · Jiri Benc
Quoted 3 lines · Michael Buesch
(quoted diff) +0 -0
@@ -192,10 +192,15 @@ u8 * ieee80211_tkip_add_iv(u8 *pos, stru
 
 
Quoted 15 lines

net/d80211/tkip.c u8 * ieee80211_tkip_add_iv(u8 *pos, stru · line 204

Quoted 13 lines
net/d80211/tkip.c +7 -2
 void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
-				  u16 *phase1key)
+				  u8 *phase1key)
 {
+	__le16 *k = (__le16 *)phase1key;
+	int i;
+
 	tkip_mixing_phase1(ta, &key->key[ALG_TKIP_TEMP_ENCR_KEY],
-			   key->u.tkip.iv32, phase1key);
+			   key->u.tkip.iv32, (u16 *)k);
+	for (i = 0; i < 5; i++)
+		k[i] = cpu_to_le16(k[i]);
 }

Maybe a slightly better type checking but still looks ugly:

Quoted 1 line

Hm, well. I don't really see how typechecking is better in this case,

cpu_to_le16 with a __le16 variable as a parameter always looks suspicious. In the version I sent it is at least clear that it's intended.

Quoted 1 line

but if you like it more, I'm ok with it. ;)

I dislike both of them but have no better idea.

Quoted 3 lines

Yeah, I was going to check this and was going to add #ifdefs if it doesn't. But that was not my major concern at this point.
It was more that people agree to me that it _is_ broken on BE platforms.

Looks like it is.

Thanks,

Jiri

Signature · 2 lines
Jiri Benc
SUSE Labs
#4 lore raw

d80211: Fix TKIP key type

In reply to Jiri Benc

d80211: Fix TKIP key type

Avoid the messy typecasting and let drivers handle byteordering.

include/net/d80211.h +4 -1
index 65a5d36..0bd6b15 100644
@@ -202,7 +202,10 @@ struct ieee80211_tx_control {
 				 * hw->set_key() */
 	u8 icv_len;		/* length of the ICV/MIC field in octets */
 	u8 iv_len;		/* length of the IV field in octets */
-	u8 tkip_key[16];	/* generated phase2/phase1 key for hw TKIP */
+	union {
+		u16 phase1[5];
+		u8 phase2[16];
+	} tkip;			/* generated phase2/phase1 key for hw TKIP */
 	u8 queue;		/* hardware queue to use for this frame;
 				 * 0 = highest, hw->queues-1 = lowest */
 	u8 sw_retry_attempt;	/* number of times hw has tried to
net/d80211/ieee80211_i.h +0 -0
net/d80211/ieee80211_ioctl.c +0 -0
net/d80211/ieee80211_sta.c +0 -0
net/d80211/wpa.c +2 -2
index 7b64abf..d5ef61a 100644
@@ -344,12 +344,12 @@ skip_iv_inc:
 
 		if (flags & IEEE80211_HW_TKIP_REQ_PHASE2_KEY)
 			ieee80211_tkip_gen_rc4key(key, hdr->addr2,
-						  tx->u.tx.control->tkip_key);
+						  tx->u.tx.control->tkip.phase2);
 		else if (flags & IEEE80211_HW_TKIP_REQ_PHASE1_KEY) {
 			if (key->u.tkip.iv16 == 0 ||
 			    !key->u.tkip.tx_initialized) {
 				ieee80211_tkip_gen_phase1key(key, hdr->addr2,
-					    (u16 *)tx->u.tx.control->tkip_key);
+					    tx->u.tx.control->tkip.phase1);
 				key->u.tkip.tx_initialized = 1;
 				tx->u.tx.control->flags |=
 					    IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY;
#5 lore raw

Re: d80211: Fix TKIP key type

Quoted 3 lines · Michael Wu

d80211: Fix TKIP key type

Avoid the messy typecasting and let drivers handle byteordering.

Well, ok.

We need to remove all the tkip stuff from tx_control anyway, as it's broken. It does not work to pass tkip keys along with TX packets, as we also need the key for RX (on bcm43xx at least). So I think we need a callback or something that sets the key in HW. Maybe we can do that in the already existing set_key callback. Dunno yet.

Quoted 41 lines
include/net/d80211.h +4 -1
index 65a5d36..0bd6b15 100644
@@ -202,7 +202,10 @@ struct ieee80211_tx_control {
 				 * hw->set_key() */
 	u8 icv_len;		/* length of the ICV/MIC field in octets */
 	u8 iv_len;		/* length of the IV field in octets */
-	u8 tkip_key[16];	/* generated phase2/phase1 key for hw TKIP */
+	union {
+		u16 phase1[5];
+		u8 phase2[16];
+	} tkip;			/* generated phase2/phase1 key for hw TKIP */
 	u8 queue;		/* hardware queue to use for this frame;
 				 * 0 = highest, hw->queues-1 = lowest */
 	u8 sw_retry_attempt;	/* number of times hw has tried to
net/d80211/ieee80211_i.h +0 -0
net/d80211/ieee80211_ioctl.c +0 -0
net/d80211/ieee80211_sta.c +0 -0
net/d80211/wpa.c +2 -2
index 7b64abf..d5ef61a 100644
@@ -344,12 +344,12 @@ skip_iv_inc:
 
 		if (flags & IEEE80211_HW_TKIP_REQ_PHASE2_KEY)
 			ieee80211_tkip_gen_rc4key(key, hdr->addr2,
-						  tx->u.tx.control->tkip_key);
+						  tx->u.tx.control->tkip.phase2);
 		else if (flags & IEEE80211_HW_TKIP_REQ_PHASE1_KEY) {
 			if (key->u.tkip.iv16 == 0 ||
 			    !key->u.tkip.tx_initialized) {
 				ieee80211_tkip_gen_phase1key(key, hdr->addr2,
-					    (u16 *)tx->u.tx.control->tkip_key);
+					    tx->u.tx.control->tkip.phase1);
 				key->u.tkip.tx_initialized = 1;
 				tx->u.tx.control->flags |=
 					    IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY;
Signature · 1 line
Greetings Michael.
#6 lore raw

Re: d80211: Fix TKIP key type

Quoted 2 lines · Michael Buesch

So I think we need a callback or something that sets the key in HW. Maybe we can do that in the already existing set_key callback.

Yes, your original patch with the library functions should be fine, if the driver needs it it can request it either in set_key or during tx (if the TSC cycled or whatever)

johannes

#7 lore raw

Re: d80211: Fix TKIP key type

In reply to Michael Wu
Quoted 5 lines · Michael Wu

d80211: Fix TKIP key type

Avoid the messy typecasting and let drivers handle byteordering.

Jiri, can you avoid pulling this patch, yet?
I am trying to get a better solution for the whole TKIP stuff that actually works with bcm43xx. My patch will fix this issue then, too.

Quoted 39 lines
include/net/d80211.h +4 -1
index 65a5d36..0bd6b15 100644
@@ -202,7 +202,10 @@ struct ieee80211_tx_control {
 				 * hw->set_key() */
 	u8 icv_len;		/* length of the ICV/MIC field in octets */
 	u8 iv_len;		/* length of the IV field in octets */
-	u8 tkip_key[16];	/* generated phase2/phase1 key for hw TKIP */
+	union {
+		u16 phase1[5];
+		u8 phase2[16];
+	} tkip;			/* generated phase2/phase1 key for hw TKIP */
 	u8 queue;		/* hardware queue to use for this frame;
 				 * 0 = highest, hw->queues-1 = lowest */
 	u8 sw_retry_attempt;	/* number of times hw has tried to
net/d80211/ieee80211_i.h +0 -0
net/d80211/ieee80211_ioctl.c +0 -0
net/d80211/ieee80211_sta.c +0 -0
net/d80211/wpa.c +2 -2
index 7b64abf..d5ef61a 100644
@@ -344,12 +344,12 @@ skip_iv_inc:
 
 		if (flags & IEEE80211_HW_TKIP_REQ_PHASE2_KEY)
 			ieee80211_tkip_gen_rc4key(key, hdr->addr2,
-						  tx->u.tx.control->tkip_key);
+						  tx->u.tx.control->tkip.phase2);
 		else if (flags & IEEE80211_HW_TKIP_REQ_PHASE1_KEY) {
 			if (key->u.tkip.iv16 == 0 ||
 			    !key->u.tkip.tx_initialized) {
 				ieee80211_tkip_gen_phase1key(key, hdr->addr2,
-					    (u16 *)tx->u.tx.control->tkip_key);
+					    tx->u.tx.control->tkip.phase1);
 				key->u.tkip.tx_initialized = 1;
 				tx->u.tx.control->flags |=
 					    IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY;
Signature · 1 line
Greetings Michael.
#8 lore raw

Re: d80211: Fix TKIP key type

Quoted 10 lines · Michael Buesch
Quoted 5 lines · Michael Wu

d80211: Fix TKIP key type

Avoid the messy typecasting and let drivers handle byteordering.

Jiri, can you avoid pulling this patch, yet?
I am trying to get a better solution for the whole TKIP stuff that actually works with bcm43xx. My patch will fix this issue then, too.

I wasn't going to apply it anyway as it doesn't seem to solve the problem - it just shifts it to someone else.

Jiri

Signature · 2 lines
Jiri Benc
SUSE Labs