jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wlantest: Fix pcapng writer to include decrypted EAPOL-Key Key Data

Browse source 
This was only written to pcapng files if both pcap and pcapng writing
was requested. Fix this for the case where only a pcapng file is being
written.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2017-03-26 12:49:59 +03:00
parent a5269dc209
commit dd4722df9b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wlantest/rx_eapol.c
View file

@ -638,7 +638,7 @@ static void rx_data_eapol_key_3_of_4(struct wlantest *wt, const u8 *dst,
wpa_hexdump(MSG_DEBUG, "Decrypted EAPOL-Key Key Data", wpa_hexdump(MSG_DEBUG, "Decrypted EAPOL-Key Key Data",
decrypted, decrypted_len); decrypted, decrypted_len);
} }
if (wt->write_pcap_dumper && decrypted != key_data) { if ((wt->write_pcap_dumper || wt->pcapng) && decrypted != key_data) {
/* Fill in a dummy Data frame header */ /* Fill in a dummy Data frame header */
u8 buf[24 + 8 + sizeof(*eapol) + sizeof(*hdr) + 64]; u8 buf[24 + 8 + sizeof(*eapol) + sizeof(*hdr) + 64];
struct ieee80211_hdr *h; struct ieee80211_hdr *h;
@ -841,7 +841,7 @@ static void rx_data_eapol_key_1_of_2(struct wlantest *wt, const u8 *dst,
} }
wpa_hexdump(MSG_DEBUG, "Decrypted EAPOL-Key Key Data", wpa_hexdump(MSG_DEBUG, "Decrypted EAPOL-Key Key Data",
decrypted, decrypted_len); decrypted, decrypted_len);
if (wt->write_pcap_dumper) { if (wt->write_pcap_dumper || wt->pcapng) {
/* Fill in a dummy Data frame header */ /* Fill in a dummy Data frame header */
u8 buf[24 + 8 + sizeof(*eapol) + sizeof(*hdr) + 64]; u8 buf[24 + 8 + sizeof(*eapol) + sizeof(*hdr) + 64];
struct ieee80211_hdr *h; struct ieee80211_hdr *h;