macsec: update the test files.

Add the frame number, as we now run the tests with -#.

Fix some output to match the current state of the code.

diff --git a/tests/macsec-changed.out b/tests/macsec-changed.out
index 3321e302bfe023ab42c9f6e115cfec1e59bfe885..e4f65c680b97d616e26922d667e8c3144de20eb6 100644 (file)
--- a/tests/macsec-changed.out
+++ b/tests/macsec-changed.out
@@ -1,4 +1,4 @@
-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, ethertype IPv4, 
+    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, 
        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 68866d003c8cd6467a0f82481f8792673245ce07..db77004a646c3f8222215764962096ad3781ba10 100644 (file)
--- a/tests/macsec-encrypted.out
+++ b/tests/macsec-encrypted.out
@@ -1,4 +1,4 @@
-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  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 fcc2d1aad4fa1329f8b122e815e42ac3e309af7d..2ecc7d7b2c9be1b1f1078f3633c6ccc1630433cc 100644 (file)
--- a/tests/macsec-integonly.out
+++ b/tests/macsec-integonly.out
@@ -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, 192.168.113.1 > 192.168.113.2: ICMP echo request, id 948, seq 1, length 64
+    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

diff --git a/tests/macsec-short-longer.out b/tests/macsec-short-longer.out
index 67228f199f71ca564be5f6121e0ef89ad00d4ab4..35d3b7ae5f6d752143413f74cc3f6a5128672694 100644 (file)
--- a/tests/macsec-short-longer.out
+++ b/tests/macsec-short-longer.out
@@ -1 +1 @@
-ca:f9:df:4f:50:9a > b6:b9:5d:80:8d:79, ethertype 802.1AE MACsec (0x88e5), length 84: [|MACsec]
+    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

diff --git a/tests/macsec-short-shorter.out b/tests/macsec-short-shorter.out
index e16b04cf34c3171625faeff06301657f7406b501..a3f1a4cb9824780d7fa945ac808edfb976335c81 100644 (file)
--- a/tests/macsec-short-shorter.out
+++ b/tests/macsec-short-shorter.out
@@ -1 +1 @@
-ca:f9:df:4f:50:9a > b6:b9:5d:80:8d:79, ethertype 802.1AE MACsec (0x88e5), length 74: [|MACsec]
+    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]

diff --git a/tests/macsec-short-valid.out b/tests/macsec-short-valid.out
index b4d8d2e59b28640b6cd37de69d12645a95e16b8d..031535b5739aec127b46dfb1e2a6d6c8275a6861 100644 (file)
--- a/tests/macsec-short-valid.out
+++ b/tests/macsec-short-valid.out
@@ -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, 192.168.114.1.37459 > 192.168.114.2.6666: UDP, length 4
+    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

diff --git a/tests/macsec-snap.out b/tests/macsec-snap.out
index 0ceb5fd71b987dd2095daa8a551dd7b1b68d5b2f..88552e07acaa6d5661ac226013821d655b367e80 100644 (file)
--- a/tests/macsec-snap.out
+++ b/tests/macsec-snap.out
@@ -1 +1 @@
-ca:f9:df:4f:50:9a > b6:b9:5d:80:8d:79, ethertype 802.1AE MACsec (0x88e5), length 130: [|MACsec]
+    1  ca:f9:df:4f:50:9a > b6:b9:5d:80:8d:79, ethertype 802.1AE MACsec (0x88e5), length 130:  [|MACsec]