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

wlantest: Extend protected Data frame checks for GCMP and CCMP-256

Browse source 
The same rules that apply to CCMP-128 apply also for GCMP-128, CCMP-256,
and GCMP-256 here.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2022-08-29 21:31:52 +03:00 • committed by Jouni Malinen
parent 01e7acc747
commit cc046a1ff8
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wlantest/rx_data.c
View file

@ -507,9 +507,11 @@ static void rx_data_bss_prot(struct wlantest *wt,
if (sta == NULL) if (sta == NULL)
return; return;
if (sta->pairwise_cipher & (WPA_CIPHER_TKIP | WPA_CIPHER_CCMP) && if (sta->pairwise_cipher & (WPA_CIPHER_TKIP | WPA_CIPHER_CCMP |
WPA_CIPHER_GCMP | WPA_CIPHER_GCMP_256 |
WPA_CIPHER_CCMP_256) &&
!(data[3] & 0x20)) { !(data[3] & 0x20)) {
add_note(wt, MSG_INFO, "Expected TKIP/CCMP frame from " add_note(wt, MSG_INFO, "Expected TKIP/CCMP/GCMP frame from "
MACSTR " did not have ExtIV bit set to 1", MACSTR " did not have ExtIV bit set to 1",
MAC2STR(src)); MAC2STR(src));
return; return;
@ -528,9 +530,12 @@ static void rx_data_bss_prot(struct wlantest *wt,
MAC2STR(hdr->addr2), data[1], MAC2STR(hdr->addr2), data[1],
(data[0] | 0x20) & 0x7f); (data[0] | 0x20) & 0x7f);
} }
} else if (tk || sta->pairwise_cipher == WPA_CIPHER_CCMP) { } else if (tk || sta->pairwise_cipher == WPA_CIPHER_CCMP ||
sta->pairwise_cipher == WPA_CIPHER_GCMP ||
sta->pairwise_cipher == WPA_CIPHER_GCMP_256 ||
sta->pairwise_cipher == WPA_CIPHER_CCMP_256) {
if (data[2] != 0 || (data[3] & 0x1f) != 0) { if (data[2] != 0 || (data[3] & 0x1f) != 0) {
add_note(wt, MSG_INFO, "CCMP frame from " MACSTR add_note(wt, MSG_INFO, "CCMP/GCMP frame from " MACSTR
" used non-zero reserved bit", " used non-zero reserved bit",
MAC2STR(hdr->addr2)); MAC2STR(hdr->addr2));
} }