diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-07-08 05:20:03 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-07-08 05:20:03 +0000 |
commit | 00dc80b385fac0ff41fa5713818320082b4a8b07 (patch) | |
tree | 4a713d4211f89dcabab35304a3c1b3d211d264ba /package/mac80211/patches/420-mac80211_ignore_invalid_ccmp_rx_pn.patch | |
parent | c7f23f3bc0e13c1c2f57fc0af3aa5cf99a68b08d (diff) | |
download | master-187ad058-00dc80b385fac0ff41fa5713818320082b4a8b07.tar.gz master-187ad058-00dc80b385fac0ff41fa5713818320082b4a8b07.tar.bz2 master-187ad058-00dc80b385fac0ff41fa5713818320082b4a8b07.zip |
mac80211: add pending crypto bugfixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27552 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/420-mac80211_ignore_invalid_ccmp_rx_pn.patch')
-rw-r--r-- | package/mac80211/patches/420-mac80211_ignore_invalid_ccmp_rx_pn.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/mac80211/patches/420-mac80211_ignore_invalid_ccmp_rx_pn.patch b/package/mac80211/patches/420-mac80211_ignore_invalid_ccmp_rx_pn.patch index f6793541f2..0222f54b6b 100644 --- a/package/mac80211/patches/420-mac80211_ignore_invalid_ccmp_rx_pn.patch +++ b/package/mac80211/patches/420-mac80211_ignore_invalid_ccmp_rx_pn.patch @@ -1,16 +1,16 @@ --- a/net/mac80211/key.h +++ b/net/mac80211/key.h -@@ -86,6 +86,7 @@ struct ieee80211_key { +@@ -90,6 +90,7 @@ struct ieee80211_key { * Management frames. */ u8 rx_pn[NUM_RX_DATA_QUEUES + 1][6]; + u8 rx_invalid_pn[NUM_RX_DATA_QUEUES + 1]; struct crypto_cipher *tfm; u32 replays; /* dot11RSNAStatsCCMPReplays */ - /* scratch buffers for virt_to_page() (crypto API) */ + #ifndef AES_BLOCK_LEN --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c -@@ -441,6 +441,13 @@ ieee80211_crypto_ccmp_encrypt(struct iee +@@ -457,6 +457,13 @@ ieee80211_crypto_ccmp_encrypt(struct iee return TX_CONTINUE; } @@ -24,7 +24,7 @@ ieee80211_rx_result ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx) -@@ -453,6 +460,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee +@@ -469,6 +476,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee u8 pn[CCMP_PN_LEN]; int data_len; int queue; @@ -32,7 +32,7 @@ hdrlen = ieee80211_hdrlen(hdr->frame_control); -@@ -486,6 +494,11 @@ ieee80211_crypto_ccmp_decrypt(struct iee +@@ -503,6 +511,11 @@ ieee80211_crypto_ccmp_decrypt(struct iee return RX_DROP_UNUSABLE; } |