DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

MLD STA: Configure TK to the driver using AP MLD address

Browse source 
Configure TK to the driver with AP MLD address with MLO is used. Current
changes are handling only EAPOL-Key 4-way handshake and FILS
authentication cases, i.e., FT protocol case needs to be addressed
separately.

Signed-off-by: Rohan Dutta <quic_drohan@quicinc.com>
Signed-off-by: Veerendranath Jakkam <quic_vjakkam@quicinc.com>
This commit is contained in:
Rohan Dutta 2022-11-03 13:38:48 +05:30 committed by Jouni Malinen
parent fa5cad61a4
commit a4adb2f3e1
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/rsn_supp/wpa.c
View file

@ -1068,13 +1068,13 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
wpa_hexdump(MSG_DEBUG, "WPA: RSC", key_rsc, rsclen); wpa_hexdump(MSG_DEBUG, "WPA: RSC", key_rsc, rsclen);
} }
if (wpa_sm_set_key(sm, alg, sm->bssid, sm->keyidx_active, 1, key_rsc, if (wpa_sm_set_key(sm, alg, wpa_sm_get_auth_addr(sm), sm->keyidx_active,
rsclen, sm->ptk.tk, keylen, 1, key_rsc, rsclen, sm->ptk.tk, keylen,
KEY_FLAG_PAIRWISE | key_flag) < 0) { KEY_FLAG_PAIRWISE | key_flag) < 0) {
wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
"WPA: Failed to set PTK to the driver (alg=%d keylen=%d bssid=" "WPA: Failed to set PTK to the driver (alg=%d keylen=%d auth_addr="
MACSTR " idx=%d key_flag=0x%x)", MACSTR " idx=%d key_flag=0x%x)",
alg, keylen, MAC2STR(sm->bssid), alg, keylen, MAC2STR(wpa_sm_get_auth_addr(sm)),
sm->keyidx_active, key_flag); sm->keyidx_active, key_flag);
return -1; return -1;
} }
@ -1114,14 +1114,16 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
static int wpa_supplicant_activate_ptk(struct wpa_sm *sm) static int wpa_supplicant_activate_ptk(struct wpa_sm *sm)
{ {
wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
"WPA: Activate PTK (idx=%d bssid=" MACSTR ")", "WPA: Activate PTK (idx=%d auth_addr=" MACSTR ")",
sm->keyidx_active, MAC2STR(sm->bssid)); sm->keyidx_active, MAC2STR(wpa_sm_get_auth_addr(sm)));
if (wpa_sm_set_key(sm, 0, sm->bssid, sm->keyidx_active, 0, NULL, 0, if (wpa_sm_set_key(sm, 0, wpa_sm_get_auth_addr(sm), sm->keyidx_active,
NULL, 0, KEY_FLAG_PAIRWISE_RX_TX_MODIFY) < 0) { 0, NULL, 0, NULL, 0,
KEY_FLAG_PAIRWISE_RX_TX_MODIFY) < 0) {
wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
"WPA: Failed to activate PTK for TX (idx=%d bssid=" "WPA: Failed to activate PTK for TX (idx=%d auth_addr="
MACSTR ")", sm->keyidx_active, MAC2STR(sm->bssid)); MACSTR ")", sm->keyidx_active,
MAC2STR(wpa_sm_get_auth_addr(sm)));
return -1; return -1;
} }
return 0; return 0;
@ -5234,12 +5236,13 @@ int fils_process_assoc_resp(struct wpa_sm *sm, const u8 *resp, size_t len)
rsclen = wpa_cipher_rsc_len(sm->pairwise_cipher); rsclen = wpa_cipher_rsc_len(sm->pairwise_cipher);
wpa_hexdump_key(MSG_DEBUG, "FILS: Set TK to driver", wpa_hexdump_key(MSG_DEBUG, "FILS: Set TK to driver",
sm->ptk.tk, keylen); sm->ptk.tk, keylen);
if (wpa_sm_set_key(sm, alg, sm->bssid, 0, 1, null_rsc, rsclen, if (wpa_sm_set_key(sm, alg, wpa_sm_get_auth_addr(sm), 0, 1,
null_rsc, rsclen,
sm->ptk.tk, keylen, KEY_FLAG_PAIRWISE_RX_TX) < 0) { sm->ptk.tk, keylen, KEY_FLAG_PAIRWISE_RX_TX) < 0) {
wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
"FILS: Failed to set PTK to the driver (alg=%d keylen=%d bssid=" "FILS: Failed to set PTK to the driver (alg=%d keylen=%d auth_addr="
MACSTR ")", MACSTR ")",
alg, keylen, MAC2STR(sm->bssid)); alg, keylen, MAC2STR(wpa_sm_get_auth_addr(sm)));
goto fail; goto fail;
} }

1
src/rsn_supp/wpa_ft.c
View file

@ -494,6 +494,7 @@ static int wpa_ft_install_ptk(struct wpa_sm *sm, const u8 *bssid)
alg = wpa_cipher_to_alg(sm->pairwise_cipher); alg = wpa_cipher_to_alg(sm->pairwise_cipher);
keylen = wpa_cipher_key_len(sm->pairwise_cipher); keylen = wpa_cipher_key_len(sm->pairwise_cipher);
/* TODO: AP MLD address for MLO */
if (wpa_sm_set_key(sm, alg, bssid, 0, 1, null_rsc, sizeof(null_rsc), if (wpa_sm_set_key(sm, alg, bssid, 0, 1, null_rsc, sizeof(null_rsc),
(u8 *) sm->ptk.tk, keylen, (u8 *) sm->ptk.tk, keylen,
KEY_FLAG_PAIRWISE_RX_TX) < 0) { KEY_FLAG_PAIRWISE_RX_TX) < 0) {