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

wlantest: Fix TK iteration based on the PTK file

Browse source 
Use of ptk_len is not valid here to check what is the length of the
actual TK. Fix this by using ptk->tk_len instead so that the appropriate
decryption function can be selected for cases where the TKs are
configured through the PTK file.

Fixes: ce7bdb54e5 ("wlantest: Extend Management frame decryption to support GCMP and CCMP-256")
Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2024-02-01 19:51:56 +02:00 committed by Jouni Malinen
parent dfaedb2095
commit 1abdeaa412
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wlantest/rx_mgmt.c
View file

@ -3062,21 +3062,21 @@ static int check_bip(struct wlantest *wt, const u8 *data, size_t len)
} }
static u8 * try_tk(struct wpa_ptk *ptk, size_t ptk_len, static u8 * try_tk(struct wpa_ptk *ptk,
const u8 *data, size_t len, size_t *dlen) const u8 *data, size_t len, size_t *dlen)
{ {
const struct ieee80211_hdr *hdr; const struct ieee80211_hdr *hdr;
u8 *decrypted, *frame; u8 *decrypted, *frame;
hdr = (const struct ieee80211_hdr *) data; hdr = (const struct ieee80211_hdr *) data;
if (ptk_len == 16) { if (ptk->tk_len == 16) {
decrypted = ccmp_decrypt(ptk->tk, hdr, NULL, NULL, NULL, decrypted = ccmp_decrypt(ptk->tk, hdr, NULL, NULL, NULL,
data + 24, len - 24, dlen); data + 24, len - 24, dlen);
if (!decrypted) if (!decrypted)
decrypted = gcmp_decrypt(ptk->tk, 16, hdr, NULL, NULL, decrypted = gcmp_decrypt(ptk->tk, 16, hdr, NULL, NULL,
NULL, NULL,
data + 24, len - 24, dlen); data + 24, len - 24, dlen);
} else if (ptk_len == 32) { } else if (ptk->tk_len == 32) {
decrypted = ccmp_256_decrypt(ptk->tk, hdr, NULL, NULL, NULL, decrypted = ccmp_256_decrypt(ptk->tk, hdr, NULL, NULL, NULL,
data + 24, len - 24, dlen); data + 24, len - 24, dlen);
if (!decrypted) if (!decrypted)
@ -3112,7 +3112,7 @@ static u8 * mgmt_decrypt_tk(struct wlantest *wt, const u8 *data, size_t len,
wpa_debug_level = MSG_WARNING; wpa_debug_level = MSG_WARNING;
dl_list_for_each(ptk, &wt->ptk, struct wlantest_ptk, list) { dl_list_for_each(ptk, &wt->ptk, struct wlantest_ptk, list) {
decrypted = try_tk(&ptk->ptk, ptk->ptk_len, data, len, dlen); decrypted = try_tk(&ptk->ptk, data, len, dlen);
if (decrypted) { if (decrypted) {
wpa_debug_level = prev_level; wpa_debug_level = prev_level;
add_note(wt, MSG_DEBUG, add_note(wt, MSG_DEBUG,