Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-01-31 09:14:03 -05:00
Code Issues Projects Releases Wiki Activity

nl80211: Drop outdated TDLS set_key() hack

Browse Source 
wpa_tdls_set_key() did set the key_id to -1 to avoid a useless
NL80211_CMD_SET_KEY call that the updated nl80211 driver no longer
carries out. Remove the no longer required workaround.

Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
This commit is contained in:
Alexander Wetzel 2020-03-05 22:06:45 +01:00 committed by Jouni Malinen
parent 2dd72315d9
commit 11b1fcd6ca
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/drivers/driver_nl80211.c
View File

@ -3077,10 +3077,7 @@ static int wpa_driver_nl80211_set_key(struct i802_bss *bss,
"set_tx=%d seq_len=%lu key_len=%lu key_flag=0x%x", "set_tx=%d seq_len=%lu key_len=%lu key_flag=0x%x",
__func__, ifindex, ifname, alg, addr, key_idx, set_tx, __func__, ifindex, ifname, alg, addr, key_idx, set_tx,
(unsigned long) seq_len, (unsigned long) key_len, key_flag); (unsigned long) seq_len, (unsigned long) key_len, key_flag);
#ifdef CONFIG_TDLS
if (key_idx == -1)
key_idx = 0;
#endif /* CONFIG_TDLS */
if (check_key_flag(key_flag)) { if (check_key_flag(key_flag)) {
wpa_printf(MSG_DEBUG, "%s: invalid key_flag", __func__); wpa_printf(MSG_DEBUG, "%s: invalid key_flag", __func__);
return -EINVAL; return -EINVAL;

2
src/rsn_supp/tdls.c
View File

@ -227,7 +227,7 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR, wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR,
MAC2STR(peer->addr)); MAC2STR(peer->addr));
if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1, rsc, sizeof(rsc), if (wpa_sm_set_key(sm, alg, peer->addr, 0, 1, rsc, sizeof(rsc),
peer->tpk.tk, key_len, peer->tpk.tk, key_len,
KEY_FLAG_PAIRWISE_RX_TX) < 0) { KEY_FLAG_PAIRWISE_RX_TX) < 0) {
wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the " wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the "