diff options
| author | Ashok Kumar Ponnaiah <aponnaia@qti.qualcomm.com> | 2014-08-29 13:04:08 (GMT) |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2014-09-03 12:41:35 (GMT) |
| commit | 3a3cb8ee81f4f93fbb3d8977808055adabd47ec6 (patch) | |
| tree | b02ebdb8f1bd6dad66fae17f7c55458e92106e93 /wlantest | |
| parent | fa6fff189339b0f25e7e83fbf919223fd85b92f8 (diff) | |
| download | hostap-3a3cb8ee81f4f93fbb3d8977808055adabd47ec6.zip hostap-3a3cb8ee81f4f93fbb3d8977808055adabd47ec6.tar.gz hostap-3a3cb8ee81f4f93fbb3d8977808055adabd47ec6.tar.bz2 | |
wlantest: Indicate if a TKIP/CCMP replay has Retry=1
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wlantest')
| -rw-r--r-- | wlantest/rx_data.c | 12 | ||||
| -rw-r--r-- | wlantest/rx_mgmt.c | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/wlantest/rx_data.c b/wlantest/rx_data.c index dec5857..e0c9229 100644 --- a/wlantest/rx_data.c +++ b/wlantest/rx_data.c @@ -192,11 +192,13 @@ static void rx_data_bss_prot_group(struct wlantest *wt, if (os_memcmp(pn, bss->rsc[keyid], 6) <= 0) { u16 seq_ctrl = le_to_host16(hdr->seq_ctrl); add_note(wt, MSG_INFO, "CCMP/TKIP replay detected: A1=" MACSTR - " A2=" MACSTR " A3=" MACSTR " seq=%u frag=%u", + " A2=" MACSTR " A3=" MACSTR " seq=%u frag=%u%s", MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), MAC2STR(hdr->addr3), WLAN_GET_SEQ_SEQ(seq_ctrl), - WLAN_GET_SEQ_FRAG(seq_ctrl)); + WLAN_GET_SEQ_FRAG(seq_ctrl), + (le_to_host16(hdr->frame_control) & WLAN_FC_RETRY) ? + " Retry" : ""); wpa_hexdump(MSG_INFO, "RX PN", pn, 6); wpa_hexdump(MSG_INFO, "RSC", bss->rsc[keyid], 6); } @@ -369,11 +371,13 @@ static void rx_data_bss_prot(struct wlantest *wt, if (os_memcmp(pn, rsc, 6) <= 0) { u16 seq_ctrl = le_to_host16(hdr->seq_ctrl); add_note(wt, MSG_INFO, "CCMP/TKIP replay detected: A1=" MACSTR - " A2=" MACSTR " A3=" MACSTR " seq=%u frag=%u", + " A2=" MACSTR " A3=" MACSTR " seq=%u frag=%u%s", MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), MAC2STR(hdr->addr3), WLAN_GET_SEQ_SEQ(seq_ctrl), - WLAN_GET_SEQ_FRAG(seq_ctrl)); + WLAN_GET_SEQ_FRAG(seq_ctrl), + (le_to_host16(hdr->frame_control) & WLAN_FC_RETRY) ? + " Retry" : ""); wpa_hexdump(MSG_INFO, "RX PN", pn, 6); wpa_hexdump(MSG_INFO, "RSC", rsc, 6); } diff --git a/wlantest/rx_mgmt.c b/wlantest/rx_mgmt.c index c6ff718..367a6b5 100644 --- a/wlantest/rx_mgmt.c +++ b/wlantest/rx_mgmt.c @@ -930,11 +930,13 @@ static u8 * mgmt_ccmp_decrypt(struct wlantest *wt, const u8 *data, size_t len, if (os_memcmp(pn, rsc, 6) <= 0) { u16 seq_ctrl = le_to_host16(hdr->seq_ctrl); add_note(wt, MSG_INFO, "CCMP/TKIP replay detected: A1=" MACSTR - " A2=" MACSTR " A3=" MACSTR " seq=%u frag=%u", + " A2=" MACSTR " A3=" MACSTR " seq=%u frag=%u%s", MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), MAC2STR(hdr->addr3), WLAN_GET_SEQ_SEQ(seq_ctrl), - WLAN_GET_SEQ_FRAG(seq_ctrl)); + WLAN_GET_SEQ_FRAG(seq_ctrl), + (le_to_host16(hdr->frame_control) & WLAN_FC_RETRY) ? + " Retry" : ""); wpa_hexdump(MSG_INFO, "RX PN", pn, 6); wpa_hexdump(MSG_INFO, "RSC", rsc, 6); } |