Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-22 21:12:48 +01:00
Code Releases Activity

handshake: update TK installer/builder to take key index

Browse Source
This commit is contained in:
James Prestwood 2021-10-08 11:07:22 -07:00 committed by Denis Kenzior
parent a001740506
commit 80135367cf
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/handshake.c
View File

@ -666,7 +666,7 @@ void handshake_state_install_ptk(struct handshake_state *s)
handshake_event(s, HANDSHAKE_EVENT_SETTING_KEYS); handshake_event(s, HANDSHAKE_EVENT_SETTING_KEYS);
install_tk(s, handshake_get_tk(s), cipher); install_tk(s, s->active_tk_index, handshake_get_tk(s), cipher);
} }
} }

1
src/handshake.h
View File

@ -68,6 +68,7 @@ typedef void (*handshake_event_func_t)(struct handshake_state *hs,
typedef bool (*handshake_get_nonce_func_t)(uint8_t nonce[]); typedef bool (*handshake_get_nonce_func_t)(uint8_t nonce[]);
typedef void (*handshake_install_tk_func_t)(struct handshake_state *hs, typedef void (*handshake_install_tk_func_t)(struct handshake_state *hs,
uint8_t key_index,
const uint8_t *tk, uint32_t cipher); const uint8_t *tk, uint32_t cipher);
typedef void (*handshake_install_gtk_func_t)(struct handshake_state *hs, typedef void (*handshake_install_gtk_func_t)(struct handshake_state *hs,
uint16_t key_index, uint16_t key_index,

9
src/netdev.c
View File

@ -1735,9 +1735,9 @@ static struct l_genl_msg *netdev_build_cmd_new_key_pairwise(
uint32_t cipher, uint32_t cipher,
const uint8_t *aa, const uint8_t *aa,
const uint8_t *tk, const uint8_t *tk,
size_t tk_len) size_t tk_len,
uint8_t key_id)
{ {
uint8_t key_id = 0;
struct l_genl_msg *msg; struct l_genl_msg *msg;
msg = l_genl_msg_new_sized(NL80211_CMD_NEW_KEY, 512); msg = l_genl_msg_new_sized(NL80211_CMD_NEW_KEY, 512);
@ -1775,7 +1775,7 @@ static void netdev_group_timeout_cb(struct l_timeout *timeout, void *user_data)
netdev_connect_ok(nhs->netdev); netdev_connect_ok(nhs->netdev);
} }
static void netdev_set_tk(struct handshake_state *hs, static void netdev_set_tk(struct handshake_state *hs, uint8_t key_index,
const uint8_t *tk, uint32_t cipher) const uint8_t *tk, uint32_t cipher)
{ {
struct netdev_handshake_state *nhs = struct netdev_handshake_state *nhs =
@ -1823,7 +1823,8 @@ static void netdev_set_tk(struct handshake_state *hs,
goto invalid_key; goto invalid_key;
msg = netdev_build_cmd_new_key_pairwise(netdev, cipher, addr, tk_buf, msg = netdev_build_cmd_new_key_pairwise(netdev, cipher, addr, tk_buf,
crypto_cipher_key_len(cipher)); crypto_cipher_key_len(cipher),
key_index);
nhs->pairwise_new_key_cmd_id = nhs->pairwise_new_key_cmd_id =
l_genl_family_send(nl80211, msg, netdev_new_pairwise_key_cb, l_genl_family_send(nl80211, msg, netdev_new_pairwise_key_cb,
nhs, NULL); nhs, NULL);