From: Francois-Xavier Le Bail Date: Sun, 20 Oct 2019 14:14:03 +0000 (+0200) Subject: ISAKMP: Add a test capture file X-Git-Tag: tcpdump-4.99-bp~645 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/13d9421ac8b7ba3bab22ffb8d2ca4aad7449b3e3 ISAKMP: Add a test capture file This capture file triggered a buffer over-read with the 4.9.2 release and was fixed in the 4.9.3 release. With the new GET_ macros, the problem no longer exists. Thus no fix needed. The pcap file was updated to pass the sanity checks and avoid pcap_loop() error messages. Update the output of the test accordingly. Partial update from 396e94ff55a80d554b1fe46bf107db1e91008d6c in 4.9 branch. --- diff --git a/tests/TESTLIST b/tests/TESTLIST index 406a838e..0017d99c 100644 --- a/tests/TESTLIST +++ b/tests/TESTLIST @@ -604,6 +604,7 @@ radius_attr_asan radius_attr_asan.pcap radius_attr_asan.out -v ospf6_decode_v3_asan ospf6_decode_v3_asan.pcap ospf6_decode_v3_asan.out -v ip_ts_opts_asan ip_ts_opts_asan.pcap ip_ts_opts_asan.out -v isakmpv1-attr-oobr isakmpv1-attr-oobr.pcap isakmpv1-attr-oobr.out -v +isakmp-ikev1_n_print-oobr isakmp-ikev1_n_print-oobr.pcap isakmp-ikev1_n_print-oobr.out -v # The .pcap file is truncated after the 1st packet. hncp_dhcpv6data-oobr hncp_dhcpv6data-oobr.pcap hncp_dhcpv6data-oobr.out -v -c1 hncp_dhcpv4data-oobr hncp_dhcpv4data-oobr.pcap hncp_dhcpv4data-oobr.out -v -c1 diff --git a/tests/isakmp-ikev1_n_print-oobr.out b/tests/isakmp-ikev1_n_print-oobr.out new file mode 100644 index 00000000..8bf611f7 --- /dev/null +++ b/tests/isakmp-ikev1_n_print-oobr.out @@ -0,0 +1,8 @@ + 1 [Error converting time] IP (tos 0x12,ECT(0), ttl 17, id 47119, offset 0, flags [+, DF, rsvd], proto UDP (17), length 296, bad cksum 1ff (->327b)!) + 80.236.128.20.500 > 12.251.0.45.49152: isakmp 2.12 msgid 10101010: child_sa ikev2_auth[V]: + (n: doi=0 proto=128 type=#24577) [|#126] (len mismatch: isakmp 4278190080/ip 268) + 2 [Error converting time] IP (tos 0x12,ECT(0), ttl 17, id 21263, offset 72, flags [+, DF, rsvd], proto unknown (40), length 296, bad cksum fbff (->9847)!) + 80.0.128.20 > 12.251.0.45: ip-proto-40 + 3 [Error converting time] IP (tos 0x15,ECT(1), ttl 17, id 21263, offset 0, flags [+, DF, rsvd], proto UDP (17), length 296, bad cksum 1ff (->9864)!) + 80.0.128.20.500 > 12.251.0.45.49152: isakmp 2.12 msgid 1010100b: child_sa ikev2_auth[V]: + (n: doi=ipsec proto=#16 type=REPLAY-STATUS spi=04 status=( [|isakmp] diff --git a/tests/isakmp-ikev1_n_print-oobr.pcap b/tests/isakmp-ikev1_n_print-oobr.pcap new file mode 100644 index 00000000..48b0aeb2 Binary files /dev/null and b/tests/isakmp-ikev1_n_print-oobr.pcap differ