diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-27 14:48:40 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-05-01 04:34:26 +0400 |
| commit | 17f830459d6116ae13dbcfc9d09a406e6717b1a6 (patch) | |
| tree | 8723c2773a96b4e15fba6b356de28f8996651d0c /net/mac80211/tkip.c | |
| parent | 636c5d488bc0b349e01cf5bfbf85588134af70a0 (diff) | |
| download | linux-17f830459d6116ae13dbcfc9d09a406e6717b1a6.tar.xz | |
mac80211: incorrect shift direction
Looks like 5d2cdcd4e85c5187db30a6b29f79fbbe59f39f78 ("mac80211: get a
TKIP phase key from skb") got the shifts wrong.
Noticed by sparse:
net/mac80211/tkip.c:234:25: warning: right shift by bigger than source value
net/mac80211/tkip.c:235:25: warning: right shift by bigger than source value
net/mac80211/tkip.c:236:25: warning: right shift by bigger than source value
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tkip.c')
| -rw-r--r-- | net/mac80211/tkip.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c index dddbfd60f351..09093da24af6 100644 --- a/net/mac80211/tkip.c +++ b/net/mac80211/tkip.c @@ -230,10 +230,8 @@ void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf, iv16 = data[hdr_len] << 8; iv16 += data[hdr_len + 2]; - iv32 = data[hdr_len + 4] + - (data[hdr_len + 5] >> 8) + - (data[hdr_len + 6] >> 16) + - (data[hdr_len + 7] >> 24); + iv32 = data[hdr_len + 4] | (data[hdr_len + 5] << 8) | + (data[hdr_len + 6] << 16) | (data[hdr_len + 7] << 24); #ifdef CONFIG_TKIP_DEBUG printk(KERN_DEBUG "TKIP encrypt: iv16 = 0x%04x, iv32 = 0x%08x\n", |