Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[safe/jmp/linux-2.6] / net / mac80211 / key.h

diff --git a/net/mac80211/key.h b/net/mac80211/key.h
index f52c3df..a49f93b 100644 (file)
--- a/net/mac80211/key.h
+++ b/net/mac80211/key.h
@@ -16,31 +16,18 @@
 #include <linux/rcupdate.h>
 #include <net/mac80211.h>
 
-/* ALG_TKIP
- * struct ieee80211_key::key is encoded as a 256-bit (32 byte) data block:
- * Temporal Encryption Key (128 bits)
- * Temporal Authenticator Tx MIC Key (64 bits)
- * Temporal Authenticator Rx MIC Key (64 bits)
- */
-
-#define WEP_IV_LEN 4
-#define WEP_ICV_LEN 4
-
-#define ALG_TKIP_KEY_LEN 32
-/* Starting offsets for each key */
-#define ALG_TKIP_TEMP_ENCR_KEY 0
-#define ALG_TKIP_TEMP_AUTH_TX_MIC_KEY 16
-#define ALG_TKIP_TEMP_AUTH_RX_MIC_KEY 24
-#define TKIP_IV_LEN 8
-#define TKIP_ICV_LEN 4
-
-#define ALG_CCMP_KEY_LEN 16
-#define CCMP_HDR_LEN 8
-#define CCMP_MIC_LEN 8
-#define CCMP_TK_LEN 16
-#define CCMP_PN_LEN 6
-
-#define NUM_RX_DATA_QUEUES 17
+#define WEP_IV_LEN             4
+#define WEP_ICV_LEN            4
+#define ALG_TKIP_KEY_LEN       32
+#define ALG_CCMP_KEY_LEN       16
+#define CCMP_HDR_LEN           8
+#define CCMP_MIC_LEN           8
+#define CCMP_TK_LEN            16
+#define CCMP_PN_LEN            6
+#define TKIP_IV_LEN            8
+#define TKIP_ICV_LEN           4
+
+#define NUM_RX_DATA_QUEUES     17
 
 struct ieee80211_local;
 struct ieee80211_sub_if_data;
@@ -59,6 +46,8 @@ struct sta_info;
  *     acceleration.
  * @KEY_FLAG_TODO_DEFKEY: Key is default key and debugfs needs to be updated.
  * @KEY_FLAG_TODO_ADD_DEBUGFS: Key needs to be added to debugfs.
+ * @KEY_FLAG_TODO_DEFMGMTKEY: Key is default management key and debugfs needs
+ *     to be updated.
  */
 enum ieee80211_internal_key_flags {
        KEY_FLAG_UPLOADED_TO_HARDWARE   = BIT(0),
@@ -67,6 +56,14 @@ enum ieee80211_internal_key_flags {
        KEY_FLAG_TODO_HWACCEL_REMOVE    = BIT(3),
        KEY_FLAG_TODO_DEFKEY            = BIT(4),
        KEY_FLAG_TODO_ADD_DEBUGFS       = BIT(5),
+       KEY_FLAG_TODO_DEFMGMTKEY        = BIT(6),
+};
+
+struct tkip_ctx {
+       u32 iv32;
+       u16 iv16;
+       u16 p1k[5];
+       int initialized;
 };
 
 struct ieee80211_key {
@@ -85,16 +82,10 @@ struct ieee80211_key {
        union {
                struct {
                        /* last used TSC */
-                       u32 iv32;
-                       u16 iv16;
-                       u16 p1k[5];
-                       int tx_initialized;
+                       struct tkip_ctx tx;
 
                        /* last received RSC */
-                       u32 iv32_rx[NUM_RX_DATA_QUEUES];
-                       u16 iv16_rx[NUM_RX_DATA_QUEUES];
-                       u16 p1k_rx[NUM_RX_DATA_QUEUES][5];
-                       int rx_initialized[NUM_RX_DATA_QUEUES];
+                       struct tkip_ctx rx[NUM_RX_DATA_QUEUES];
                } tkip;
                struct {
                        u8 tx_pn[6];
@@ -108,6 +99,16 @@ struct ieee80211_key {
                        u8 tx_crypto_buf[6 * AES_BLOCK_LEN];
                        u8 rx_crypto_buf[6 * AES_BLOCK_LEN];
                } ccmp;
+               struct {
+                       u8 tx_pn[6];
+                       u8 rx_pn[6];
+                       struct crypto_cipher *tfm;
+                       u32 replays; /* dot11RSNAStatsCMACReplays */
+                       u32 icverrors; /* dot11RSNAStatsCMACICVErrors */
+                       /* scratch buffers for virt_to_page() (crypto API) */
+                       u8 tx_crypto_buf[2 * AES_BLOCK_LEN];
+                       u8 rx_crypto_buf[2 * AES_BLOCK_LEN];
+               } aes_cmac;
        } u;
 
        /* number of times this key has been used */
@@ -117,17 +118,6 @@ struct ieee80211_key {
        struct {
                struct dentry *stalink;
                struct dentry *dir;
-               struct dentry *keylen;
-               struct dentry *flags;
-               struct dentry *keyidx;
-               struct dentry *hw_key_idx;
-               struct dentry *tx_rx_count;
-               struct dentry *algorithm;
-               struct dentry *tx_spec;
-               struct dentry *rx_spec;
-               struct dentry *replays;
-               struct dentry *key;
-               struct dentry *ifindex;
                int cnt;
        } debugfs;
 #endif
@@ -142,7 +132,8 @@ struct ieee80211_key {
 struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg,
                                          int idx,
                                          size_t key_len,
-                                         const u8 *key_data);
+                                         const u8 *key_data,
+                                         size_t seq_len, const u8 *seq);
 /*
  * Insert a key into data structures (sdata, sta if necessary)
  * to make it used, free old key.
@@ -152,6 +143,8 @@ void ieee80211_key_link(struct ieee80211_key *key,
                        struct sta_info *sta);
 void ieee80211_key_free(struct ieee80211_key *key);
 void ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, int idx);
+void ieee80211_set_default_mgmt_key(struct ieee80211_sub_if_data *sdata,
+                                   int idx);
 void ieee80211_free_keys(struct ieee80211_sub_if_data *sdata);
 void ieee80211_enable_keys(struct ieee80211_sub_if_data *sdata);
 void ieee80211_disable_keys(struct ieee80211_sub_if_data *sdata);