diff options
author | Denis Kenzior <denkenz@gmail.com> | 2023-11-14 10:09:07 -0600 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2023-11-14 10:09:07 -0600 |
commit | 28798990d276dddc787b3679dcf0c259b0324d6b (patch) | |
tree | 660a3871b7d67064a504f59a1bf03d6059b82ff0 | |
parent | 05c1d34c6ebf7c35df72e202e10e50c76aa6e83a (diff) |
netdev: Move CMD_REKEY_OFFLOAD builder to nl80211util
-rw-r--r-- | src/netdev.c | 26 | ||||
-rw-r--r-- | src/nl80211util.c | 24 | ||||
-rw-r--r-- | src/nl80211util.h | 5 |
3 files changed, 30 insertions, 25 deletions
diff --git a/src/netdev.c b/src/netdev.c index 086c3b9d1..418626d72 100644 --- a/src/netdev.c +++ b/src/netdev.c @@ -2163,30 +2163,6 @@ static void hardware_rekey_cb(struct l_genl_msg *msg, void *data) } } -static struct l_genl_msg *netdev_build_cmd_replay_counter(struct netdev *netdev, - const uint8_t *kek, - const uint8_t *kck, - uint64_t replay_ctr) -{ - struct l_genl_msg *msg; - - msg = l_genl_msg_new_sized(NL80211_CMD_SET_REKEY_OFFLOAD, 512); - - l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &netdev->index); - - l_genl_msg_enter_nested(msg, NL80211_ATTR_REKEY_DATA); - l_genl_msg_append_attr(msg, NL80211_REKEY_DATA_KEK, - NL80211_KEK_LEN, kek); - l_genl_msg_append_attr(msg, NL80211_REKEY_DATA_KCK, - NL80211_KCK_LEN, kck); - l_genl_msg_append_attr(msg, NL80211_REKEY_DATA_REPLAY_CTR, - NL80211_REPLAY_CTR_LEN, &replay_ctr); - - l_genl_msg_leave_nested(msg); - - return msg; -} - static void netdev_set_rekey_offload(uint32_t ifindex, const uint8_t *kek, const uint8_t *kck, @@ -2207,7 +2183,7 @@ static void netdev_set_rekey_offload(uint32_t ifindex, return; l_debug("%d", netdev->index); - msg = netdev_build_cmd_replay_counter(netdev, kek, kck, replay_counter); + msg = nl80211_build_rekey_offload(ifindex, kek, kck, replay_counter); netdev->rekey_offload_cmd_id = l_genl_family_send(nl80211, msg, hardware_rekey_cb, netdev, NULL); diff --git a/src/nl80211util.c b/src/nl80211util.c index 87e859c96..ef69cc718 100644 --- a/src/nl80211util.c +++ b/src/nl80211util.c @@ -408,6 +408,30 @@ struct l_genl_msg *nl80211_build_new_rx_key_pairwise(uint32_t ifindex, return msg; } +struct l_genl_msg *nl80211_build_rekey_offload(uint32_t ifindex, + const uint8_t *kek, + const uint8_t *kck, + uint64_t replay_ctr) +{ + struct l_genl_msg *msg; + + msg = l_genl_msg_new_sized(NL80211_CMD_SET_REKEY_OFFLOAD, 512); + + l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &ifindex); + + l_genl_msg_enter_nested(msg, NL80211_ATTR_REKEY_DATA); + l_genl_msg_append_attr(msg, NL80211_REKEY_DATA_KEK, + NL80211_KEK_LEN, kek); + l_genl_msg_append_attr(msg, NL80211_REKEY_DATA_KCK, + NL80211_KCK_LEN, kck); + l_genl_msg_append_attr(msg, NL80211_REKEY_DATA_REPLAY_CTR, + NL80211_REPLAY_CTR_LEN, &replay_ctr); + + l_genl_msg_leave_nested(msg); + + return msg; +} + static struct l_genl_msg *nl80211_build_set_station(uint32_t ifindex, const uint8_t *addr, struct nl80211_sta_flag_update *flags) diff --git a/src/nl80211util.h b/src/nl80211util.h index d8026a8eb..9f8ae17ae 100644 --- a/src/nl80211util.h +++ b/src/nl80211util.h @@ -57,6 +57,11 @@ struct l_genl_msg *nl80211_build_new_rx_key_pairwise(uint32_t ifindex, size_t tk_len, uint8_t key_id); +struct l_genl_msg *nl80211_build_rekey_offload(uint32_t ifindex, + const uint8_t *kek, + const uint8_t *kck, + uint64_t replay_ctr); + struct l_genl_msg *nl80211_build_set_station_authorized(uint32_t ifindex, const uint8_t *addr); |