forked from osmocom/wireshark
52a6671439
Support reading and writing pcapng files with DSBs. A DSB may occur multiple times but should appear before packets that need those decryption secrets (so it cannot be moved to the end like NRB). The TLS dissector will be updated in the future to make use of these secrets. pcapng spec update: https://github.com/pcapng/pcapng/pull/54 As DSBs may be interleaved with packets, do not even try to read it in pcapng_open (as is done for IDBs). Instead process them during the sequential read, appending them to the 'wtap::dsbs' array. Writing is more complicated, secrets may initially not be available when 'wtap_dumper' is created. As they may become available in 'wtap::dsbs' as more packets are read, allow 'wtap_dumper::dsbs_growing' to reference this array. This saves every user from checking/dumping DSBs. If the wtap user needs to insert extra DSBs (while preserving existing DSBs), they can set the 'wtap_dumper::dsbs_initial' field. The test file was creating using a patched editcap (future patch) and combined using mergecap (which required a change to preserve the DSBs). Change-Id: I74e4ee3171bd852a89ea0f6fbae9e0f65ed6eda9 Ping-Bug: 15252 Reviewed-on: https://code.wireshark.org/review/30692 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> |
||
|---|---|---|
| .. | ||
| arp.pcap | ||
| c1222_std_example8.pcap | ||
| dhcp-nanosecond.pcap | ||
| dhcp-nanosecond.pcapng | ||
| dhcp.pcap | ||
| dhcp.pcapng | ||
| dhe1.pcapng.gz | ||
| dmgr.pcapng | ||
| dns+icmp.pcapng.gz | ||
| dns-ooo.pcap | ||
| dns_port.pcap | ||
| dtls12-aes128ccm8.pcap | ||
| dvb-ci_UV1_0000.pcap | ||
| empty.pcap | ||
| esp-bug-12671.pcapng.gz | ||
| http-ooo.pcap | ||
| http.pcap | ||
| http2-data-reassembly.pcap | ||
| icmp.pcapng.gz | ||
| ikev1-bug-12610.pcapng.gz | ||
| ikev1-bug-12620.pcapng.gz | ||
| ikev1-certs.pcap | ||
| ikev2-decrypt-3des-sha1_160.pcap | ||
| ikev2-decrypt-aes128ccm12-2.pcap | ||
| ikev2-decrypt-aes128ccm12.pcap | ||
| ikev2-decrypt-aes192ctr.pcap | ||
| ikev2-decrypt-aes256cbc.pcapng | ||
| ikev2-decrypt-aes256ccm16.pcapng | ||
| ikev2-decrypt-aes256gcm8.pcap | ||
| ikev2-decrypt-aes256gcm16.pcap | ||
| ipv6.pcap | ||
| ipx_rip.pcap | ||
| knxip_DataSec.pcap | ||
| knxip_SecureWrapper.pcap | ||
| knxip_TimerNotify.pcap | ||
| krb-816.pcap.gz | ||
| many_interfaces.pcapng.1 | ||
| many_interfaces.pcapng.2 | ||
| many_interfaces.pcapng.3 | ||
| nfs.pcap | ||
| ntp.pcap | ||
| packet-h2-14_headers.pcapng | ||
| rsa-p-lt-q.pcap | ||
| rsasnakeoil2.pcap | ||
| sample_control4_2012-03-24.pcap | ||
| segmented_fpm.pcap | ||
| sip.pcapng | ||
| sipmsg.log | ||
| snakeoil-dtls.pcap | ||
| tcp-badsegments.pcap | ||
| text2pcap_hash_eol.txt | ||
| tftp.pcap | ||
| tls-renegotiation.pcap | ||
| tls12-aes128ccm.pcap | ||
| tls12-aes256gcm.pcap | ||
| tls12-chacha20poly1305.pcap | ||
| tls12-dsb.pcapng | ||
| tls13-20-chacha20poly1305.pcap | ||
| tls13-rfc8446.pcap | ||
| udt-dtls.pcapng.gz | ||
| wireguard-ping-tcp.pcap | ||
| wireguard-psk.pcap | ||
| wpa-Induction.pcap.gz | ||
| wpa-eap-tls.pcap.gz | ||
| wpa-test-decode-mgmt.pcap.gz | ||
| wpa-test-decode-tdls.pcap.gz | ||
| wpa-test-decode.pcap.gz | ||