From: Francois-Xavier Le Bail Date: Tue, 5 Jan 2021 14:18:17 +0000 (+0100) Subject: Remove '-t' option for MACsec tests X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/dd5c8e67761d96727d45d72daf3b2f2f93bd075c?ds=sidebyside Remove '-t' option for MACsec tests like all the other tests. --- diff --git a/tests/TESTLIST b/tests/TESTLIST index f396673b..207d797a 100644 --- a/tests/TESTLIST +++ b/tests/TESTLIST @@ -725,13 +725,13 @@ rtp-seg-fault-2 rtp-seg-fault-2.pcapng rtp-seg-fault-2.out -v -T rtp ssh ssh.pcap ssh.out # MACsec -macsec-encrypted macsec-encrypted.pcap macsec-encrypted.out -t -e -macsec-changed macsec-changed.pcap macsec-changed.out -t -e -macsec-integonly macsec-integonly.pcap macsec-integonly.out -t -e -macsec-snap macsec-snap.pcap macsec-snap.out -t -e -macsec-short-shorter macsec-short-shorter.pcap macsec-short-shorter.out -t -e -macsec-short-longer macsec-short-longer.pcap macsec-short-longer.out -t -e -macsec-short-valid macsec-short-valid.pcap macsec-short-valid.out -t -e +macsec-encrypted macsec-encrypted.pcap macsec-encrypted.out -e +macsec-changed macsec-changed.pcap macsec-changed.out -e +macsec-integonly macsec-integonly.pcap macsec-integonly.out -e +macsec-snap macsec-snap.pcap macsec-snap.out -e +macsec-short-shorter macsec-short-shorter.pcap macsec-short-shorter.out -e +macsec-short-longer macsec-short-longer.pcap macsec-short-longer.out -e +macsec-short-valid macsec-short-valid.pcap macsec-short-valid.out -e # NFS tests # fuzzed pcap diff --git a/tests/macsec-changed.out b/tests/macsec-changed.out index e4f65c68..989df27e 100644 --- a/tests/macsec-changed.out +++ b/tests/macsec-changed.out @@ -1,4 +1,4 @@ - 1 2e:b7:3f:39:95:c3 > 3e:6f:f3:74:23:7c, ethertype 802.1AE MACsec (0x88e5), length 122: an 0, pn 6, flags CI, sci 2eb73f3995c3006f, + 1 14:35:18.400643 2e:b7:3f:39:95:c3 > 3e:6f:f3:74:23:7c, ethertype 802.1AE MACsec (0x88e5), length 122: an 0, pn 6, flags CI, sci 2eb73f3995c3006f, 0x0000: 0800 4500 0054 ab6b 4000 4001 27e9 c0a8 ..E..T.k@.@.'... 0x0010: 7301 c0a8 7302 0800 c5fd 0784 0001 a636 s...s..........6 0x0020: 1a57 0000 0000 a51c 0600 0000 0000 1011 .W.............. diff --git a/tests/macsec-encrypted.out b/tests/macsec-encrypted.out index db77004a..cc879697 100644 --- a/tests/macsec-encrypted.out +++ b/tests/macsec-encrypted.out @@ -1,4 +1,4 @@ - 1 2e:b7:3f:39:95:c3 > 3e:6f:f3:74:23:7c, ethertype 802.1AE MACsec (0x88e5), length 130: an 0, pn 72, flags ECI, sci 2eb73f3995c30001, + 1 14:23:56.503006 2e:b7:3f:39:95:c3 > 3e:6f:f3:74:23:7c, ethertype 802.1AE MACsec (0x88e5), length 130: an 0, pn 72, flags ECI, sci 2eb73f3995c30001, 0x0000: 50c6 8aab f682 2b69 adc7 f4bc a4d8 af67 P.....+i.......g 0x0010: 5437 64c9 b927 4dcb 49f5 7641 d6ee 5aaa T7d..'M.I.vA..Z. 0x0020: 34b1 1748 4565 fb62 d328 810d b6ce 99b3 4..HEe.b.(...... diff --git a/tests/macsec-integonly.out b/tests/macsec-integonly.out index 2ecc7d7b..1893d036 100644 --- a/tests/macsec-integonly.out +++ b/tests/macsec-integonly.out @@ -1 +1 @@ - 1 2e:b7:3f:39:95:c3 > 3e:6f:f3:74:23:7c, ethertype 802.1AE MACsec (0x88e5), length 130: an 0, pn 68, flags I, sci 2eb73f3995c30001, ethertype IPv4 (0x0800), 192.168.113.1 > 192.168.113.2: ICMP echo request, id 948, seq 1, length 64 + 1 14:20:57.267689 2e:b7:3f:39:95:c3 > 3e:6f:f3:74:23:7c, ethertype 802.1AE MACsec (0x88e5), length 130: an 0, pn 68, flags I, sci 2eb73f3995c30001, ethertype IPv4 (0x0800), 192.168.113.1 > 192.168.113.2: ICMP echo request, id 948, seq 1, length 64 diff --git a/tests/macsec-short-longer.out b/tests/macsec-short-longer.out index 35d3b7ae..7613479d 100644 --- a/tests/macsec-short-longer.out +++ b/tests/macsec-short-longer.out @@ -1 +1 @@ - 1 ca:f9:df:4f:50:9a > b6:b9:5d:80:8d:79, ethertype 802.1AE MACsec (0x88e5), length 84: an 0, pn 66, flags I, sl 34, sci caf9df4f509a0064, ethertype IPv4 (0x0800), 192.168.114.1.37459 > 192.168.114.2.6666: UDP, length 4 + 1 08:46:12.837554 ca:f9:df:4f:50:9a > b6:b9:5d:80:8d:79, ethertype 802.1AE MACsec (0x88e5), length 84: an 0, pn 66, flags I, sl 34, sci caf9df4f509a0064, ethertype IPv4 (0x0800), 192.168.114.1.37459 > 192.168.114.2.6666: UDP, length 4 diff --git a/tests/macsec-short-shorter.out b/tests/macsec-short-shorter.out index db3fe862..18bda451 100644 --- a/tests/macsec-short-shorter.out +++ b/tests/macsec-short-shorter.out @@ -1 +1 @@ - 1 ca:f9:df:4f:50:9a > b6:b9:5d:80:8d:79, ethertype 802.1AE MACsec (0x88e5), length 74: an 0, pn 69, flags I, sl 34, sci caf9df4f509a0064, [|macsec] + 1 08:51:08.799859 ca:f9:df:4f:50:9a > b6:b9:5d:80:8d:79, ethertype 802.1AE MACsec (0x88e5), length 74: an 0, pn 69, flags I, sl 34, sci caf9df4f509a0064, [|macsec] diff --git a/tests/macsec-short-valid.out b/tests/macsec-short-valid.out index 031535b5..8ff874f7 100644 --- a/tests/macsec-short-valid.out +++ b/tests/macsec-short-valid.out @@ -1 +1 @@ - 1 ca:f9:df:4f:50:9a > b6:b9:5d:80:8d:79, ethertype 802.1AE MACsec (0x88e5), length 78: an 0, pn 66, flags I, sl 34, sci caf9df4f509a0064, ethertype IPv4 (0x0800), 192.168.114.1.37459 > 192.168.114.2.6666: UDP, length 4 + 1 08:46:12.837554 ca:f9:df:4f:50:9a > b6:b9:5d:80:8d:79, ethertype 802.1AE MACsec (0x88e5), length 78: an 0, pn 66, flags I, sl 34, sci caf9df4f509a0064, ethertype IPv4 (0x0800), 192.168.114.1.37459 > 192.168.114.2.6666: UDP, length 4 diff --git a/tests/macsec-snap.out b/tests/macsec-snap.out index 50f6257e..3520b26e 100644 --- a/tests/macsec-snap.out +++ b/tests/macsec-snap.out @@ -1 +1 @@ - 1 ca:f9:df:4f:50:9a > b6:b9:5d:80:8d:79, ethertype 802.1AE MACsec (0x88e5), length 130: [|macsec] + 1 08:34:25.953329 ca:f9:df:4f:50:9a > b6:b9:5d:80:8d:79, ethertype 802.1AE MACsec (0x88e5), length 130: [|macsec]