2 files changed, 78 insertions, 0 deletions

diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 538ee1dd3d0a..8dc807d9c29a 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -37,6 +37,16 @@
  *      userspace to request deletion of a virtual interface, then requires
  *      attribute %NL80211_ATTR_IFINDEX.
  *
+ * @NL80211_CMD_GET_KEY: Get sequence counter information for a key specified
+ *      by %NL80211_ATTR_KEY_IDX and/or %NL80211_ATTR_MAC.
+ * @NL80211_CMD_SET_KEY: Set key attributes %NL80211_ATTR_KEY_DEFAULT or
+ *      %NL80211_ATTR_KEY_THRESHOLD.
+ * @NL80211_CMD_NEW_KEY: add a key with given %NL80211_ATTR_KEY_DATA,
+ *      %NL80211_ATTR_KEY_IDX, %NL80211_ATTR_MAC and %NL80211_ATTR_KEY_CIPHER
+ *      attributes.
+ * @NL80211_CMD_DEL_KEY: delete a key identified by %NL80211_ATTR_KEY_IDX
+ *      or %NL80211_ATTR_MAC.
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -54,6 +64,11 @@ enum nl80211_commands {
         NL80211_CMD_NEW_INTERFACE,
         NL80211_CMD_DEL_INTERFACE,
 
+        NL80211_CMD_GET_KEY,
+        NL80211_CMD_SET_KEY,
+        NL80211_CMD_NEW_KEY,
+        NL80211_CMD_DEL_KEY,
+
         /* add commands here */
 
         /* used to define NL80211_CMD_MAX below */
@@ -75,6 +90,17 @@ enum nl80211_commands {
  * @NL80211_ATTR_IFNAME: network interface name
  * @NL80211_ATTR_IFTYPE: type of virtual interface, see &enum nl80211_iftype
  *
+ * @NL80211_ATTR_MAC: MAC address (various uses)
+ *
+ * @NL80211_ATTR_KEY_DATA: (temporal) key data; for TKIP this consists of
+ *      16 bytes encryption key followed by 8 bytes each for TX and RX MIC
+ *      keys
+ * @NL80211_ATTR_KEY_IDX: key ID (u8, 0-3)
+ * @NL80211_ATTR_KEY_CIPHER: key cipher suite (u32, as defined by IEEE 802.11
+ *      section 7.3.2.25.1, e.g. 0x000FAC04)
+ * @NL80211_ATTR_KEY_SEQ: transmit key sequence number (IV/PN) for TKIP and
+ *      CCMP keys, each six bytes in little endian
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -89,6 +115,14 @@ enum nl80211_attrs {
         NL80211_ATTR_IFNAME,
         NL80211_ATTR_IFTYPE,
 
+        NL80211_ATTR_MAC,
+
+        NL80211_ATTR_KEY_DATA,
+        NL80211_ATTR_KEY_IDX,
+        NL80211_ATTR_KEY_CIPHER,
+        NL80211_ATTR_KEY_SEQ,
+        NL80211_ATTR_KEY_DEFAULT,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index d30960e1755c..3db7dfa53b6f 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -49,6 +49,26 @@ extern int ieee80211_radiotap_iterator_next(
    struct ieee80211_radiotap_iterator *iterator);
 
 
+ /**
+ * struct key_params - key information
+ *
+ * Information about a key
+ *
+ * @key: key material
+ * @key_len: length of key material
+ * @cipher: cipher suite selector
+ * @seq: sequence counter (IV/PN) for TKIP and CCMP keys, only used
+ *      with the get_key() callback, must be in little endian,
+ *      length given by @seq_len.
+ */
+struct key_params {
+        u8 *key;
+        u8 *seq;
+        int key_len;
+        int seq_len;
+        u32 cipher;
+};
+
 /* from net/wireless.h */
 struct wiphy;
 
@@ -71,6 +91,18 @@ struct wiphy;
  *
  * @change_virtual_intf: change type of virtual interface
  *
+ * @add_key: add a key with the given parameters. @mac_addr will be %NULL
+ *      when adding a group key.
+ *
+ * @get_key: get information about the key with the given parameters.
+ *      @mac_addr will be %NULL when requesting information for a group
+ *      key. All pointers given to the @callback function need not be valid
+ *      after it returns.
+ *
+ * @del_key: remove a key given the @mac_addr (%NULL for a group key)
+ *      and @key_index
+ *
+ * @set_default_key: set the default key on an interface
  */
 struct cfg80211_ops {
         int     (*add_virtual_intf)(struct wiphy *wiphy, char *name,
@@ -78,6 +110,18 @@ struct cfg80211_ops {
         int     (*del_virtual_intf)(struct wiphy *wiphy, int ifindex);
         int     (*change_virtual_intf)(struct wiphy *wiphy, int ifindex,
                                        enum nl80211_iftype type);
+
+        int     (*add_key)(struct wiphy *wiphy, struct net_device *netdev,
+                           u8 key_index, u8 *mac_addr,
+                           struct key_params *params);
+        int     (*get_key)(struct wiphy *wiphy, struct net_device *netdev,
+                           u8 key_index, u8 *mac_addr, void *cookie,
+                           void (*callback)(void *cookie, struct key_params*));
+        int     (*del_key)(struct wiphy *wiphy, struct net_device *netdev,
+                           u8 key_index, u8 *mac_addr);
+        int     (*set_default_key)(struct wiphy *wiphy,
+                                   struct net_device *netdev,
+                                   u8 key_index);
 };
 
 #endif /* __NET_CFG80211_H */