wpa_tdls_set_key() did set the key_id to -1 as a signal to handle the
key install a bit different than for other pairwise keys.
Since we cleaned up the install logic with a previous patch this signal
is no longer needed and we can remove the workaround.
Signed-off-by: Alexander Wetzel <alexander@xxxxxxxxxxxxxx>
---
The workaround cleaned up here was not limited nl80211, so a put it into
a separate patch. It just finalizes the nl80211 driver key install
cleanup without breaking anything between the patches.
src/drivers/driver_nl80211.c | 6 ------
src/rsn_supp/tdls.c | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 3762e9d66..7ff912912 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -3031,12 +3031,6 @@ static int wpa_driver_nl80211_set_key(const char *ifname, struct i802_bss *bss,
"set_tx=%d seq_len=%lu key_len=%lu key_type=%d",
__func__, ifindex, ifname, alg, addr, key_idx, set_tx,
(unsigned long) seq_len, (unsigned long) key_len, key_type);
-#ifdef CONFIG_TDLS
- if (key_idx == -1) {
- key_idx = 0;
- }
-#endif /* CONFIG_TDLS */
-
#ifdef CONFIG_DRIVER_NL80211_QCA
if (alg == WPA_ALG_PMK &&
(drv->capa.flags & WPA_DRIVER_FLAGS_KEY_MGMT_OFFLOAD)) {
diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c
index 348c491be..01d339290 100644
--- a/src/rsn_supp/tdls.c
+++ b/src/rsn_supp/tdls.c
@@ -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,
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, KEY_TYPE_PAIRWISE) < 0) {
wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the "
"driver");
--
2.22.0
_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap
