[PATCH-mm 5/5] mac80211: tkip.c use struct tkip_ctx in phase 2 keymixing

From: Harvey Harrison
Date: Wed Apr 16 2008 - 19:26:17 EST


Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
---
net/mac80211/tkip.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
index 996b1c0..9c03431 100644
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -96,10 +96,12 @@ static void tkip_mixing_phase1(struct ieee80211_key *key, const u8 *ta,
ctx->initialized = 1;
}

-static void tkip_mixing_phase2(const u16 *p1k, const u8 *tk, u16 tsc_IV16,
- u8 *rc4key)
+static void tkip_mixing_phase2(struct ieee80211_key *key, struct tkip_ctx *ctx,
+ u16 tsc_IV16, u8 *rc4key)
{
u16 ppk[6];
+ const u16 *p1k = ctx->p1k;
+ const u8 *tk = &key->conf.key[ALG_TKIP_TEMP_ENCR_KEY];
int i;

ppk[0] = p1k[0];
@@ -153,9 +155,7 @@ void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,
if (key->u.tkip.tx.iv16 == 0 || !key->u.tkip.tx.initialized)
tkip_mixing_phase1(key, ta, &key->u.tkip.tx, key->u.tkip.tx.iv32);

- tkip_mixing_phase2(key->u.tkip.tx.p1k,
- &key->conf.key[ALG_TKIP_TEMP_ENCR_KEY],
- key->u.tkip.tx.iv16, rc4key);
+ tkip_mixing_phase2(key, &key->u.tkip.tx, key->u.tkip.tx.iv16, rc4key);
}

void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf,
@@ -199,8 +199,7 @@ void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf,
return;
}

- tkip_mixing_phase2(key->u.tkip.tx.p1k,
- &key->conf.key[ALG_TKIP_TEMP_ENCR_KEY], iv16, outkey);
+ tkip_mixing_phase2(key, &key->u.tkip.tx, iv16, outkey);
}
EXPORT_SYMBOL(ieee80211_get_tkip_key);

@@ -317,9 +316,7 @@ int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
}
}

- tkip_mixing_phase2(key->u.tkip.rx[queue].p1k,
- &key->conf.key[ALG_TKIP_TEMP_ENCR_KEY],
- iv16, rc4key);
+ tkip_mixing_phase2(key, &key->u.tkip.rx[queue], iv16, rc4key);
#ifdef CONFIG_TKIP_DEBUG
{
int i;
--
1.5.5.144.g3e42

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/