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

wlantest: Do not update RSC on replays

Browse source 
This changes wlantest behavior to mark CCMP/TKIP replays for more cases
in case a device is resetting its TSC. Previously, the RSC check got
cleared on the first marked replay and the following packets were not
marked as replays if they continued incrementing the PN even if that PN
was below the highest value received with this key at some point in the
past.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2017-10-14 12:15:52 +03:00
parent b488a12948
commit 4158b80eef
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wlantest/rx_data.c
View file

@ -146,6 +146,7 @@ static void rx_data_bss_prot_group(struct wlantest *wt,
u8 *decrypted = NULL; u8 *decrypted = NULL;
size_t dlen; size_t dlen;
u8 pn[6]; u8 pn[6];
int replay = 0;
bss = bss_get(wt, hdr->addr2); bss = bss_get(wt, hdr->addr2);
if (bss == NULL) if (bss == NULL)
@ -211,6 +212,7 @@ static void rx_data_bss_prot_group(struct wlantest *wt,
" Retry" : ""); " Retry" : "");
wpa_hexdump(MSG_INFO, "RX PN", pn, 6); wpa_hexdump(MSG_INFO, "RX PN", pn, 6);
wpa_hexdump(MSG_INFO, "RSC", bss->rsc[keyid], 6); wpa_hexdump(MSG_INFO, "RSC", bss->rsc[keyid], 6);
replay = 1;
} }
skip_replay_det: skip_replay_det:
@ -233,7 +235,8 @@ skip_replay_det:
if (decrypted) { if (decrypted) {
rx_data_process(wt, bss->bssid, NULL, dst, src, decrypted, rx_data_process(wt, bss->bssid, NULL, dst, src, decrypted,
dlen, 1, NULL); dlen, 1, NULL);
os_memcpy(bss->rsc[keyid], pn, 6); if (!replay)
os_memcpy(bss->rsc[keyid], pn, 6);
write_pcap_decrypted(wt, (const u8 *) hdr, hdrlen, write_pcap_decrypted(wt, (const u8 *) hdr, hdrlen,
decrypted, dlen); decrypted, dlen);
} else } else
@ -259,6 +262,7 @@ static void rx_data_bss_prot(struct wlantest *wt,
const u8 *tk = NULL; const u8 *tk = NULL;
int ptk_iter_done = 0; int ptk_iter_done = 0;
int try_ptk_iter = 0; int try_ptk_iter = 0;
int replay = 0;
if (hdr->addr1[0] & 0x01) { if (hdr->addr1[0] & 0x01) {
rx_data_bss_prot_group(wt, hdr, hdrlen, qos, dst, src, rx_data_bss_prot_group(wt, hdr, hdrlen, qos, dst, src,
@ -413,6 +417,7 @@ static void rx_data_bss_prot(struct wlantest *wt,
" Retry" : ""); " Retry" : "");
wpa_hexdump(MSG_INFO, "RX PN", pn, 6); wpa_hexdump(MSG_INFO, "RX PN", pn, 6);
wpa_hexdump(MSG_INFO, "RSC", rsc, 6); wpa_hexdump(MSG_INFO, "RSC", rsc, 6);
replay = 1;
} }
skip_replay_det: skip_replay_det:
@ -457,7 +462,8 @@ skip_replay_det:
const u8 *peer_addr = NULL; const u8 *peer_addr = NULL;
if (!(fc & (WLAN_FC_FROMDS | WLAN_FC_TODS))) if (!(fc & (WLAN_FC_FROMDS | WLAN_FC_TODS)))
peer_addr = hdr->addr1; peer_addr = hdr->addr1;
os_memcpy(rsc, pn, 6); if (!replay)
os_memcpy(rsc, pn, 6);
rx_data_process(wt, bss->bssid, sta->addr, dst, src, decrypted, rx_data_process(wt, bss->bssid, sta->addr, dst, src, decrypted,
dlen, 1, peer_addr); dlen, 1, peer_addr);
write_pcap_decrypted(wt, (const u8 *) hdr, hdrlen, write_pcap_decrypted(wt, (const u8 *) hdr, hdrlen,