1/1] wlcore: mesh: Add support for RX Boradcast Key
PATCH 1/1 1/1] wlcore: mesh: Add support for RX Boradcast Key
From: Maital Hahn <[email protected]>
In order to support authentication of equals peers,
need to save RX Broadcast key per peer (on top of 1 TX broadcast key and unicast key per peer).
Signed-off-by Maital Hahn <[email protected]>
Acked-by Guy Mishol <[email protected]>
Signed-off-by Hari Nagalla <[email protected]>
--- drivers/net/wireless/ti/wlcore/cmd.c | 6 ++++-- drivers/net/wireless/ti/wlcore/cmd.h | 2 +- drivers/net/wireless/ti/wlcore/main.c | 23 +++++++++++++++-------- drivers/net/wireless/ti/wlcore/wlcore_i.h | 1 + 4 files changed, 21 insertions(+), 11 deletions(-)
drivers/net/wireless/ti/wlcore/cmd.c +4 -2
@@ -1443,7 +1443,7 @@ int wl1271_cmd_set_sta_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,int wl1271_cmd_set_ap_key (struct wl1271 *wl,struct wl12xx_vif *wlvif,u16 action,u8 id,u8 key_type,u8 key_size,const u8 *key,u8 hlid,u32 tx_seq_32, -u16 tx_seq_16) +u16 tx_seq_16,bool is_pairwise) {struct wl1271_cmd_set_keys *cmd;int ret =0 ;
@@ -1458,8 +1458,10 @@ int wl1271_cmd_set_ap_key(struct wl1271 *wl, struct wl12xx_vif *wlvif, lid_type =WEP_DEFAULT_LID_TYPE ; else lid_type =BROADCAST_LID_TYPE ; - }else { + }else if (is_pairwise) { lid_type =UNICAST_LID_TYPE ; + }else { + lid_type =BROADCAST_LID_TYPE ; } wl1271_debug(DEBUG_CRYPT, "ap key action: %d id: %d lid: %d type: %d"
drivers/net/wireless/ti/wlcore/cmd.h +1 -1
@@ -79,7 +79,7 @@ int wl1271_cmd_set_sta_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,int wl1271_cmd_set_ap_key (struct wl1271 *wl,struct wl12xx_vif *wlvif,u16 action,u8 id,u8 key_type,u8 key_size,const u8 *key,u8 hlid,u32 tx_seq_32, -u16 tx_seq_16); +u16 tx_seq_16,bool is_pairwise);int wl12xx_cmd_set_peer_state (struct wl1271 *wl,struct wl12xx_vif *wlvif,u8 hlid); int wl12xx_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 role_id,
drivers/net/wireless/ti/wlcore/main.c +15 -8
@@ -3287,7 +3287,7 @@ static void wl1271_op_configure_filter(struct ieee80211_hw *hw,static int wl1271_record_ap_key (struct wl1271 *wl,struct wl12xx_vif *wlvif,u8 id,u8 key_type,u8 key_size,const u8 *key,u8 hlid,u32 tx_seq_32, -u16 tx_seq_16) +u16 tx_seq_16,bool is_pairwise) {struct wl1271_ap_key *ap_key;int i;
@@ -3325,6 +3325,7 @@ static int wl1271_record_ap_key(struct wl1271 *wl, struct wl12xx_vif *wlvif, ap_key->hlid = hlid; ap_key->tx_seq_32 = tx_seq_32; ap_key->tx_seq_16 = tx_seq_16; + ap_key->is_pairwise = is_pairwise; wlvif->ap.recorded_keys[i] = ap_key;return 0 ;
@@ -3360,7 +3361,7 @@ static int wl1271_ap_init_hwenc(struct wl1271 *wl, struct wl12xx_vif *wlvif) key->id, key->key_type, key->key_size, key->key, hlid, key->tx_seq_32, - key->tx_seq_16); + key->tx_seq_16, key->is_pairwise);if (ret <0 ) goto out;
@@ -3383,7 +3384,8 @@ static int wl1271_ap_init_hwenc(struct wl1271 *wl, struct wl12xx_vif *wlvif)static int wl1271_set_key (struct wl1271 *wl,struct wl12xx_vif *wlvif,u16 action,u8 id,u8 key_type,u8 key_size,const u8 *key,u32 tx_seq_32, -u16 tx_seq_16,struct ieee80211_sta *sta) +u16 tx_seq_16,struct ieee80211_sta *sta, +bool is_pairwise) {int ret;bool is_ap = (wlvif->bss_type ==BSS_TYPE_AP_BSS );
@@ -3410,12 +3412,12 @@ static int wl1271_set_key(struct wl1271 *wl, struct wl12xx_vif *wlvif, ret =wl1271_record_ap_key (wl, wlvif, id, key_type, key_size, key, hlid, tx_seq_32, - tx_seq_16); + tx_seq_16, is_pairwise); }else { ret =wl1271_cmd_set_ap_key (wl, wlvif, action, id, key_type, key_size, key, hlid, tx_seq_32, - tx_seq_16); + tx_seq_16, is_pairwise); }if (ret <0 )
@@ -3515,6 +3517,7 @@ int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd,u16 tx_seq_16 =0 ;u8 key_type;u8 hlid; +bool is_pairwise;wl1271_debug (DEBUG_MAC80211 ,"mac80211 set key" );
@@ -3564,12 +3567,14 @@ int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd,return -EOPNOTSUPP ; } + is_pairwise = key_conf->flags &IEEE80211_KEY_FLAG_PAIRWISE ; +switch (cmd) {case SET_KEY : ret =wl1271_set_key (wl, wlvif,KEY_ADD_OR_REPLACE , key_conf->keyidx, key_type, key_conf->keylen, key_conf->key, - tx_seq_32, tx_seq_16, sta); + tx_seq_32, tx_seq_16, sta, is_pairwise);if (ret <0 ) {wl1271_error ("Could not add or replace key" );return ret;
@@ -3595,7 +3600,7 @@ int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd, ret =wl1271_set_key (wl, wlvif,KEY_REMOVE , key_conf->keyidx, key_type, key_conf->keylen, key_conf->key, -0 ,0 , sta); +0 ,0 , sta, is_pairwise);if (ret <0 ) {wl1271_error ("Could not remove key" );return ret;
@@ -6236,6 +6241,7 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)ieee80211_hw_set (wl->hw,SUPPORT_FAST_XMIT );ieee80211_hw_set (wl->hw,CHANCTX_STA_CSA ); +ieee80211_hw_set (wl->hw,SUPPORTS_PER_STA_GTK );ieee80211_hw_set (wl->hw,QUEUE_CONTROL );ieee80211_hw_set (wl->hw,TX_AMPDU_SETUP_IN_HW );ieee80211_hw_set (wl->hw,AMPDU_AGGREGATION );
@@ -6280,7 +6286,8 @@ static int wl1271_init_ieee80211(struct wl1271 *wl) wl->hw->wiphy->flags |=WIPHY_FLAG_AP_UAPSD |WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL | -WIPHY_FLAG_HAS_CHANNEL_SWITCH ; +WIPHY_FLAG_HAS_CHANNEL_SWITCH | ++WIPHY_FLAG_IBSS_RSN ; wl->hw->wiphy->features |=NL80211_FEATURE_AP_SCAN ;
drivers/net/wireless/ti/wlcore/wlcore_i.h +1 -0
@@ -226,6 +226,7 @@ struct wl1271_ap_key {u8 hlid;u32 tx_seq_32;u16 tx_seq_16; +bool is_pairwise; };enum wl12xx_flags {
Signature · 1 line
2.17.1
PATCH 1/1 0/1] *** Support for RX Broadcast key ***
*** BLURB HERE ***
Maital Hahn (1):
wlcore: mesh: Add support for RX Boradcast Key
drivers/net/wireless/ti/wlcore/cmd.c | 6 ++++-- drivers/net/wireless/ti/wlcore/cmd.h | 2 +- drivers/net/wireless/ti/wlcore/main.c | 23 +++++++++++++++-------- drivers/net/wireless/ti/wlcore/wlcore_i.h | 1 + 4 files changed, 21 insertions(+), 11 deletions(-)
Signature · 1 line
2.17.1
Quoted 10 lines · Hari Nagalla
From: Maital Hahn <[email protected]>
In order to support authentication of equals peers,
need to save RX Broadcast key per peer (on top of 1 TX broadcast key and unicast key per peer).Signed-off-by Maital Hahn <[email protected]>Acked-by Guy Mishol <[email protected]>Signed-off-by Hari Nagalla <[email protected]>
As this a new feature, and not fixing a serious issue, I think this should go to wireles-drivers-next, not wireless-drivers. Agree?
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches