* [PATCH 2/3] ath5k: clean up ath5k_hw_set_key
2008-11-26 21:17 [PATCH 1/3] ath5k: preserve higher order bits when setting mac address Bob Copeland
@ 2008-11-26 21:17 ` Bob Copeland
2008-11-27 4:19 ` Bob Copeland
0 siblings, 1 reply; 3+ messages in thread
From: Bob Copeland @ 2008-11-26 21:17 UTC (permalink / raw)
To: jirislaby, nbd, lrodriguez, mickflemm, linville
Cc: Bob Copeland, ath5k-devel, linux-wireless
With the addition of TKIP (and soon CCMP), key->alg is a more useful
guide to key type than the key length.
This patch cleans up key type assignment in ath5k_hw_set_key by
extracting the keytype assignment. It also replaces the separate
memcpy() calls for extracting key material into the hardware format
with a loop that works regardless of key size.
Finally, the patch removes support for WEP-128 since it is a
non-standard key length that mac80211 also doesn't use.
Changes-licensed-under: ISC
Signed-off-by: Bob Copeland <me@bobcopeland.com>
---
drivers/net/wireless/ath5k/pcu.c | 58 ++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/drivers/net/wireless/ath5k/pcu.c b/drivers/net/wireless/ath5k/pcu.c
index 79879f2..86ca54b 100644
--- a/drivers/net/wireless/ath5k/pcu.c
+++ b/drivers/net/wireless/ath5k/pcu.c
@@ -1013,6 +1013,23 @@ int ath5k_hw_is_key_valid(struct ath5k_hw *ah, u16 entry)
AR5K_KEYTABLE_VALID;
}
+static
+int ath5k_keycache_type(const struct ieee80211_key_conf *key)
+{
+ switch (key->alg) {
+ case ALG_TKIP:
+ return AR5K_KEYTABLE_TYPE_TKIP;
+ case ALG_CCMP:
+ return AR5K_KEYTABLE_TYPE_CCM;
+ case ALG_WEP:
+ if (key->len == WEP40)
+ return AR5K_KEYTABLE_TYPE_40;
+ else if (key->len == WEP104)
+ return AR5K_KEYTABLE_TYPE_104;
+ }
+ return -EINVAL;
+}
+
/*
* Set a key entry on the table
*/
@@ -1027,6 +1044,7 @@ int ath5k_hw_set_key(struct ath5k_hw *ah, u16 entry,
u32 keytype;
u16 micentry = entry + AR5K_KEYTABLE_MIC_OFFSET;
bool is_tkip;
+ const u8 *key_ptr;
ATH5K_TRACE(ah->ah_sc);
@@ -1042,33 +1060,25 @@ int ath5k_hw_set_key(struct ath5k_hw *ah, u16 entry,
(is_tkip && micentry > AR5K_KEYTABLE_SIZE))
return -EOPNOTSUPP;
- switch (keylen) {
- /* WEP 40-bit = 40-bit entered key + 24 bit IV = 64-bit */
- case 40 / 8:
- memcpy(&key_v[0], key->key, 5);
- keytype = AR5K_KEYTABLE_TYPE_40;
- break;
+ if (unlikely(keylen > 16))
+ return -EOPNOTSUPP;
- /* WEP 104-bit = 104-bit entered key + 24-bit IV = 128-bit */
- case 104 / 8:
- memcpy(&key_v[0], &key->key[0], 6);
- memcpy(&key_v[2], &key->key[6], 6);
- memcpy(&key_v[4], &key->key[12], 1);
- keytype = AR5K_KEYTABLE_TYPE_104;
- break;
- /* WEP/TKIP 128-bit = 128-bit entered key + 24 bit IV = 152-bit */
- case 128 / 8:
- memcpy(&key_v[0], &key->key[0], 6);
- memcpy(&key_v[2], &key->key[6], 6);
- memcpy(&key_v[4], &key->key[12], 4);
- keytype = is_tkip ?
- AR5K_KEYTABLE_TYPE_TKIP :
- AR5K_KEYTABLE_TYPE_128;
- break;
+ keytype = ath5k_keycache_type(key);
+ if (keytype < 0)
+ return keytype;
- default:
- return -EINVAL; /* shouldn't happen */
+ /*
+ * each key block is 6 bytes wide, written as pairs of
+ * alternating 32 and 16 bit le values.
+ */
+ key_ptr = key->key;
+ for (i = 0; keylen >= 6; keylen -= 6) {
+ memcpy(&key_v[i], key_ptr, 6);
+ i += 2;
+ key_ptr += 6;
}
+ if (keylen)
+ memcpy(&key_v[i], key_ptr, keylen);
/* intentionally corrupt key until mic is installed */
if (is_tkip) {
--
1.5.4.2.182.gb3092
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/3] ath5k: clean up ath5k_hw_set_key
2008-11-26 21:17 ` [PATCH 2/3] ath5k: clean up ath5k_hw_set_key Bob Copeland
@ 2008-11-27 4:19 ` Bob Copeland
0 siblings, 0 replies; 3+ messages in thread
From: Bob Copeland @ 2008-11-27 4:19 UTC (permalink / raw)
To: jirislaby, nbd, lrodriguez, mickflemm, linville
Cc: Bob Copeland, ath5k-devel, linux-wireless
On Wed, Nov 26, 2008 at 4:17 PM, Bob Copeland <me@bobcopeland.com> wrote:
>
> +static
> +int ath5k_keycache_type(const struct ieee80211_key_conf *key)
> +{
> + switch (key->alg) {
> + case ALG_TKIP:
> + return AR5K_KEYTABLE_TYPE_TKIP;
> + case ALG_CCMP:
> + return AR5K_KEYTABLE_TYPE_CCM;
> + case ALG_WEP:
> + if (key->len == WEP40)
Oops sorry, ignore this patch. I broke it with a last minute interface change.
I'll repost the series tomorrow.
--
Bob Copeland %% www.bobcopeland.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/3] ath5k: clean up ath5k_hw_set_key
@ 2008-11-27 14:29 Bob Copeland
0 siblings, 0 replies; 3+ messages in thread
From: Bob Copeland @ 2008-11-27 14:29 UTC (permalink / raw)
To: nbd, lrodriguez, mickflemm, linville, jirislaby
Cc: Bob Copeland, ath5k-devel, linux-wireless
>From 5c4d0c3691a25f158c7e43ce8ca1812cbfd73c82 Mon Sep 17 00:00:00 2001
From: Bob Copeland <me@bobcopeland.com>
Date: Tue, 25 Nov 2008 20:55:21 -0500
Subject: [PATCH] ath5k: clean up ath5k_hw_set_key
With the addition of TKIP (and soon CCMP), key->alg is a more useful
guide to key type than the key length.
This patch cleans up key type assignment in ath5k_hw_set_key by
extracting it into its own function. It also replaces the separate
memcpy() calls for extracting key material into the hardware format
with a loop that works regardless of key size.
Finally, the patch removes support for WEP-128 since it is a
non-standard key length that mac80211 also doesn't use.
Changes-licensed-under: ISC
Signed-off-by: Bob Copeland <me@bobcopeland.com>
---
v2 without the errors, patches 1 and 3 should be ok.
drivers/net/wireless/ath5k/pcu.c | 58 ++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/drivers/net/wireless/ath5k/pcu.c b/drivers/net/wireless/ath5k/pcu.c
index 79879f2..ad7ea36 100644
--- a/drivers/net/wireless/ath5k/pcu.c
+++ b/drivers/net/wireless/ath5k/pcu.c
@@ -1013,6 +1013,23 @@ int ath5k_hw_is_key_valid(struct ath5k_hw *ah, u16 entry)
AR5K_KEYTABLE_VALID;
}
+static
+int ath5k_keycache_type(const struct ieee80211_key_conf *key)
+{
+ switch (key->alg) {
+ case ALG_TKIP:
+ return AR5K_KEYTABLE_TYPE_TKIP;
+ case ALG_CCMP:
+ return AR5K_KEYTABLE_TYPE_CCM;
+ case ALG_WEP:
+ if (key->keylen == LEN_WEP40)
+ return AR5K_KEYTABLE_TYPE_40;
+ else if (key->keylen == LEN_WEP104)
+ return AR5K_KEYTABLE_TYPE_104;
+ }
+ return -EINVAL;
+}
+
/*
* Set a key entry on the table
*/
@@ -1027,6 +1044,7 @@ int ath5k_hw_set_key(struct ath5k_hw *ah, u16 entry,
u32 keytype;
u16 micentry = entry + AR5K_KEYTABLE_MIC_OFFSET;
bool is_tkip;
+ const u8 *key_ptr;
ATH5K_TRACE(ah->ah_sc);
@@ -1042,33 +1060,25 @@ int ath5k_hw_set_key(struct ath5k_hw *ah, u16 entry,
(is_tkip && micentry > AR5K_KEYTABLE_SIZE))
return -EOPNOTSUPP;
- switch (keylen) {
- /* WEP 40-bit = 40-bit entered key + 24 bit IV = 64-bit */
- case 40 / 8:
- memcpy(&key_v[0], key->key, 5);
- keytype = AR5K_KEYTABLE_TYPE_40;
- break;
+ if (unlikely(keylen > 16))
+ return -EOPNOTSUPP;
- /* WEP 104-bit = 104-bit entered key + 24-bit IV = 128-bit */
- case 104 / 8:
- memcpy(&key_v[0], &key->key[0], 6);
- memcpy(&key_v[2], &key->key[6], 6);
- memcpy(&key_v[4], &key->key[12], 1);
- keytype = AR5K_KEYTABLE_TYPE_104;
- break;
- /* WEP/TKIP 128-bit = 128-bit entered key + 24 bit IV = 152-bit */
- case 128 / 8:
- memcpy(&key_v[0], &key->key[0], 6);
- memcpy(&key_v[2], &key->key[6], 6);
- memcpy(&key_v[4], &key->key[12], 4);
- keytype = is_tkip ?
- AR5K_KEYTABLE_TYPE_TKIP :
- AR5K_KEYTABLE_TYPE_128;
- break;
+ keytype = ath5k_keycache_type(key);
+ if (keytype < 0)
+ return keytype;
- default:
- return -EINVAL; /* shouldn't happen */
+ /*
+ * each key block is 6 bytes wide, written as pairs of
+ * alternating 32 and 16 bit le values.
+ */
+ key_ptr = key->key;
+ for (i = 0; keylen >= 6; keylen -= 6) {
+ memcpy(&key_v[i], key_ptr, 6);
+ i += 2;
+ key_ptr += 6;
}
+ if (keylen)
+ memcpy(&key_v[i], key_ptr, keylen);
/* intentionally corrupt key until mic is installed */
if (is_tkip) {
--
1.5.4.2.182.gb3092
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-11-27 14:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-27 14:29 [PATCH 2/3] ath5k: clean up ath5k_hw_set_key Bob Copeland
-- strict thread matches above, loose matches on Subject: below --
2008-11-26 21:17 [PATCH 1/3] ath5k: preserve higher order bits when setting mac address Bob Copeland
2008-11-26 21:17 ` [PATCH 2/3] ath5k: clean up ath5k_hw_set_key Bob Copeland
2008-11-27 4:19 ` Bob Copeland
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).