testing: update connection event logs

esp the IMPAIR

diff --git a/testing/pluto/addresspool-4in4-in-use-ikev1-ikev1/road.console.txt b/testing/pluto/addresspool-4in4-in-use-ikev1-ikev1/road.console.txt
index 17df2a591f10577058cd9dab863fe94a4d194dd0..c946f11828a2d5f682018d4300881fef5d1c4552 100644 (file)
--- a/testing/pluto/addresspool-4in4-in-use-ikev1-ikev1/road.console.txt
+++ b/testing/pluto/addresspool-4in4-in-use-ikev1-ikev1/road.console.txt
@@ -32,7 +32,7 @@ road #
 "road-east" #2: sent Quick Mode request
 "road-east" #2: STATE_QUICK_I1: 10 second timeout exceeded after 0 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "road-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "road-east" #2: revival: skip scheduling revival event
+IMPAIR: "road-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "road-east" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 road #
  ../../guestbin/ping-once.sh --error -I 192.0.2.102 192.0.2.254

diff --git a/testing/pluto/addresspool-4in4-in-use-ikev2-ikev1/road.console.txt b/testing/pluto/addresspool-4in4-in-use-ikev2-ikev1/road.console.txt
index 17df2a591f10577058cd9dab863fe94a4d194dd0..c946f11828a2d5f682018d4300881fef5d1c4552 100644 (file)
--- a/testing/pluto/addresspool-4in4-in-use-ikev2-ikev1/road.console.txt
+++ b/testing/pluto/addresspool-4in4-in-use-ikev2-ikev1/road.console.txt
@@ -32,7 +32,7 @@ road #
 "road-east" #2: sent Quick Mode request
 "road-east" #2: STATE_QUICK_I1: 10 second timeout exceeded after 0 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "road-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "road-east" #2: revival: skip scheduling revival event
+IMPAIR: "road-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "road-east" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 road #
  ../../guestbin/ping-once.sh --error -I 192.0.2.102 192.0.2.254

diff --git a/testing/pluto/addresspool-4in4-reserved-ikev1-ikev1/road.console.txt b/testing/pluto/addresspool-4in4-reserved-ikev1-ikev1/road.console.txt
index 17df2a591f10577058cd9dab863fe94a4d194dd0..c946f11828a2d5f682018d4300881fef5d1c4552 100644 (file)
--- a/testing/pluto/addresspool-4in4-reserved-ikev1-ikev1/road.console.txt
+++ b/testing/pluto/addresspool-4in4-reserved-ikev1-ikev1/road.console.txt
@@ -32,7 +32,7 @@ road #
 "road-east" #2: sent Quick Mode request
 "road-east" #2: STATE_QUICK_I1: 10 second timeout exceeded after 0 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "road-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "road-east" #2: revival: skip scheduling revival event
+IMPAIR: "road-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "road-east" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 road #
  ../../guestbin/ping-once.sh --error -I 192.0.2.102 192.0.2.254

diff --git a/testing/pluto/addresspool-4in4-reserved-ikev2-ikev1/road.console.txt b/testing/pluto/addresspool-4in4-reserved-ikev2-ikev1/road.console.txt
index 17df2a591f10577058cd9dab863fe94a4d194dd0..c946f11828a2d5f682018d4300881fef5d1c4552 100644 (file)
--- a/testing/pluto/addresspool-4in4-reserved-ikev2-ikev1/road.console.txt
+++ b/testing/pluto/addresspool-4in4-reserved-ikev2-ikev1/road.console.txt
@@ -32,7 +32,7 @@ road #
 "road-east" #2: sent Quick Mode request
 "road-east" #2: STATE_QUICK_I1: 10 second timeout exceeded after 0 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "road-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "road-east" #2: revival: skip scheduling revival event
+IMPAIR: "road-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "road-east" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 road #
  ../../guestbin/ping-once.sh --error -I 192.0.2.102 192.0.2.254

diff --git a/testing/pluto/ah-pluto-10/west.console.txt b/testing/pluto/ah-pluto-10/west.console.txt
index 6c92f6244fe51e5c6a92d40d42a6ffdae0c42c1b..8107909e57108b5da1866642fe93f95a784b511c 100644 (file)
--- a/testing/pluto/ah-pluto-10/west.console.txt
+++ b/testing/pluto/ah-pluto-10/west.console.txt
@@ -28,7 +28,7 @@ west #
 "westnet-eastnet-ah" #2: sent Quick Mode request
 IMPAIR: "westnet-eastnet-ah" #2: retransmit so timing out SA (may retry)
 "westnet-eastnet-ah" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ah" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ah" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ah" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/algo-pluto-13-invalid-3des/west.console.txt b/testing/pluto/algo-pluto-13-invalid-3des/west.console.txt
index 916dab240536573fbae0d7d001c8a830bca0deff..92aa2f76ddd3ef0da193cf4187477ea8cf5b592a 100644 (file)
--- a/testing/pluto/algo-pluto-13-invalid-3des/west.console.txt
+++ b/testing/pluto/algo-pluto-13-invalid-3des/west.console.txt
@@ -60,7 +60,7 @@ west #
 "westnet-eastnet-aes256" #2: sent Quick Mode request
 "westnet-eastnet-aes256" #2: STATE_QUICK_I1: 60 second timeout exceeded after 0 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "westnet-eastnet-aes256" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-aes256" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-aes256" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-aes256" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 ERROR: "westnet-eastnet-aes256" #2: netlink response for Del SA esp.ESPSPIi@192.1.2.45: No such process (errno 3)
 west #

diff --git a/testing/pluto/auto-keep-02-revival-through-nat-cleanfail-ikev2/06-east-revival.sh b/testing/pluto/auto-keep-02-revival-through-nat-cleanfail-ikev2/06-east-revival.sh
index 8777725ad7680f5cb4926bcf316b77f74af4b919..1e6ebc6ee005dad9f5eddb1c9e216e789ead6bba 100755 (executable)
--- a/testing/pluto/auto-keep-02-revival-through-nat-cleanfail-ikev2/06-east-revival.sh
+++ b/testing/pluto/auto-keep-02-revival-through-nat-cleanfail-ikev2/06-east-revival.sh
@@ -5,7 +5,7 @@
 # While revival is pending, the kernel policy have transitioned to
 # on-demand.
 
-../../guestbin/wait-for-pluto.sh '#2: revival: skip scheduling revival event'
+../../guestbin/wait-for-pluto.sh '#2: revival: skip scheduling CONNECTION_REVIVAL event'
 ipsec _kernel policy
 
 # Now trigger the revival.  Since ROAD is down it will fail.  And

diff --git a/testing/pluto/auto-keep-02-revival-through-nat-cleanfail-ikev2/east.console.txt b/testing/pluto/auto-keep-02-revival-through-nat-cleanfail-ikev2/east.console.txt
index f59a64dc07ea518ee5c37cd328403d78466c63e3..e7e032dde283d49c6d87d22d6d849b57435011a1 100644 (file)
--- a/testing/pluto/auto-keep-02-revival-through-nat-cleanfail-ikev2/east.console.txt
+++ b/testing/pluto/auto-keep-02-revival-through-nat-cleanfail-ikev2/east.console.txt
@@ -45,8 +45,8 @@ east #
 east #
  # on-demand.
 east #
- ../../guestbin/wait-for-pluto.sh '#2: revival: skip scheduling revival event'
-IMPAIR: "road-eastnet-ikev2"[1] 192.1.2.254 #2: revival: skip scheduling revival event
+ ../../guestbin/wait-for-pluto.sh '#2: revival: skip scheduling CONNECTION_REVIVAL event'
+IMPAIR: "road-eastnet-ikev2"[1] 192.1.2.254 #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 east #
  ipsec _kernel policy
 src 192.0.2.0/24 dst 192.1.3.209/32

diff --git a/testing/pluto/auto-keep-03-revive-second-child-ikev2/west.console.txt b/testing/pluto/auto-keep-03-revive-second-child-ikev2/west.console.txt
index 80405fb6a4a68bb487fd65068987123b7128bd61..589ffb2e749c076460ec9887ec1bc26e7c471a54 100644 (file)
--- a/testing/pluto/auto-keep-03-revive-second-child-ikev2/west.console.txt
+++ b/testing/pluto/auto-keep-03-revive-second-child-ikev2/west.console.txt
@@ -54,7 +54,7 @@ west #
  ipsec whack --deletestate 3
 "west-cuckoo" #3: sent INFORMATIONAL request to delete established Child SA using IKE SA #1
 "west-cuckoo" #3: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-cuckoo" #3: revival: skip scheduling revival event
+IMPAIR: "west-cuckoo" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-cuckoo" #3: ESP traffic information: in=84B out=84B
 west #
  ../../guestbin/ping-once.sh --up 192.0.2.254

diff --git a/testing/pluto/basic-pluto-01-nokey/west.console.txt b/testing/pluto/basic-pluto-01-nokey/west.console.txt
index 445417134d590be225e12b36d6a572ae08cba808..13ec444219214e6eadea164d0ceb04c2796ca223 100644 (file)
--- a/testing/pluto/basic-pluto-01-nokey/west.console.txt
+++ b/testing/pluto/basic-pluto-01-nokey/west.console.txt
@@ -46,7 +46,7 @@ west #
 "westnet-eastnet" #1: unable to locate my private key for RSA Signature
 "westnet-eastnet" #1: sending notification AUTHENTICATION_FAILED to 192.1.2.23:500
 "westnet-eastnet" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet" #1: deleting ISAKMP SA (MAIN_I2) and NOT sending notification
 west #
  # we should not see any leftover states

diff --git a/testing/pluto/compress-03-mismatch-ikev1/west.console.txt b/testing/pluto/compress-03-mismatch-ikev1/west.console.txt
index 6da58df373dc22d10204aeef5870e9815e739d96..615c7e6a7869d5d8b3975c4efe54f8dee671a719 100644 (file)
--- a/testing/pluto/compress-03-mismatch-ikev1/west.console.txt
+++ b/testing/pluto/compress-03-mismatch-ikev1/west.console.txt
@@ -65,7 +65,7 @@ west #
 "westnet-eastnet-compress" #2: sent Quick Mode request
 IMPAIR: "westnet-eastnet-compress" #2: retransmit so timing out SA (may retry)
 "westnet-eastnet-compress" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-compress" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-compress" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-compress" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  ipsec whack --trafficstatus

diff --git a/testing/pluto/compress-04-unsolicited-ikev2/west.console.txt b/testing/pluto/compress-04-unsolicited-ikev2/west.console.txt
index 2a1ed580c0882f8d9c90a5f01266457ff83e8fa9..4da8b727f84515e26d15befa1fe2ac8ece8620dc 100644 (file)
--- a/testing/pluto/compress-04-unsolicited-ikev2/west.console.txt
+++ b/testing/pluto/compress-04-unsolicited-ikev2/west.console.txt
@@ -27,7 +27,7 @@ west #
 "westnet-eastnet-ipcomp" #1: response for Child SA #2 was rejected with NO_PROPOSAL_CHOSEN; initiating delete of Child SA (IKE SA will remain UP)
 "westnet-eastnet-ipcomp" #2: sent INFORMATIONAL request to delete larval Child SA using IKE SA #1
 "westnet-eastnet-ipcomp" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipcomp" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipcomp" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 ERROR: "westnet-eastnet-ipcomp" #2: netlink response for Get SA esp.ESPSPIi@192.1.2.23: No such process (errno 3)
 ERROR: "westnet-eastnet-ipcomp" #2: netlink response for Del SA esp.ESPSPIi@192.1.2.23: No such process (errno 3)
 west #

diff --git a/testing/pluto/fips-13-ikev2-x509-key2032/west.console.txt b/testing/pluto/fips-13-ikev2-x509-key2032/west.console.txt
index 0866c8c51f300f2a7e8069792b42e76c1d91d53d..a307d2dda53700cbfd789de739493fb91554026a 100644 (file)
--- a/testing/pluto/fips-13-ikev2-x509-key2032/west.console.txt
+++ b/testing/pluto/fips-13-ikev2-x509-key2032/west.console.txt
@@ -36,7 +36,7 @@ west #
 "westnet-eastnet-ikev2" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "westnet-eastnet-ikev2" #1: encountered fatal error in state IKE_AUTH_I
 "westnet-eastnet-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ikev2" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo done

diff --git a/testing/pluto/ikev1-aggr-07-no-isakmp-proposal-chosen/west.console.txt b/testing/pluto/ikev1-aggr-07-no-isakmp-proposal-chosen/west.console.txt
index 0318bc3541cab3c846a2ec971820e23182dc2692..b30f95180edcd53139162304e7a55ee3e5aa4710 100644 (file)
--- a/testing/pluto/ikev1-aggr-07-no-isakmp-proposal-chosen/west.console.txt
+++ b/testing/pluto/ikev1-aggr-07-no-isakmp-proposal-chosen/west.console.txt
@@ -24,7 +24,7 @@ west #
 "westnet-eastnet-aggr" #1: ignoring unsecured informational payload NO_PROPOSAL_CHOSEN, length=12
 IMPAIR: "westnet-eastnet-aggr" #1: retransmit so timing out SA (may retry)
 "westnet-eastnet-aggr" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-aggr" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-aggr" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-aggr" #1: deleting ISAKMP SA (AGGR_I1) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/ikev1-algo-04-mismatch/west.console.txt b/testing/pluto/ikev1-algo-04-mismatch/west.console.txt
index 798463deccb57ef4215d5f70a6726c2b71ba0de9..37f593260b2e453edf44837ecedbb22dbcd8eb67 100644 (file)
--- a/testing/pluto/ikev1-algo-04-mismatch/west.console.txt
+++ b/testing/pluto/ikev1-algo-04-mismatch/west.console.txt
@@ -27,7 +27,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev1" #2: sent Quick Mode request
 IMPAIR: "westnet-eastnet-ipv4-psk-ikev1" #2: retransmit so timing out SA (may retry)
 "westnet-eastnet-ipv4-psk-ikev1" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev1" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev1" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev1" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/ikev1-algo-esp-sha2-05/west.console.txt b/testing/pluto/ikev1-algo-esp-sha2-05/west.console.txt
index 51bffb93b343f97332bd4d863c485023c7c846dc..d5102e660c9fb3840677c08084b48f83a8621129 100644 (file)
--- a/testing/pluto/ikev1-algo-esp-sha2-05/west.console.txt
+++ b/testing/pluto/ikev1-algo-esp-sha2-05/west.console.txt
@@ -51,7 +51,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev1" #2: sent Quick Mode request
 IMPAIR: "westnet-eastnet-ipv4-psk-ikev1" #2: retransmit so timing out SA (may retry)
 "westnet-eastnet-ipv4-psk-ikev1" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev1" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev1" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev1" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/ikev1-expire-r1-01-main/west.console.txt b/testing/pluto/ikev1-expire-r1-01-main/west.console.txt
index 84a5cb4651dade5ce2ee422b826827acf24c98e0..45c2f3a957b14fa089e3aa5e86bb52895b002503 100644 (file)
--- a/testing/pluto/ikev1-expire-r1-01-main/west.console.txt
+++ b/testing/pluto/ikev1-expire-r1-01-main/west.console.txt
@@ -26,7 +26,7 @@ west #
 IMPAIR: "westnet-eastnet" #1: dropping Main Mode I2 packet as per impair
 IMPAIR: "westnet-eastnet" #1: retransmit so timing out SA (may retry)
 "westnet-eastnet" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet" #1: deleting ISAKMP SA (MAIN_I1) and NOT sending notification
 west #
  # we are waiting for east to expire the partial IKE state in 1+1+2+4+8+16+32 secs

diff --git a/testing/pluto/ikev1-expire-r1-02-aggr/west.console.txt b/testing/pluto/ikev1-expire-r1-02-aggr/west.console.txt
index 6fa84d44da4e4adfb8a7a7dd38940a3cc8666040..3855229375fb66650660ea01f5410c4278fb6cb2 100644 (file)
--- a/testing/pluto/ikev1-expire-r1-02-aggr/west.console.txt
+++ b/testing/pluto/ikev1-expire-r1-02-aggr/west.console.txt
@@ -26,7 +26,7 @@ west #
 IMPAIR: "westnet-eastnet-aggr" #1: dropping Aggressive Mode I2 packet as per impair
 IMPAIR: "westnet-eastnet-aggr" #1: retransmit so timing out SA (may retry)
 "westnet-eastnet-aggr" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-aggr" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-aggr" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-aggr" #1: deleting ISAKMP SA (AGGR_I1) and NOT sending notification
 west #
  # we are waiting for east to expire the partial IKE state in 1+1+2+4+8+16+32 secs

diff --git a/testing/pluto/ikev1-impair-05-send-zero-ike-ke/west.console.txt b/testing/pluto/ikev1-impair-05-send-zero-ike-ke/west.console.txt
index d39b329d57d95bf971d1dda3785bfda505687170..4829808172dbdd526c8e402ed6e215f5f9542173 100644 (file)
--- a/testing/pluto/ikev1-impair-05-send-zero-ike-ke/west.console.txt
+++ b/testing/pluto/ikev1-impair-05-send-zero-ike-ke/west.console.txt
@@ -28,7 +28,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk" #1: sending bogus KE (g^x) == 0 value to brea
 "westnet-eastnet-ipv4-psk" #1: NSS: shared key calculation using MODP failed: SEC_ERROR_NO_MEMORY: security library: memory allocation failure.
 "westnet-eastnet-ipv4-psk" #1: sending notification INVALID_KEY_INFORMATION to 192.1.2.23:500
 "westnet-eastnet-ipv4-psk" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk" #1: deleting ISAKMP SA (MAIN_I2) and NOT sending notification
 west #
  ipsec whack --impair none
@@ -49,7 +49,7 @@ west #
 "westnet-eastnet-ipv4-psk" #2: NSS: shared key calculation using MODP failed: SEC_ERROR_NO_MEMORY: security library: memory allocation failure.
 "westnet-eastnet-ipv4-psk" #2: sending notification INVALID_KEY_INFORMATION to 192.1.2.23:500
 "westnet-eastnet-ipv4-psk" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk" #2: deleting ISAKMP SA (MAIN_I2) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/ikev1-impair-06-send-no-ike-ke/west.console.txt b/testing/pluto/ikev1-impair-06-send-no-ike-ke/west.console.txt
index 4538af4a5c7d79db2942d8eb7f87dcb6f61e1f99..8a69a0096806caf9b89d3ad573b008bb281b0d54 100644 (file)
--- a/testing/pluto/ikev1-impair-06-send-no-ike-ke/west.console.txt
+++ b/testing/pluto/ikev1-impair-06-send-no-ike-ke/west.console.txt
@@ -29,7 +29,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: sending no KE (g^x) payload
 "westnet-eastnet-ipv4-psk-ikev2" #1: sent Main Mode I2
 IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: retransmit so timing out SA (may retry)
 "westnet-eastnet-ipv4-psk-ikev2" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #1: deleting ISAKMP SA (MAIN_I2) and NOT sending notification
 west #
  ipsec whack --impair none

diff --git a/testing/pluto/ikev1-impair-07-send-empty-ike-ke/west.console.txt b/testing/pluto/ikev1-impair-07-send-empty-ike-ke/west.console.txt
index b2f78c78f0b82da21cbba171f69ba0540a676a1e..1714e67f5e0a4fdb1155c7145052b0ec7c0b22ab 100644 (file)
--- a/testing/pluto/ikev1-impair-07-send-empty-ike-ke/west.console.txt
+++ b/testing/pluto/ikev1-impair-07-send-empty-ike-ke/west.console.txt
@@ -30,7 +30,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk" #1: sending empty KE (g^x)
 "westnet-eastnet-ipv4-psk" #1: ignoring unsecured informational payload INVALID_KEY_INFORMATION, length=12
 IMPAIR: "westnet-eastnet-ipv4-psk" #1: retransmit so timing out SA (may retry)
 "westnet-eastnet-ipv4-psk" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk" #1: deleting ISAKMP SA (MAIN_I2) and NOT sending notification
 west #
  ipsec auto --delete westnet-eastnet-ipv4-psk
@@ -58,7 +58,7 @@ west #
 "westnet-eastnet-ipv4-psk" #2: sending notification INVALID_KEY_INFORMATION to 192.1.2.23:500
 "westnet-eastnet-ipv4-psk" #2: STATE_MAIN_I2: 60 second timeout exceeded after 0 retransmits.  No response (or no acceptable response) to our IKEv1 message
 "westnet-eastnet-ipv4-psk" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk" #2: deleting ISAKMP SA (MAIN_I2) and NOT sending notification
 west #
  ipsec auto --delete westnet-eastnet-ipv4-psk

diff --git a/testing/pluto/ikev1-policy-01-drop/west.console.txt b/testing/pluto/ikev1-policy-01-drop/west.console.txt
index 22ccab22f4104819b06dffe6a48a41ffa83d0f5b..56166b1a701b2c1ff5b113e674ac0efbc9dcbb97 100644 (file)
--- a/testing/pluto/ikev1-policy-01-drop/west.console.txt
+++ b/testing/pluto/ikev1-policy-01-drop/west.console.txt
@@ -21,7 +21,7 @@ west #
 "ikev1" #1: sent Main Mode request
 IMPAIR: "ikev1" #1: retransmit so timing out SA (may retry)
 "ikev1" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ikev1" #1: revival: skip scheduling revival event
+IMPAIR: "ikev1" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "ikev1" #1: deleting ISAKMP SA (MAIN_I1) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/ikev1-policy-02-reject/west.console.txt b/testing/pluto/ikev1-policy-02-reject/west.console.txt
index 9a43fd9c924c17dbcdc2532b07330cf73ccda732..5889b1eef597dd194d76b7345a1a497b91724435 100644 (file)
--- a/testing/pluto/ikev1-policy-02-reject/west.console.txt
+++ b/testing/pluto/ikev1-policy-02-reject/west.console.txt
@@ -22,7 +22,7 @@ west #
 "ikev1" #1: ignoring unsecured informational payload INVALID_MAJOR_VERSION, length=12
 IMPAIR: "ikev1" #1: retransmit so timing out SA (may retry)
 "ikev1" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ikev1" #1: revival: skip scheduling revival event
+IMPAIR: "ikev1" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "ikev1" #1: deleting ISAKMP SA (MAIN_I1) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/ikev1-xauth-35-xauth-only-lease-missing/road.console.txt b/testing/pluto/ikev1-xauth-35-xauth-only-lease-missing/road.console.txt
index 3913e81f8bc6971a26fbf5dcdf03fe0f6b2eba47..e5fedef8afd9df3282cf7e3d80d8cc186747ea00 100644 (file)
--- a/testing/pluto/ikev1-xauth-35-xauth-only-lease-missing/road.console.txt
+++ b/testing/pluto/ikev1-xauth-35-xauth-only-lease-missing/road.console.txt
@@ -34,7 +34,7 @@ road #
 "road-east" #2: sent Quick Mode request
 "road-east" #2: STATE_QUICK_I1: 60 second timeout exceeded after 0 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "road-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "road-east" #2: revival: skip scheduling revival event
+IMPAIR: "road-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "road-east" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 ERROR: "road-east" #2: netlink response for Del SA esp.ESPSPIi@192.1.3.209: No such process (errno 3)
 road #

diff --git a/testing/pluto/ikev1-xauth-35-xauth-only-lease-wrong/road.console.txt b/testing/pluto/ikev1-xauth-35-xauth-only-lease-wrong/road.console.txt
index ef8c6ebafdabc9e70550168fa043160d514e6710..bed9ad6c04d20e15b49fb61e230532c5053064b8 100644 (file)
--- a/testing/pluto/ikev1-xauth-35-xauth-only-lease-wrong/road.console.txt
+++ b/testing/pluto/ikev1-xauth-35-xauth-only-lease-wrong/road.console.txt
@@ -34,7 +34,7 @@ road #
 "road-east" #2: sent Quick Mode request
 "road-east" #2: STATE_QUICK_I1: 60 second timeout exceeded after 0 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "road-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "road-east" #2: revival: skip scheduling revival event
+IMPAIR: "road-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "road-east" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 ERROR: "road-east" #2: netlink response for Del SA esp.ESPSPIi@192.1.3.209: No such process (errno 3)
 road #

diff --git a/testing/pluto/ikev2-04-basic-x509-no-ca-mismatch-02/west.console.txt b/testing/pluto/ikev2-04-basic-x509-no-ca-mismatch-02/west.console.txt
index 483191a35bbe2b3194896add6bac0337cd3fe2ab..e7293c1cf565a4cc0053af1137454774deeb11ec 100644 (file)
--- a/testing/pluto/ikev2-04-basic-x509-no-ca-mismatch-02/west.console.txt
+++ b/testing/pluto/ikev2-04-basic-x509-no-ca-mismatch-02/west.console.txt
@@ -82,7 +82,7 @@ west #
 "westnet-eastnet-ikev2" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "westnet-eastnet-ikev2" #1: encountered fatal error in state IKE_AUTH_I
 "westnet-eastnet-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ikev2" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo done

diff --git a/testing/pluto/ikev2-04-basic-x509-no-ca-mismatch/west.console.txt b/testing/pluto/ikev2-04-basic-x509-no-ca-mismatch/west.console.txt
index 973c0369060963cf73dc16354637a75f80163fd2..d5cac352493d16f25c1c73ac465874a02fe85d91 100644 (file)
--- a/testing/pluto/ikev2-04-basic-x509-no-ca-mismatch/west.console.txt
+++ b/testing/pluto/ikev2-04-basic-x509-no-ca-mismatch/west.console.txt
@@ -74,7 +74,7 @@ west #
 "westnet-eastnet-ikev2" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "westnet-eastnet-ikev2" #1: encountered fatal error in state IKE_AUTH_I
 "westnet-eastnet-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ikev2" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo done

diff --git a/testing/pluto/ikev2-05-basic-psk-missing-responder/west.console.txt b/testing/pluto/ikev2-05-basic-psk-missing-responder/west.console.txt
index 715b2fed406059b9b54e3929f1c44168a1107f8f..1ac2217dd42a926d4972edb4853d9d6bba221f8d 100644 (file)
--- a/testing/pluto/ikev2-05-basic-psk-missing-responder/west.console.txt
+++ b/testing/pluto/ikev2-05-basic-psk-missing-responder/west.console.txt
@@ -42,7 +42,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev2" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "westnet-eastnet-ipv4-psk-ikev2" #1: encountered fatal error in state IKE_AUTH_I
 "westnet-eastnet-ipv4-psk-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  # expect block/acquire stopping traffic

diff --git a/testing/pluto/ikev2-21-mode-mismatch-01/west.console.txt b/testing/pluto/ikev2-21-mode-mismatch-01/west.console.txt
index b34e6320d54dd41acf97d4bec7b045f2717d06bb..368ac3f3023346acf4fca21fc3b471060cf4b85c 100644 (file)
--- a/testing/pluto/ikev2-21-mode-mismatch-01/west.console.txt
+++ b/testing/pluto/ikev2-21-mode-mismatch-01/west.console.txt
@@ -56,7 +56,7 @@ west #
 "ipv4-psk-ikev2-transport" #1: response for Child SA #2 was rejected with NO_PROPOSAL_CHOSEN; initiating delete of Child SA (IKE SA will remain UP)
 "ipv4-psk-ikev2-transport" #2: sent INFORMATIONAL request to delete larval Child SA using IKE SA #1
 "ipv4-psk-ikev2-transport" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ipv4-psk-ikev2-transport" #2: revival: skip scheduling revival event
+IMPAIR: "ipv4-psk-ikev2-transport" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 ERROR: "ipv4-psk-ikev2-transport" #2: netlink response for Get SA esp.ESPSPIi@192.1.2.23: No such process (errno 3)
 ERROR: "ipv4-psk-ikev2-transport" #2: netlink response for Del SA esp.ESPSPIi@192.1.2.23: No such process (errno 3)
 west #

diff --git a/testing/pluto/ikev2-21-mode-mismatch-02/west.console.txt b/testing/pluto/ikev2-21-mode-mismatch-02/west.console.txt
index 053177293c2d97936c302c0fe34997f57ac9437a..a49502dc8dcfbf819db895af3d6758e68cdc38da 100644 (file)
--- a/testing/pluto/ikev2-21-mode-mismatch-02/west.console.txt
+++ b/testing/pluto/ikev2-21-mode-mismatch-02/west.console.txt
@@ -54,7 +54,7 @@ west #
 "ipv4-psk-ikev2-transport" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "ipv4-psk-ikev2-transport" #2: IKE_AUTH response rejected Child SA with NO_PROPOSAL_CHOSEN
 "ipv4-psk-ikev2-transport" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ipv4-psk-ikev2-transport" #2: revival: skip scheduling revival event
+IMPAIR: "ipv4-psk-ikev2-transport" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  echo done
 done

diff --git a/testing/pluto/ikev2-35-mismatched-child/west.console.txt b/testing/pluto/ikev2-35-mismatched-child/west.console.txt
index ffc0e7f4bcbecfdf163002fb1e7f006d6c817a72..fae2a4429b7ae7e235753a6b583303dd141a6626 100644 (file)
--- a/testing/pluto/ikev2-35-mismatched-child/west.console.txt
+++ b/testing/pluto/ikev2-35-mismatched-child/west.console.txt
@@ -27,7 +27,7 @@ west #
 "westnet-eastnet-mismatch" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-mismatch" #2: IKE_AUTH response rejected Child SA with TS_UNACCEPTABLE
 "westnet-eastnet-mismatch" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-mismatch" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-mismatch" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  echo done
 done

diff --git a/testing/pluto/ikev2-41-rw-replace/road.console.txt b/testing/pluto/ikev2-41-rw-replace/road.console.txt
index cbe1cf52f766e2ee229d8767c63e7fc56a90014a..95d1ba29dae6f2cd23a131c6e31f4fbf5c3c5af4 100644 (file)
--- a/testing/pluto/ikev2-41-rw-replace/road.console.txt
+++ b/testing/pluto/ikev2-41-rw-replace/road.console.txt
@@ -197,7 +197,7 @@ road #
 | event_schedule_where: EVENT_v2_EXPIRE@0xXXX timeout in N.N seconds for #1
 | event_schedule_where: EVENT_v2_REPLACE@0xXXX timeout in N.N seconds for #3
 | #1 is retaining EVENT_v2_EXPIRE with is previously set timeout
-| timer_event_cb: processing EVENT_v2_EXPIRE-event@0xXXX for IKE SA #1 in state ESTABLISHED_IKE_SA
+|   timer_event_cb: processing EVENT_v2_EXPIRE-event@0xXXX for IKE SA #1 in state ESTABLISHED_IKE_SA
 | #1 deleting EVENT_v2_EXPIRE
 road #
  : "re-authenticateded. The state number should 3 and 2"

diff --git a/testing/pluto/ikev2-algo-17-no-sha1-01/west.console.txt b/testing/pluto/ikev2-algo-17-no-sha1-01/west.console.txt
index daa9cf832c40a5b65bffa4bf94ef5e3d88d07192..3ac234e945fe555ab4d369422e20b3e1264c3908 100644 (file)
--- a/testing/pluto/ikev2-algo-17-no-sha1-01/west.console.txt
+++ b/testing/pluto/ikev2-algo-17-no-sha1-01/west.console.txt
@@ -149,7 +149,7 @@ west #
 "westnet-eastnet-no-sha1" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-no-sha1" #2: IKE_AUTH response rejected Child SA with NO_PROPOSAL_CHOSEN
 "westnet-eastnet-no-sha1" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-no-sha1" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-no-sha1" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  echo done
 done

diff --git a/testing/pluto/ikev2-algo-esn-02/west.console.txt b/testing/pluto/ikev2-algo-esn-02/west.console.txt
index efa4e442e9bfd2336c12fe39314347bb60790d8f..80886add325867b974c586ef1ad0c03ee0c5e4ff 100644 (file)
--- a/testing/pluto/ikev2-algo-esn-02/west.console.txt
+++ b/testing/pluto/ikev2-algo-esn-02/west.console.txt
@@ -34,7 +34,7 @@ west #
 "replay" #1: initiator established IKE SA; authenticated peer using preloaded certificate '@east' and 2nnn-bit RSASSA-PSS with SHA2_512 digital signature
 "replay" #2: IKE_AUTH response rejected Child SA with NO_PROPOSAL_CHOSEN
 "replay" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "replay" #2: revival: skip scheduling revival event
+IMPAIR: "replay" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  echo done
 done

diff --git a/testing/pluto/ikev2-algo-sha2-05/west.console.txt b/testing/pluto/ikev2-algo-sha2-05/west.console.txt
index 957637061fa59f6319838624d597a2c25e0d4fd8..d7b7d515f1673c1e963854b73229c97805349827 100644 (file)
--- a/testing/pluto/ikev2-algo-sha2-05/west.console.txt
+++ b/testing/pluto/ikev2-algo-sha2-05/west.console.txt
@@ -50,7 +50,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev2" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #2: IKE_AUTH response rejected Child SA with NO_PROPOSAL_CHOSEN
 "westnet-eastnet-ipv4-psk-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  echo done
 done

diff --git a/testing/pluto/ikev2-allow-narrow-01/west.console.txt b/testing/pluto/ikev2-allow-narrow-01/west.console.txt
index 52c40ac4dfd200b9f4da173d267dfe11f665a6a9..5385c8966a4f72c8fe9bca776e29de6c1f9b0996 100644 (file)
--- a/testing/pluto/ikev2-allow-narrow-01/west.console.txt
+++ b/testing/pluto/ikev2-allow-narrow-01/west.console.txt
@@ -67,7 +67,7 @@ west #
 "westnet-eastnet-ikev2" #1: initiator established IKE SA; authenticated peer using preloaded certificate '@east' and 2nnn-bit RSASSA-PSS with SHA2_512 digital signature
 "westnet-eastnet-ikev2" #2: IKE_AUTH response rejected Child SA with TS_UNACCEPTABLE
 "westnet-eastnet-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  echo done
 done

diff --git a/testing/pluto/ikev2-allow-narrow-02/west.console.txt b/testing/pluto/ikev2-allow-narrow-02/west.console.txt
index 879542d296ef9e827fff3d88da333bd1df372dc6..0bcf3fd3fe33c7ad3ca4c31eef7e4a3422283294 100644 (file)
--- a/testing/pluto/ikev2-allow-narrow-02/west.console.txt
+++ b/testing/pluto/ikev2-allow-narrow-02/west.console.txt
@@ -53,7 +53,7 @@ west #
 "westnet-eastnet-ikev2" #1: response for Child SA #2 was rejected with TS_UNACCEPTABLE; initiating delete of Child SA (IKE SA will remain UP)
 "westnet-eastnet-ikev2" #2: sent INFORMATIONAL request to delete larval Child SA using IKE SA #1
 "westnet-eastnet-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 ERROR: "westnet-eastnet-ikev2" #2: netlink response for Get SA esp.ESPSPIi@192.1.2.23: No such process (errno 3)
 ERROR: "westnet-eastnet-ikev2" #2: netlink response for Del SA esp.ESPSPIi@192.1.2.23: No such process (errno 3)
 west #

diff --git a/testing/pluto/ikev2-asymmetric-16-auth-mismatch/west.console.txt b/testing/pluto/ikev2-asymmetric-16-auth-mismatch/west.console.txt
index 4f99bc2425601e60d6f52f862dc11fa505716b70..704ade6d92ec96968c7d9037221cc22809d5c2b9 100644 (file)
--- a/testing/pluto/ikev2-asymmetric-16-auth-mismatch/west.console.txt
+++ b/testing/pluto/ikev2-asymmetric-16-auth-mismatch/west.console.txt
@@ -68,7 +68,7 @@ west #
 "westnet-eastnet-ikev2" #1: authentication failed: peer attempted NULL authentication but we want RSASIG
 "westnet-eastnet-ikev2" #1: deleting IKE SA (IKE_AUTH_I) and sending notification
 "westnet-eastnet-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  echo done
 done

diff --git a/testing/pluto/ikev2-asymmetric-17-auth-mismatch-reverse/west.console.txt b/testing/pluto/ikev2-asymmetric-17-auth-mismatch-reverse/west.console.txt
index bbb89e8f545d156bbbc3b790d42af85e96e6d620..bf10ab684a5a3f61de0fc51b819f6bf82136f366 100644 (file)
--- a/testing/pluto/ikev2-asymmetric-17-auth-mismatch-reverse/west.console.txt
+++ b/testing/pluto/ikev2-asymmetric-17-auth-mismatch-reverse/west.console.txt
@@ -62,7 +62,7 @@ west #
 "westnet-eastnet-ikev2" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "westnet-eastnet-ikev2" #1: encountered fatal error in state IKE_AUTH_I
 "westnet-eastnet-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ikev2" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo done

diff --git a/testing/pluto/ikev2-child-ipsec-retransmit/west.console.txt b/testing/pluto/ikev2-child-ipsec-retransmit/west.console.txt
index bc9e01e10b6eb9e65541d58f0b4f2d4688436f9c..687aae58953576c3d73cfac8707a6e8c51ea85ad 100644 (file)
--- a/testing/pluto/ikev2-child-ipsec-retransmit/west.console.txt
+++ b/testing/pluto/ikev2-child-ipsec-retransmit/west.console.txt
@@ -43,10 +43,10 @@ west #
 "westnet-eastnet-ikev2b" #3: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESP <0xESPESP}
 IMPAIR: "westnet-eastnet-ikev2a" #1: retransmit so timing out SA (may retry)
 "westnet-eastnet-ikev2a" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2a" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2a" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ikev2a" #2: ESP traffic information: in=0B out=0B
 "westnet-eastnet-ikev2b" #3: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2b" #3: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2b" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ikev2a" #1: deleting IKE SA (established IKE SA)
 west #
  echo done

diff --git a/testing/pluto/ikev2-child-rekey-06-deadlock/west.console.txt b/testing/pluto/ikev2-child-rekey-06-deadlock/west.console.txt
index 4643e02fc5e01c3d624d25fcf342edfe829707da..c59806deafaadc92c09ece1c5ad8a753aa3ee7a4 100644 (file)
--- a/testing/pluto/ikev2-child-rekey-06-deadlock/west.console.txt
+++ b/testing/pluto/ikev2-child-rekey-06-deadlock/west.console.txt
@@ -91,7 +91,7 @@ west #
 "west" #4: sent CREATE_CHILD_SA request to rekey Child SA #3 using IKE SA #1 {ESP <0xESPESP}
 "west" #1: ESTABLISHED_IKE_SA: 15 second timeout exceeded after 0 retransmits.  No response (or no acceptable response) to our IKEv2 message
 "west" #3: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west" #3: revival: skip scheduling revival event
+IMPAIR: "west" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #3: ESP traffic information: in=0B out=0B
 "west" #4: deleting larval Child SA
 "west" #1: deleting IKE SA (established IKE SA)

diff --git a/testing/pluto/ikev2-child-restart-mismatch/west.console.txt b/testing/pluto/ikev2-child-restart-mismatch/west.console.txt
index 0d6e47f32ab0bacd9ce5b0bb3f94ed95ee761ee6..4bdb6eb02f101e9aef70b61e1c8766c67481a8bf 100644 (file)
--- a/testing/pluto/ikev2-child-restart-mismatch/west.console.txt
+++ b/testing/pluto/ikev2-child-restart-mismatch/west.console.txt
@@ -55,14 +55,14 @@ west #
 "westnet-eastnet-ikev2b" #3: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESP <0xESPESP}
 "westnet-eastnet-ikev2b" #3: CREATE_CHILD_SA failed with error notification TS_UNACCEPTABLE
 "westnet-eastnet-ikev2b" #3: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2b" #3: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2b" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec auto --up westnet-eastnet-ikev2c
 "westnet-eastnet-ikev2c" #4: initiating Child SA using IKE SA #1
 "westnet-eastnet-ikev2c" #4: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESP <0xESPESP}
 "westnet-eastnet-ikev2c" #4: CREATE_CHILD_SA failed with error notification TS_UNACCEPTABLE
 "westnet-eastnet-ikev2c" #4: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2c" #4: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2c" #4: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  #
 west #

diff --git a/testing/pluto/ikev2-ddos-cookie-02-mangle/west.console.txt b/testing/pluto/ikev2-ddos-cookie-02-mangle/west.console.txt
index 5f619bb87c3bf970d1478e563df308dc50c9d806..2cb5b90c7bca151611c461d818f4b1ff96ad7016 100644 (file)
--- a/testing/pluto/ikev2-ddos-cookie-02-mangle/west.console.txt
+++ b/testing/pluto/ikev2-ddos-cookie-02-mangle/west.console.txt
@@ -28,7 +28,7 @@ IMPAIR: "westnet-eastnet-ikev2" #1: mangling DDOS cookie sent by peer
 "westnet-eastnet-ikev2" #1: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "westnet-eastnet-ikev2" #1: IKE_SA_INIT_I: 5 second timeout exceeded after 0 retransmits.  No response (or no acceptable response) to our first IKEv2 message
 "westnet-eastnet-ikev2" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ikev2" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  echo done
@@ -36,5 +36,5 @@ done
 west #
  grep -e IMPAIR: -e '^packet from ' /tmp/pluto.log
 IMPAIR: "westnet-eastnet-ikev2" #1: mangling DDOS cookie sent by peer
-IMPAIR: "westnet-eastnet-ikev2" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #

diff --git a/testing/pluto/ikev2-ddos-cookie-03-add/west.console.txt b/testing/pluto/ikev2-ddos-cookie-03-add/west.console.txt
index 312e84f685d2d0bd2323cf9687e61927e3680118..9a5fdf81c0a023067d03b1880df0fdbc1076e117 100644 (file)
--- a/testing/pluto/ikev2-ddos-cookie-03-add/west.console.txt
+++ b/testing/pluto/ikev2-ddos-cookie-03-add/west.console.txt
@@ -26,7 +26,7 @@ IMPAIR: "westnet-eastnet-ikev2" #1: adding unsolicited and mangled DDOS cookie
 "westnet-eastnet-ikev2" #1: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "westnet-eastnet-ikev2" #1: IKE_SA_INIT_I: 5 second timeout exceeded after 0 retransmits.  No response (or no acceptable response) to our first IKEv2 message
 "westnet-eastnet-ikev2" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ikev2" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  echo done
@@ -34,5 +34,5 @@ done
 west #
  grep -e IMPAIR: -e '^packet from ' /tmp/pluto.log
 IMPAIR: "westnet-eastnet-ikev2" #1: adding unsolicited and mangled DDOS cookie
-IMPAIR: "westnet-eastnet-ikev2" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #

diff --git a/testing/pluto/ikev2-delete-01/west.console.txt b/testing/pluto/ikev2-delete-01/west.console.txt
index f5c58dad9847d05a498d235020bf90898db0ef6a..625267a4dfec491b76f82d744df586dd289fd73f 100644 (file)
--- a/testing/pluto/ikev2-delete-01/west.console.txt
+++ b/testing/pluto/ikev2-delete-01/west.console.txt
@@ -177,7 +177,7 @@ west #
  ipsec whack --deletestate 1
 "westnet-eastnet-ipv4-psk-ikev2" #1: sent INFORMATIONAL request to delete IKE SA
 "westnet-eastnet-ipv4-psk-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #2: ESP traffic information: in=84B out=84B
 "westnet-eastnet-ipv4-psk-ikev2" #1: deleting IKE SA (established IKE SA)
 west #

diff --git a/testing/pluto/ikev2-delete-02/west.console.txt b/testing/pluto/ikev2-delete-02/west.console.txt
index ec98e4ccb819d110e97f9472d1ec6faa51c8784c..371d731b49e037620d4d51f6e8a672b75637a70f 100644 (file)
--- a/testing/pluto/ikev2-delete-02/west.console.txt
+++ b/testing/pluto/ikev2-delete-02/west.console.txt
@@ -74,7 +74,7 @@ west #
  ipsec whack --deletestate 2
 "west-east-delete1" #2: sent INFORMATIONAL request to delete established Child SA using IKE SA #1
 "west-east-delete1" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east-delete1" #2: revival: skip scheduling revival event
+IMPAIR: "west-east-delete1" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-east-delete1" #2: ESP traffic information: in=84B out=84B
 west #
  sleep 2

diff --git a/testing/pluto/ikev2-digsig-04-mismatch/west.console.txt b/testing/pluto/ikev2-digsig-04-mismatch/west.console.txt
index 3571ec14bdef6c8fe9c711e5017d9719f91a9f6d..4a699774e1cb3fea6af814baa8f797c40be5b153 100644 (file)
--- a/testing/pluto/ikev2-digsig-04-mismatch/west.console.txt
+++ b/testing/pluto/ikev2-digsig-04-mismatch/west.console.txt
@@ -30,7 +30,7 @@ west #
 "westnet-eastnet-ikev2" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "westnet-eastnet-ikev2" #1: encountered fatal error in state IKE_AUTH_I
 "westnet-eastnet-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ikev2" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo done

diff --git a/testing/pluto/ikev2-impair-05-send-zero-ike-ke/west.console.txt b/testing/pluto/ikev2-impair-05-send-zero-ike-ke/west.console.txt
index 854d59e295035cec8b010f7722c1f86b543fef80..88747dc22577c020f95b2ff2d26d41227847eb4b 100644 (file)
--- a/testing/pluto/ikev2-impair-05-send-zero-ike-ke/west.console.txt
+++ b/testing/pluto/ikev2-impair-05-send-zero-ike-ke/west.console.txt
@@ -33,7 +33,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: sending bogus KE (g^x) == 0 value t
 "westnet-eastnet-ipv4-psk-ikev2" #1: NSS: shared key calculation using ECP failed: SEC_ERROR_INVALID_KEY: The key does not support the requested operation.
 "westnet-eastnet-ipv4-psk-ikev2" #1: encountered fatal error in state IKE_SA_INIT_I
 "westnet-eastnet-ipv4-psk-ikev2" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  # send valid KE
@@ -54,7 +54,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev2" #2: NSS: shared key calculation using ECP failed: SEC_ERROR_INVALID_KEY: The key does not support the requested operation.
 "westnet-eastnet-ipv4-psk-ikev2" #2: encountered fatal error in state IKE_SA_INIT_I
 "westnet-eastnet-ipv4-psk-ikev2" #2: connection is supposed to remain up; revival attempt 2 scheduled in 5 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 5 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #2: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  echo done

diff --git a/testing/pluto/ikev2-impair-06-send-no-ike-ke/west.console.txt b/testing/pluto/ikev2-impair-06-send-no-ike-ke/west.console.txt
index fe1a0e6cbc6828d894464c9397d8bcb76caac7fb..e78017114acc501bb6264ec4cad9b01679bef60f 100644 (file)
--- a/testing/pluto/ikev2-impair-06-send-no-ike-ke/west.console.txt
+++ b/testing/pluto/ikev2-impair-06-send-no-ike-ke/west.console.txt
@@ -29,7 +29,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: omitting KE payload
 "westnet-eastnet-ipv4-psk-ikev2" #1: ignoring IKE_SA_INIT response containing INVALID_SYNTAX notification (Message ID 0; message payloads N, missing SA,KE,Ni)
 IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: retransmit so timing out SA (may retry)
 "westnet-eastnet-ipv4-psk-ikev2" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  # expect slower fail
@@ -46,7 +46,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev2" #2: ignoring IKE_SA_INIT response containing IKEV2_FRAGMENTATION_SUPPORTED... notification (Message ID 0; message payloads SA,Ni,N, missing KE)
 "westnet-eastnet-ipv4-psk-ikev2" #2: IKE_SA_INIT_I: 60 second timeout exceeded after 0 retransmits.  No response (or no acceptable response) to our first IKEv2 message
 "westnet-eastnet-ipv4-psk-ikev2" #2: connection is supposed to remain up; revival attempt 2 scheduled in 5 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 5 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #2: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  echo done

diff --git a/testing/pluto/ikev2-impair-07-send-empty-ike-ke/west.console.txt b/testing/pluto/ikev2-impair-07-send-empty-ike-ke/west.console.txt
index 35c6167bc22eb87868974b8e1028bd30dcfabf4e..35aff77f8aecacf75f3ba0516457e89523da778a 100644 (file)
--- a/testing/pluto/ikev2-impair-07-send-empty-ike-ke/west.console.txt
+++ b/testing/pluto/ikev2-impair-07-send-empty-ike-ke/west.console.txt
@@ -27,7 +27,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: sending an empty KE value
 "westnet-eastnet-ipv4-psk-ikev2" #1: ignoring IKE_SA_INIT response containing INVALID_SYNTAX notification (Message ID 0; message payloads N, missing SA,KE,Ni)
 IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: retransmit so timing out SA (may retry)
 "westnet-eastnet-ipv4-psk-ikev2" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ipsec whack --impair none
@@ -44,7 +44,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev2" #2: responder IKE_SA_INIT KE payload is 0 bytes; 64 required
 "westnet-eastnet-ipv4-psk-ikev2" #2: encountered fatal error in state IKE_SA_INIT_I
 "westnet-eastnet-ipv4-psk-ikev2" #2: connection is supposed to remain up; revival attempt 2 scheduled in 5 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 5 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #2: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  echo done

diff --git a/testing/pluto/ikev2-impair-10-nr-ts-selectors/west.console.txt b/testing/pluto/ikev2-impair-10-nr-ts-selectors/west.console.txt
index 134858adc1dc6e2261640532c53d5f2b7ca4a3a5..e3ee819851ef946a551fa4adefec8d7031c0e9a0 100644 (file)
--- a/testing/pluto/ikev2-impair-10-nr-ts-selectors/west.console.txt
+++ b/testing/pluto/ikev2-impair-10-nr-ts-selectors/west.console.txt
@@ -47,7 +47,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #3: forcing number of local TSi selecto
 "westnet-eastnet-ipv4-psk-ikev2" #3: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #4: IKE_AUTH response rejected Child SA with TS_UNACCEPTABLE
 "westnet-eastnet-ipv4-psk-ikev2" #4: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #4: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #4: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec auto --down westnet-eastnet-ipv4-psk-ikev2
 "westnet-eastnet-ipv4-psk-ikev2": initiating delete of connection's IKE SA #3
@@ -70,7 +70,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #5: forcing number of remote TSr select
 "westnet-eastnet-ipv4-psk-ikev2" #5: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #6: IKE_AUTH response rejected Child SA with TS_UNACCEPTABLE
 "westnet-eastnet-ipv4-psk-ikev2" #6: connection is supposed to remain up; revival attempt 2 scheduled in 5 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #6: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #6: revival: skip scheduling CONNECTION_REVIVAL event in 5 seconds
 west #
  ipsec auto --down westnet-eastnet-ipv4-psk-ikev2
 "westnet-eastnet-ipv4-psk-ikev2": initiating delete of connection's IKE SA #5

diff --git a/testing/pluto/ikev2-invalid-ke-07-second-child/west.console.txt b/testing/pluto/ikev2-invalid-ke-07-second-child/west.console.txt
index 951667a5027b0e31f81c9eec8259870c1aa70eae..fc1d58ea9911e7c91232e486c76d30959427d7de 100644 (file)
--- a/testing/pluto/ikev2-invalid-ke-07-second-child/west.console.txt
+++ b/testing/pluto/ikev2-invalid-ke-07-second-child/west.console.txt
@@ -35,5 +35,5 @@ west #
 "west-cuckoo" #3: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESP <0xESPESP}
 "west-cuckoo" #3: CREATE_CHILD_SA failed with error notification INVALID_KE_PAYLOAD response suggesting MODP4096 instead of MODP8192
 "west-cuckoo" #3: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-cuckoo" #3: revival: skip scheduling revival event
+IMPAIR: "west-cuckoo" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #

diff --git a/testing/pluto/ikev2-labeled-ipsec-04-no-label-on-initiator/west.console.txt b/testing/pluto/ikev2-labeled-ipsec-04-no-label-on-initiator/west.console.txt
index 41adc47f2faa0a97503de1a60592e84e12612e3c..7d1a171b1c3ce7ff5150d210c3b75f2b0ae86688 100644 (file)
--- a/testing/pluto/ikev2-labeled-ipsec-04-no-label-on-initiator/west.console.txt
+++ b/testing/pluto/ikev2-labeled-ipsec-04-no-label-on-initiator/west.console.txt
@@ -33,7 +33,7 @@ west #
 "labeled" #1: initiator established IKE SA; authenticated peer using preloaded certificate '@east' and 2nnn-bit RSASSA-PSS with SHA2_512 digital signature
 "labeled" #2: IKE_AUTH response rejected Child SA with TS_UNACCEPTABLE
 "labeled" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "labeled" #2: revival: skip scheduling revival event
+IMPAIR: "labeled" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  echo done
 done

diff --git a/testing/pluto/ikev2-leak-01-db_v2_prop_conj/west.console.txt b/testing/pluto/ikev2-leak-01-db_v2_prop_conj/west.console.txt
index dadadead54e541b8f0e15fa254f98905a81113ec..01d4121488f0a96faa9466601709e012db14552d 100644 (file)
--- a/testing/pluto/ikev2-leak-01-db_v2_prop_conj/west.console.txt
+++ b/testing/pluto/ikev2-leak-01-db_v2_prop_conj/west.console.txt
@@ -24,7 +24,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev2" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #2: IKE_AUTH response rejected Child SA with NO_PROPOSAL_CHOSEN
 "westnet-eastnet-ipv4-psk-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  echo done
 done

diff --git a/testing/pluto/ikev2-major-version-initiator/west.console.txt b/testing/pluto/ikev2-major-version-initiator/west.console.txt
index dd43e35cf774a36ec6049f54c1252b67ba857f0f..942b22324752ad9466e34b0148f07dbd1d7c1b7a 100644 (file)
--- a/testing/pluto/ikev2-major-version-initiator/west.console.txt
+++ b/testing/pluto/ikev2-major-version-initiator/west.console.txt
@@ -29,7 +29,7 @@ west #
 "westnet-eastnet-ikev2-major" #1: ignoring IKE_SA_INIT response containing INVALID_MAJOR_VERSION notification (Message ID 0; message payloads N, missing SA,KE,Ni)
 IMPAIR: "westnet-eastnet-ikev2-major" #1: retransmit so timing out SA (may retry)
 "westnet-eastnet-ikev2-major" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2-major" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2-major" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ikev2-major" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  echo done

diff --git a/testing/pluto/ikev2-ppk-static-03-no-insist-fail/west.console.txt b/testing/pluto/ikev2-ppk-static-03-no-insist-fail/west.console.txt
index e0a511d060b696894fa46e458ebf7732d318db94..bd61b909095f4b001c1792e624e3a48de6718f4c 100644 (file)
--- a/testing/pluto/ikev2-ppk-static-03-no-insist-fail/west.console.txt
+++ b/testing/pluto/ikev2-ppk-static-03-no-insist-fail/west.console.txt
@@ -54,7 +54,7 @@ west #
 "westnet-eastnet-ipv4-psk-ppk" #1: ignoring IKE_SA_INIT response containing NO_PROPOSAL_CHOSEN notification (Message ID 0; message payloads N, missing SA,KE,Ni)
 "westnet-eastnet-ipv4-psk-ppk" #1: IKE_SA_INIT_I: 60 second timeout exceeded after 0 retransmits.  No response (or no acceptable response) to our first IKEv2 message
 "westnet-eastnet-ipv4-psk-ppk" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ppk" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ppk" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ppk" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  echo done

diff --git a/testing/pluto/ikev2-ppk-static-04-insist-no-fail/west.console.txt b/testing/pluto/ikev2-ppk-static-04-insist-no-fail/west.console.txt
index 7e67879d8e71df638d5cac7b7d5a4f7f906111fa..1a5e88c54c64a0d6519997103c0c2a3e68043d37 100644 (file)
--- a/testing/pluto/ikev2-ppk-static-04-insist-no-fail/west.console.txt
+++ b/testing/pluto/ikev2-ppk-static-04-insist-no-fail/west.console.txt
@@ -52,7 +52,7 @@ west #
 "westnet-eastnet-ipv4-psk-ppk" #1: connection has ppk=insist but peer does not support PPK
 "westnet-eastnet-ipv4-psk-ppk" #1: encountered fatal error in state IKE_SA_INIT_I
 "westnet-eastnet-ipv4-psk-ppk" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ppk" #1: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ppk" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ppk" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  echo done

diff --git a/testing/pluto/ikev2-ppk-static-06-insist-insist-nokey-fail/west.console.txt b/testing/pluto/ikev2-ppk-static-06-insist-insist-nokey-fail/west.console.txt
index 9641771111fd2ac90f763a4561f302dd3d20b381..f583450df67eca3a055554881450373e7affcb0f 100644 (file)
--- a/testing/pluto/ikev2-ppk-static-06-insist-insist-nokey-fail/west.console.txt
+++ b/testing/pluto/ikev2-ppk-static-06-insist-insist-nokey-fail/west.console.txt
@@ -57,7 +57,7 @@ west #
 "westnet-eastnet-ipv4-psk-ppk" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "westnet-eastnet-ipv4-psk-ppk" #1: encountered fatal error in state IKE_AUTH_I
 "westnet-eastnet-ipv4-psk-ppk" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ppk" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ppk" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ppk" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo done

diff --git a/testing/pluto/ikev2-redirect-01-global-load-balancer/north.console.txt b/testing/pluto/ikev2-redirect-01-global-load-balancer/north.console.txt
index 7f374cfdf150ca6fb0835cbf7d5eb984b80f354a..563d8c2e5ede1003e9c0ba2fa625019aee8fc55c 100644 (file)
--- a/testing/pluto/ikev2-redirect-01-global-load-balancer/north.console.txt
+++ b/testing/pluto/ikev2-redirect-01-global-load-balancer/north.console.txt
@@ -31,7 +31,7 @@ north #
 "north-east" #1: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "north-east" #1: IKE_SA_INIT response redirects to new gateway 192.1.2.44
 "north-east" #1: scheduling redirect 1 to 192.1.2.44
-IMPAIR: "north-east" #1: redirect: skip scheduling redirect event
+IMPAIR: "north-east" #1: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "north-east" #1: deleting IKE SA (sent IKE_SA_INIT request)
 north #
  ipsec whack --impair trigger_revival:1
@@ -40,7 +40,7 @@ IMPAIR: "north-east": dispatch REVIVAL; redirect attempt 1 from 192.1.2.23 to 19
 "north-east" #2: sent IKE_SA_INIT request to 192.1.2.44:UDP/500
 IMPAIR: "north-east" #2: retransmit so timing out SA (may retry)
 "north-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "north-east" #2: revival: skip scheduling revival event
+IMPAIR: "north-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "north-east" #2: deleting IKE SA (sent IKE_SA_INIT request)
 north #
  ipsec auto --delete north-east
@@ -59,7 +59,7 @@ north #
 "north-east" #3: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "north-east" #3: IKE_SA_INIT response redirects to new gateway 192.1.2.46
 "north-east" #3: scheduling redirect 1 to 192.1.2.46
-IMPAIR: "north-east" #3: redirect: skip scheduling redirect event
+IMPAIR: "north-east" #3: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "north-east" #3: deleting IKE SA (sent IKE_SA_INIT request)
 north #
  ipsec whack --impair trigger_revival:2
@@ -68,7 +68,7 @@ IMPAIR: "north-east": dispatch REVIVAL; redirect attempt 1 from 192.1.2.23 to 19
 "north-east" #4: sent IKE_SA_INIT request to 192.1.2.46:UDP/500
 IMPAIR: "north-east" #4: retransmit so timing out SA (may retry)
 "north-east" #4: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "north-east" #4: revival: skip scheduling revival event
+IMPAIR: "north-east" #4: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "north-east" #4: deleting IKE SA (sent IKE_SA_INIT request)
 north #
  ipsec auto --delete north-east
@@ -87,7 +87,7 @@ north #
 "north-east" #5: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "north-east" #5: IKE_SA_INIT response redirects to new gateway 192.1.2.45
 "north-east" #5: scheduling redirect 1 to 192.1.2.45
-IMPAIR: "north-east" #5: redirect: skip scheduling redirect event
+IMPAIR: "north-east" #5: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "north-east" #5: deleting IKE SA (sent IKE_SA_INIT request)
 north #
  ipsec whack --impair trigger_revival:3

diff --git a/testing/pluto/ikev2-redirect-01-global-load-balancer/road.console.txt b/testing/pluto/ikev2-redirect-01-global-load-balancer/road.console.txt
index 66f944e056d5bbcbb3579e2c1db8c9408d07d272..2bbedd02750575d0b8885d81ea6ea53fd941a947 100644 (file)
--- a/testing/pluto/ikev2-redirect-01-global-load-balancer/road.console.txt
+++ b/testing/pluto/ikev2-redirect-01-global-load-balancer/road.console.txt
@@ -31,7 +31,7 @@ road #
 "road-east" #1: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "road-east" #1: IKE_SA_INIT response redirects to new gateway 192.1.2.45
 "road-east" #1: scheduling redirect 1 to 192.1.2.45
-IMPAIR: "road-east" #1: redirect: skip scheduling redirect event
+IMPAIR: "road-east" #1: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "road-east" #1: deleting IKE SA (sent IKE_SA_INIT request)
 road #
  ipsec whack --impair trigger_revival:1
@@ -74,7 +74,7 @@ road #
 "road-east" #4: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "road-east" #4: IKE_SA_INIT response redirects to new gateway 192.1.2.44
 "road-east" #4: scheduling redirect 1 to 192.1.2.44
-IMPAIR: "road-east" #4: redirect: skip scheduling redirect event
+IMPAIR: "road-east" #4: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "road-east" #4: deleting IKE SA (sent IKE_SA_INIT request)
 road #
  ipsec whack --impair trigger_revival:2
@@ -83,7 +83,7 @@ IMPAIR: "road-east": dispatch REVIVAL; redirect attempt 1 from 192.1.2.23 to 192
 "road-east" #5: sent IKE_SA_INIT request to 192.1.2.44:UDP/500
 IMPAIR: "road-east" #5: retransmit so timing out SA (may retry)
 "road-east" #5: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "road-east" #5: revival: skip scheduling revival event
+IMPAIR: "road-east" #5: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "road-east" #5: deleting IKE SA (sent IKE_SA_INIT request)
 road #
  ipsec whack --trafficstatus

diff --git a/testing/pluto/ikev2-redirect-01-global/west.console.txt b/testing/pluto/ikev2-redirect-01-global/west.console.txt
index c8d02fc25b6bcd5c8ff49b9e2d8a025162fd9af7..74a9c369604290997d3135fa18752bd03c7eabac 100644 (file)
--- a/testing/pluto/ikev2-redirect-01-global/west.console.txt
+++ b/testing/pluto/ikev2-redirect-01-global/west.console.txt
@@ -23,7 +23,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev2" #1: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "westnet-eastnet-ipv4-psk-ikev2" #1: IKE_SA_INIT response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #1: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits

diff --git a/testing/pluto/ikev2-redirect-02-auth/west.console.txt b/testing/pluto/ikev2-redirect-02-auth/west.console.txt
index 5f3f48b0671d680d35e5780508ad92eb9cb64ad4..c649ebe76c5e9cabcdccf26a71f566cc65e25077 100644 (file)
--- a/testing/pluto/ikev2-redirect-02-auth/west.console.txt
+++ b/testing/pluto/ikev2-redirect-02-auth/west.console.txt
@@ -27,7 +27,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev2" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #1: IKE_AUTH response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #2: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #1: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits

diff --git a/testing/pluto/ikev2-redirect-03-auth-loop/west.console.txt b/testing/pluto/ikev2-redirect-03-auth-loop/west.console.txt
index 060f2b73dc72368870b37ae897aef3728535e16d..a4690fb5b8636fd28b893dfec4a717b571bc5e9f 100644 (file)
--- a/testing/pluto/ikev2-redirect-03-auth-loop/west.console.txt
+++ b/testing/pluto/ikev2-redirect-03-auth-loop/west.console.txt
@@ -27,7 +27,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev2" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #1: IKE_AUTH response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #2: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #1: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -40,7 +40,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; redirect attempt 1 f
 "westnet-eastnet-ipv4-psk-ikev2" #3: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #3: IKE_AUTH response redirects to new gateway 192.1.2.23
 "westnet-eastnet-ipv4-psk-ikev2" #4: scheduling redirect 2 to 192.1.2.23
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #4: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #4: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #3: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -53,7 +53,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; redirect attempt 2 f
 "westnet-eastnet-ipv4-psk-ikev2" #5: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #5: IKE_AUTH response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #6: scheduling redirect 3 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #6: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #6: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #5: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -66,7 +66,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; redirect attempt 3 f
 "westnet-eastnet-ipv4-psk-ikev2" #7: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #7: IKE_AUTH response redirects to new gateway 192.1.2.23
 "westnet-eastnet-ipv4-psk-ikev2" #8: scheduling redirect 4 to 192.1.2.23
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #8: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #8: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #7: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -79,7 +79,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; redirect attempt 4 f
 "westnet-eastnet-ipv4-psk-ikev2" #9: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #9: IKE_AUTH response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #10: scheduling redirect 5 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #10: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #10: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #9: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -92,7 +92,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; redirect attempt 5 f
 "westnet-eastnet-ipv4-psk-ikev2" #11: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #11: IKE_AUTH redirect exceeds limit; assuming redirect loop
 "westnet-eastnet-ipv4-psk-ikev2" #12: connection is supposed to remain up; revival attempt 1 scheduled in 300 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #12: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #12: revival: skip scheduling CONNECTION_REVIVAL event in 300 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #11: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -106,7 +106,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; attempt 1 next in 30
 "westnet-eastnet-ipv4-psk-ikev2" #13: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #13: IKE_AUTH response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #14: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #14: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #14: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #13: deleting IKE SA (established IKE SA)
 west #
  echo done

diff --git a/testing/pluto/ikev2-redirect-03-global-loop/west.console.txt b/testing/pluto/ikev2-redirect-03-global-loop/west.console.txt
index 060f2b73dc72368870b37ae897aef3728535e16d..a4690fb5b8636fd28b893dfec4a717b571bc5e9f 100644 (file)
--- a/testing/pluto/ikev2-redirect-03-global-loop/west.console.txt
+++ b/testing/pluto/ikev2-redirect-03-global-loop/west.console.txt
@@ -27,7 +27,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev2" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #1: IKE_AUTH response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #2: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #1: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -40,7 +40,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; redirect attempt 1 f
 "westnet-eastnet-ipv4-psk-ikev2" #3: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #3: IKE_AUTH response redirects to new gateway 192.1.2.23
 "westnet-eastnet-ipv4-psk-ikev2" #4: scheduling redirect 2 to 192.1.2.23
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #4: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #4: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #3: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -53,7 +53,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; redirect attempt 2 f
 "westnet-eastnet-ipv4-psk-ikev2" #5: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #5: IKE_AUTH response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #6: scheduling redirect 3 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #6: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #6: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #5: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -66,7 +66,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; redirect attempt 3 f
 "westnet-eastnet-ipv4-psk-ikev2" #7: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #7: IKE_AUTH response redirects to new gateway 192.1.2.23
 "westnet-eastnet-ipv4-psk-ikev2" #8: scheduling redirect 4 to 192.1.2.23
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #8: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #8: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #7: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -79,7 +79,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; redirect attempt 4 f
 "westnet-eastnet-ipv4-psk-ikev2" #9: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #9: IKE_AUTH response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #10: scheduling redirect 5 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #10: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #10: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #9: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -92,7 +92,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; redirect attempt 5 f
 "westnet-eastnet-ipv4-psk-ikev2" #11: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #11: IKE_AUTH redirect exceeds limit; assuming redirect loop
 "westnet-eastnet-ipv4-psk-ikev2" #12: connection is supposed to remain up; revival attempt 1 scheduled in 300 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #12: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #12: revival: skip scheduling CONNECTION_REVIVAL event in 300 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #11: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -106,7 +106,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; attempt 1 next in 30
 "westnet-eastnet-ipv4-psk-ikev2" #13: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #13: IKE_AUTH response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #14: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #14: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #14: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #13: deleting IKE SA (established IKE SA)
 west #
  echo done

diff --git a/testing/pluto/ikev2-redirect-04-auth-down/west.console.txt b/testing/pluto/ikev2-redirect-04-auth-down/west.console.txt
index ef53a3305cae545b1e9329a40015928043598da8..1c9f1052fe996f8d153a26b9bee26ffb1a4a7303 100644 (file)
--- a/testing/pluto/ikev2-redirect-04-auth-down/west.console.txt
+++ b/testing/pluto/ikev2-redirect-04-auth-down/west.console.txt
@@ -31,7 +31,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev2" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #1: IKE_AUTH response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #2: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #1: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1
@@ -40,7 +40,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; redirect attempt 1 f
 "westnet-eastnet-ipv4-psk-ikev2" #3: sent IKE_SA_INIT request to 192.1.3.33:UDP/500
 "westnet-eastnet-ipv4-psk-ikev2" #3: IKE_SA_INIT_I: 10 second timeout exceeded after 0 retransmits.  No response (or no acceptable response) to our first IKEv2 message
 "westnet-eastnet-ipv4-psk-ikev2" #3: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #3: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #3: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ipsec whack --impair trigger_revival:1
@@ -54,6 +54,6 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; attempt 1 next in 5s
 "westnet-eastnet-ipv4-psk-ikev2" #4: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "westnet-eastnet-ipv4-psk-ikev2" #4: IKE_AUTH response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #5: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #5: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #5: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #4: deleting IKE SA (established IKE SA)
 west #

diff --git a/testing/pluto/ikev2-redirect-04-global-down/west.console.txt b/testing/pluto/ikev2-redirect-04-global-down/west.console.txt
index e7075e059a75b6e11955709ceb1c0733e2215afe..93e516f15b51f952e1ed5d222ca08dac99d6bba5 100644 (file)
--- a/testing/pluto/ikev2-redirect-04-global-down/west.console.txt
+++ b/testing/pluto/ikev2-redirect-04-global-down/west.console.txt
@@ -24,7 +24,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev2" #1: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "westnet-eastnet-ipv4-psk-ikev2" #1: IKE_SA_INIT response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #1: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #1: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ipsec whack --impair trigger_revival:1
@@ -33,7 +33,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; redirect attempt 1 f
 "westnet-eastnet-ipv4-psk-ikev2" #2: sent IKE_SA_INIT request to 192.1.3.33:UDP/500
 "westnet-eastnet-ipv4-psk-ikev2" #2: IKE_SA_INIT_I: 10 second timeout exceeded after 0 retransmits.  No response (or no acceptable response) to our first IKEv2 message
 "westnet-eastnet-ipv4-psk-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #2: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ipsec whack --impair trigger_revival:1
@@ -43,6 +43,6 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2": dispatch REVIVAL; attempt 1 next in 5s
 "westnet-eastnet-ipv4-psk-ikev2" #3: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "westnet-eastnet-ipv4-psk-ikev2" #3: IKE_SA_INIT response redirects to new gateway 192.1.3.33
 "westnet-eastnet-ipv4-psk-ikev2" #3: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #3: redirect: skip scheduling redirect event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #3: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #3: deleting IKE SA (sent IKE_SA_INIT request)
 west #

diff --git a/testing/pluto/ikev2-redirect-06-roadwarriors-reverse/north.console.txt b/testing/pluto/ikev2-redirect-06-roadwarriors-reverse/north.console.txt
index 93b51a8b4b2ae42a2d5fce189393b13d3fda9d94..69dd936514e5fcdd206d808570ba5f2bb8871be2 100644 (file)
--- a/testing/pluto/ikev2-redirect-06-roadwarriors-reverse/north.console.txt
+++ b/testing/pluto/ikev2-redirect-06-roadwarriors-reverse/north.console.txt
@@ -39,7 +39,7 @@ north #
  # wait for NORTH to block on revival
 north #
  ../../guestbin/wait-for-pluto.sh "IMPAIR: redirect"
-IMPAIR: "north-east" #2: redirect: skip scheduling redirect event
+IMPAIR: "north-east" #2: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 north #
  ipsec whack --impair trigger_revival:1
 IMPAIR: "north-east": dispatch REVIVAL; redirect attempt 1 from 192.1.2.23 to 192.1.2.45; received Delete/Notify

diff --git a/testing/pluto/ikev2-redirect-06-roadwarriors-reverse/road.console.txt b/testing/pluto/ikev2-redirect-06-roadwarriors-reverse/road.console.txt
index 3c867bd11ed01df3a225bf1bb7cb2db502e354e2..751fbadc5746dc5c539e50062318e433a77dca0e 100644 (file)
--- a/testing/pluto/ikev2-redirect-06-roadwarriors-reverse/road.console.txt
+++ b/testing/pluto/ikev2-redirect-06-roadwarriors-reverse/road.console.txt
@@ -39,7 +39,7 @@ road #
  # wait for ROAD to block on revival
 road #
  ../../guestbin/wait-for-pluto.sh "IMPAIR: redirect"
-IMPAIR: "road-east" #2: redirect: skip scheduling redirect event
+IMPAIR: "road-east" #2: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 road #
  ipsec whack --impair trigger_revival:1
 IMPAIR: "road-east": dispatch REVIVAL; redirect attempt 1 from 192.1.2.23 to 192.1.2.45; received Delete/Notify

diff --git a/testing/pluto/ikev2-redirect-06-roadwarriors/north.console.txt b/testing/pluto/ikev2-redirect-06-roadwarriors/north.console.txt
index deda7565d54b36faf5e2b1d85875ef8970788f0f..0e07966079e6e2854df63c356f85782c8484aff3 100644 (file)
--- a/testing/pluto/ikev2-redirect-06-roadwarriors/north.console.txt
+++ b/testing/pluto/ikev2-redirect-06-roadwarriors/north.console.txt
@@ -49,7 +49,7 @@ north #
  # wait for NORTH to block on revival
 north #
  ../../guestbin/wait-for-pluto.sh "IMPAIR: .*: redirect"
-IMPAIR: "north-east" #2: redirect: skip scheduling redirect event
+IMPAIR: "north-east" #2: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 north #
  ipsec whack --impair trigger_revival:1
 IMPAIR: "north-east": dispatch REVIVAL; redirect attempt 1 from 192.1.2.23 to 192.1.2.45; received Delete/Notify

diff --git a/testing/pluto/ikev2-redirect-06-roadwarriors/road.console.txt b/testing/pluto/ikev2-redirect-06-roadwarriors/road.console.txt
index 6e304f78d443d8ca07f3cad24d565e9545441ee7..17cb21e22097a5ea45f435c7d4d88855fe6d1c40 100644 (file)
--- a/testing/pluto/ikev2-redirect-06-roadwarriors/road.console.txt
+++ b/testing/pluto/ikev2-redirect-06-roadwarriors/road.console.txt
@@ -49,7 +49,7 @@ road #
  # wait for ROAD to block on revival
 road #
  ../../guestbin/wait-for-pluto.sh "IMPAIR: .*: redirect"
-IMPAIR: "road-east" #2: redirect: skip scheduling redirect event
+IMPAIR: "road-east" #2: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 road #
  ipsec whack --impair trigger_revival:1
 IMPAIR: "road-east": dispatch REVIVAL; redirect attempt 1 from 192.1.2.23 to 192.1.2.45; received Delete/Notify

diff --git a/testing/pluto/ikev2-redirect-07-auth-pair/west.console.txt b/testing/pluto/ikev2-redirect-07-auth-pair/west.console.txt
index d8249336bbb1a2a24a8ea1848e4d614e2699dd36..5f3641b3bbeb3a40607a8abf59319ed532770def 100644 (file)
--- a/testing/pluto/ikev2-redirect-07-auth-pair/west.console.txt
+++ b/testing/pluto/ikev2-redirect-07-auth-pair/west.console.txt
@@ -34,7 +34,7 @@ west #
 "west-cuckoo" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "west-cuckoo" #1: IKE_AUTH response redirects to new gateway 192.1.3.33
 "west-cuckoo" #2: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "west-cuckoo" #2: redirect: skip scheduling redirect event
+IMPAIR: "west-cuckoo" #2: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-cuckoo" #1: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -60,7 +60,7 @@ west #
 "west-cuckold" #5: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "west-cuckold" #5: IKE_AUTH response redirects to new gateway 192.1.3.33
 "west-cuckold" #6: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "west-cuckold" #6: redirect: skip scheduling redirect event
+IMPAIR: "west-cuckold" #6: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-cuckold" #5: deleting IKE SA (established IKE SA)
 west #
  # re-initiate the second connection; it will now match the first IKE

diff --git a/testing/pluto/ikev2-redirect-07-auth-split/west.console.txt b/testing/pluto/ikev2-redirect-07-auth-split/west.console.txt
index 140b1b5596367ba01dc248dc3e609b96d74a029a..65ad49be2a30621c778dbd6ff29f5bcb3462335d 100644 (file)
--- a/testing/pluto/ikev2-redirect-07-auth-split/west.console.txt
+++ b/testing/pluto/ikev2-redirect-07-auth-split/west.console.txt
@@ -36,7 +36,7 @@ west #
 "west-cuckoo" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "west-cuckoo" #1: IKE_AUTH response redirects to new gateway 192.1.3.33
 "west-cuckoo" #2: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "west-cuckoo" #2: redirect: skip scheduling redirect event
+IMPAIR: "west-cuckoo" #2: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-cuckoo" #1: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1 # sanitize-retransmits
@@ -62,7 +62,7 @@ west #
 "west-cuckold" #5: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "west-cuckold" #6: IKE_AUTH response rejected Child SA with TS_UNACCEPTABLE
 "west-cuckold" #6: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-cuckold" #6: revival: skip scheduling revival event
+IMPAIR: "west-cuckold" #6: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec trafficstatus
 #4: "west-cuckoo", type=ESP, add_time=1234567890, inBytes=0, outBytes=0, maxBytes=2^63B, id='@east'

diff --git a/testing/pluto/ikev2-redirect-07-global-pair/west.console.txt b/testing/pluto/ikev2-redirect-07-global-pair/west.console.txt
index 212796b00502641dd0f549e3f8c43153024cf9e7..1ea6c4cc4e124e3f5964d1dedf6e7d82c54adc1a 100644 (file)
--- a/testing/pluto/ikev2-redirect-07-global-pair/west.console.txt
+++ b/testing/pluto/ikev2-redirect-07-global-pair/west.console.txt
@@ -30,7 +30,7 @@ west #
 "west-cuckoo" #1: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "west-cuckoo" #1: IKE_SA_INIT response redirects to new gateway 192.1.3.33
 "west-cuckoo" #1: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "west-cuckoo" #1: redirect: skip scheduling redirect event
+IMPAIR: "west-cuckoo" #1: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-cuckoo" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ipsec whack --impair trigger_revival:1
@@ -52,7 +52,7 @@ west #
 "west-cuckold" #4: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "west-cuckold" #4: IKE_SA_INIT response redirects to new gateway 192.1.3.33
 "west-cuckold" #4: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "west-cuckold" #4: redirect: skip scheduling redirect event
+IMPAIR: "west-cuckold" #4: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-cuckold" #4: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  # re-initiate the second connection; it will now match the first IKE

diff --git a/testing/pluto/ikev2-rw-multiple-subnets-4-mismatch-split-up/road.console.txt b/testing/pluto/ikev2-rw-multiple-subnets-4-mismatch-split-up/road.console.txt
index 13c5ba618fe9429684588691c17984c2c8438ce8..e8cf02689eba430d7c2113d4599828413f72ad3e 100644 (file)
--- a/testing/pluto/ikev2-rw-multiple-subnets-4-mismatch-split-up/road.console.txt
+++ b/testing/pluto/ikev2-rw-multiple-subnets-4-mismatch-split-up/road.console.txt
@@ -41,7 +41,7 @@ road #
 "road/0x2" #3: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESPinUDP <0xESPESP}
 "road/0x2" #3: CREATE_CHILD_SA failed with error notification TS_UNACCEPTABLE
 "road/0x2" #3: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "road/0x2" #3: revival: skip scheduling revival event
+IMPAIR: "road/0x2" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 road #
  ipsec whack --impair none
 road #
@@ -67,7 +67,7 @@ road #
 "road/0x4" #5: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESPinUDP <0xESPESP}
 "road/0x4" #5: CREATE_CHILD_SA failed with error notification TS_UNACCEPTABLE
 "road/0x4" #5: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "road/0x4" #5: revival: skip scheduling revival event
+IMPAIR: "road/0x4" #5: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 road #
  ipsec whack --impair none
 road #

diff --git a/testing/pluto/ikev2-rw-multiple-subnets-4-mismatch/road.console.txt b/testing/pluto/ikev2-rw-multiple-subnets-4-mismatch/road.console.txt
index 89c687bd926b328c10592c1ed817aebd1feb6264..ce3c797fac80be831a4873b65d0828f1e7a55f57 100644 (file)
--- a/testing/pluto/ikev2-rw-multiple-subnets-4-mismatch/road.console.txt
+++ b/testing/pluto/ikev2-rw-multiple-subnets-4-mismatch/road.console.txt
@@ -48,7 +48,7 @@ initiating 8 connections
 "road/0x2" #3: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESPinUDP <0xESPESP}
 "road/0x2" #3: CREATE_CHILD_SA failed with error notification TS_UNACCEPTABLE
 "road/0x2" #3: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "road/0x2" #3: revival: skip scheduling revival event
+IMPAIR: "road/0x2" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "road/0x3" #4: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESPinUDP <0xESPESP}
 "road/0x3" #4: initiator established Child SA using #1; IPsec tunnel [192.0.3.0/24===192.0.20.0/24] {ESPinUDP/ESN=>0xESPESP <0xESPESP xfrm=AES_GCM_16_256-DH19 NATD=192.1.2.23:4500 DPD=passive}
 "road/0x6" #7: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESPinUDP <0xESPESP}
@@ -56,7 +56,7 @@ IMPAIR: "road/0x2" #3: revival: skip scheduling revival event
 "road/0x4" #5: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESPinUDP <0xESPESP}
 "road/0x4" #5: CREATE_CHILD_SA failed with error notification TS_UNACCEPTABLE
 "road/0x4" #5: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "road/0x4" #5: revival: skip scheduling revival event
+IMPAIR: "road/0x4" #5: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "road/0x5" #6: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESPinUDP <0xESPESP}
 "road/0x5" #6: initiator established Child SA using #1; IPsec tunnel [192.0.3.0/24===10.0.1.0/24] {ESPinUDP/ESN=>0xESPESP <0xESPESP xfrm=AES_GCM_16_256-DH19 NATD=192.1.2.23:4500 DPD=passive}
 "road/0x7" #8: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESPinUDP <0xESPESP}

diff --git a/testing/pluto/ikev2-rw-multiple-subnets-5-mismatch-frst/road.console.txt b/testing/pluto/ikev2-rw-multiple-subnets-5-mismatch-frst/road.console.txt
index 6abc5bf206bc6aa7ee953805861d61ecd2f9428a..4bbbbc905864e3f24243744a808b12cc89123425 100644 (file)
--- a/testing/pluto/ikev2-rw-multiple-subnets-5-mismatch-frst/road.console.txt
+++ b/testing/pluto/ikev2-rw-multiple-subnets-5-mismatch-frst/road.console.txt
@@ -34,7 +34,7 @@ initiating 4 connections
 "road/0x3" #4: initiating Child SA using IKE SA #1
 "road/0x4" #5: initiating Child SA using IKE SA #1
 "road/0x1" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "road/0x1" #2: revival: skip scheduling revival event
+IMPAIR: "road/0x1" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "road/0x2" #3: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESPinUDP <0xESPESP}
 "road/0x2" #3: initiator established Child SA using #1; IPsec tunnel [192.0.3.0/24===192.0.2.0/24] {ESPinUDP/ESN=>0xESPESP <0xESPESP xfrm=AES_GCM_16_256-DH19 NATD=192.1.2.23:4500 DPD=passive}
 "road/0x3" #4: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESPinUDP <0xESPESP}
@@ -42,7 +42,7 @@ IMPAIR: "road/0x1" #2: revival: skip scheduling revival event
 "road/0x4" #5: sent CREATE_CHILD_SA request to create Child SA using IKE SA #1 {ESPinUDP <0xESPESP}
 "road/0x4" #5: CREATE_CHILD_SA failed with error notification TS_UNACCEPTABLE
 "road/0x4" #5: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "road/0x4" #5: revival: skip scheduling revival event
+IMPAIR: "road/0x4" #5: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 road #
  # sleep 3
 road #

diff --git a/testing/pluto/ikev2-tcp-00-enable-tcp-default/west.console.txt b/testing/pluto/ikev2-tcp-00-enable-tcp-default/west.console.txt
index 8d9f71a3690bc53d73bb48085a3a54d82a5cc860..69f801fdcdc671e859fd0654dc1c17b9e3adf462 100644 (file)
--- a/testing/pluto/ikev2-tcp-00-enable-tcp-default/west.console.txt
+++ b/testing/pluto/ikev2-tcp-00-enable-tcp-default/west.console.txt
@@ -37,7 +37,7 @@ west #
 "west" #1: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "west" #1: IKE_SA_INIT_I: 10 second timeout exceeded after 5 retransmits.  No response (or no acceptable response) to our first IKEv2 message
 "west" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west" #1: revival: skip scheduling revival event
+IMPAIR: "west" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ../../guestbin/ping-once.sh --down -I 192.0.1.254 192.0.2.254
@@ -59,7 +59,7 @@ IMPAIR: "west": dispatch REVIVAL; attempt 1 next in 5s; timeout IKE SA
 "west" #2: retransmitting IKE_SA_INIT request; will wait 8 seconds for response
 "west" #2: IKE_SA_INIT_I: 10 second timeout exceeded after 5 retransmits.  No response (or no acceptable response) to our first IKEv2 message
 "west" #2: connection is supposed to remain up; revival attempt 2 scheduled in 5 seconds
-IMPAIR: "west" #2: revival: skip scheduling revival event
+IMPAIR: "west" #2: revival: skip scheduling CONNECTION_REVIVAL event in 5 seconds
 "west" #2: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ../../guestbin/ping-once.sh --down -I 192.0.1.254 192.0.2.254

diff --git a/testing/pluto/ikev2-tcp-00-enable-tcp-fallback/west.console.txt b/testing/pluto/ikev2-tcp-00-enable-tcp-fallback/west.console.txt
index 213e7de2a09d99a7721cec60275b1b6214003172..bd987bb72c97843278a67997b2537e35c0d82527 100644 (file)
--- a/testing/pluto/ikev2-tcp-00-enable-tcp-fallback/west.console.txt
+++ b/testing/pluto/ikev2-tcp-00-enable-tcp-fallback/west.console.txt
@@ -37,7 +37,7 @@ west #
 "west" #1: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "west" #1: IKE_SA_INIT_I: 10 second timeout exceeded after 5 retransmits.  No response (or no acceptable response) to our first IKEv2 message
 "west" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west" #1: revival: skip scheduling revival event
+IMPAIR: "west" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ../../guestbin/ping-once.sh --down -I 192.0.1.254 192.0.2.254

diff --git a/testing/pluto/ikev2-tcp-00-enable-tcp-no/west.console.txt b/testing/pluto/ikev2-tcp-00-enable-tcp-no/west.console.txt
index bffc6b3855d2f094d61d0aea9bc3efd0eda7e6e9..f5f1ad393a920f1d289126fde31ebcb3285a09d0 100644 (file)
--- a/testing/pluto/ikev2-tcp-00-enable-tcp-no/west.console.txt
+++ b/testing/pluto/ikev2-tcp-00-enable-tcp-no/west.console.txt
@@ -37,7 +37,7 @@ west #
 "west" #1: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "west" #1: IKE_SA_INIT_I: 10 second timeout exceeded after 5 retransmits.  No response (or no acceptable response) to our first IKEv2 message
 "west" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west" #1: revival: skip scheduling revival event
+IMPAIR: "west" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ../../guestbin/ping-once.sh --down -I 192.0.1.254 192.0.2.254
@@ -59,7 +59,7 @@ IMPAIR: "west": dispatch REVIVAL; attempt 1 next in 5s; timeout IKE SA
 "west" #2: retransmitting IKE_SA_INIT request; will wait 8 seconds for response
 "west" #2: IKE_SA_INIT_I: 10 second timeout exceeded after 5 retransmits.  No response (or no acceptable response) to our first IKEv2 message
 "west" #2: connection is supposed to remain up; revival attempt 2 scheduled in 5 seconds
-IMPAIR: "west" #2: revival: skip scheduling revival event
+IMPAIR: "west" #2: revival: skip scheduling CONNECTION_REVIVAL event in 5 seconds
 "west" #2: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ../../guestbin/ping-once.sh --down -I 192.0.1.254 192.0.2.254

diff --git a/testing/pluto/ikev2-tcp-01-listen-tcp-no-udp-no/west.console.txt b/testing/pluto/ikev2-tcp-01-listen-tcp-no-udp-no/west.console.txt
index 0f11810eb20f63ac9b837fb60c901dbf8f1ad93f..0d566d0d8eef65fc6993a01d65072ccf79beaa19 100644 (file)
--- a/testing/pluto/ikev2-tcp-01-listen-tcp-no-udp-no/west.console.txt
+++ b/testing/pluto/ikev2-tcp-01-listen-tcp-no-udp-no/west.console.txt
@@ -39,6 +39,6 @@ west #
 "udp" #1: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "udp" #1: IKE_SA_INIT_I: 10 second timeout exceeded after 5 retransmits.  No response (or no acceptable response) to our first IKEv2 message
 "udp" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "udp" #1: revival: skip scheduling revival event
+IMPAIR: "udp" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "udp" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #

diff --git a/testing/pluto/ikev2-tcp-01-listen-tcp-yes-udp-no/west.console.txt b/testing/pluto/ikev2-tcp-01-listen-tcp-yes-udp-no/west.console.txt
index 332d2adf8725d16e7be315ef3751375f1a6822fa..7e9c8b8045f531e660538fa5b53a38f1ec762390 100644 (file)
--- a/testing/pluto/ikev2-tcp-01-listen-tcp-yes-udp-no/west.console.txt
+++ b/testing/pluto/ikev2-tcp-01-listen-tcp-yes-udp-no/west.console.txt
@@ -49,6 +49,6 @@ west #
 "udp" #3: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 "udp" #3: IKE_SA_INIT_I: 10 second timeout exceeded after 5 retransmits.  No response (or no acceptable response) to our first IKEv2 message
 "udp" #3: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "udp" #3: revival: skip scheduling revival event
+IMPAIR: "udp" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "udp" #3: deleting IKE SA (sent IKE_SA_INIT request)
 west #

diff --git a/testing/pluto/ikev2-tcp-06-fail-ike-sa-init-redirect/west.console.txt b/testing/pluto/ikev2-tcp-06-fail-ike-sa-init-redirect/west.console.txt
index 0f4d86c5241b27f179f7f2754bff74d81626998f..d76ec802a2e8c4b2d89e410ffeeb15f285e7019e 100644 (file)
--- a/testing/pluto/ikev2-tcp-06-fail-ike-sa-init-redirect/west.console.txt
+++ b/testing/pluto/ikev2-tcp-06-fail-ike-sa-init-redirect/west.console.txt
@@ -23,7 +23,7 @@ west #
 "west" #1: sent IKE_SA_INIT request to 192.1.2.23:TCP/4500
 "west" #1: IKE_SA_INIT response redirects to new gateway 192.1.3.33
 "west" #1: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "west" #1: redirect: skip scheduling redirect event
+IMPAIR: "west" #1: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ipsec whack --impair trigger_revival:1

diff --git a/testing/pluto/ikev2-tcp-07-fail-ike-auth-redirect/west.console.txt b/testing/pluto/ikev2-tcp-07-fail-ike-auth-redirect/west.console.txt
index db18bd30c2dd4c4de63be9f2fe3e8917b660011b..c0e4432e38ea3ab251ca1b5a9e3cd8d4f7031e8d 100644 (file)
--- a/testing/pluto/ikev2-tcp-07-fail-ike-auth-redirect/west.console.txt
+++ b/testing/pluto/ikev2-tcp-07-fail-ike-auth-redirect/west.console.txt
@@ -27,7 +27,7 @@ west #
 "west" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "west" #1: IKE_AUTH response redirects to new gateway 192.1.3.33
 "west" #2: scheduling redirect 1 to 192.1.3.33
-IMPAIR: "west" #2: redirect: skip scheduling redirect event
+IMPAIR: "west" #2: redirect: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #1: deleting IKE SA (established IKE SA)
 west #
  ipsec whack --impair trigger_revival:1

diff --git a/testing/pluto/ikev2-unknown-payload-01-sa-init/west.console.txt b/testing/pluto/ikev2-unknown-payload-01-sa-init/west.console.txt
index 31a1b6871e8ec1705415d3f0bcefd06443975ff2..5aa0094cfecdc397852dd2a8af76155a8dc2c249 100644 (file)
--- a/testing/pluto/ikev2-unknown-payload-01-sa-init/west.console.txt
+++ b/testing/pluto/ikev2-unknown-payload-01-sa-init/west.console.txt
@@ -58,7 +58,7 @@ IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #3: setting (should be off) critical pa
 "westnet-eastnet-ipv4-psk-ikev2" #3: ignoring IKE_SA_INIT response containing UNSUPPORTED_CRITICAL_PAYLOAD notification (Message ID 0; message payloads N, missing SA,KE,Ni)
 IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #3: retransmit so timing out SA (may retry)
 "westnet-eastnet-ipv4-psk-ikev2" #3: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #3: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #3: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  echo done

diff --git a/testing/pluto/ikev2-x509-05-san-firstemail-match-responder/west.console.txt b/testing/pluto/ikev2-x509-05-san-firstemail-match-responder/west.console.txt
index c4f84627522f925f354d6fde3242810d34c38c3a..934f80fa6fe2272651e51252b393a646e53ce102 100644 (file)
--- a/testing/pluto/ikev2-x509-05-san-firstemail-match-responder/west.console.txt
+++ b/testing/pluto/ikev2-x509-05-san-firstemail-match-responder/west.console.txt
@@ -28,7 +28,7 @@ west #
 "san" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "san" #1: encountered fatal error in state IKE_AUTH_I
 "san" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "san" #2: revival: skip scheduling revival event
+IMPAIR: "san" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "san" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo "done"

diff --git a/testing/pluto/ikev2-x509-05-san-firstemail-match/west.console.txt b/testing/pluto/ikev2-x509-05-san-firstemail-match/west.console.txt
index 3e82b20cdaffab3876b5d1b73b38cf9a7ab8263c..42960dd4b0c54dc2395565dab05731a94c3b6433 100644 (file)
--- a/testing/pluto/ikev2-x509-05-san-firstemail-match/west.console.txt
+++ b/testing/pluto/ikev2-x509-05-san-firstemail-match/west.console.txt
@@ -29,7 +29,7 @@ west #
 "san" #1: X509: authentication failed; peer certificate subjectAltName extension does not match USER_FQDN 'user-east@testing.libreswan.org'
 "san" #1: deleting IKE SA (IKE_AUTH_I) and sending notification
 "san" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "san" #2: revival: skip scheduling revival event
+IMPAIR: "san" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  echo "done"
 done

diff --git a/testing/pluto/ikev2-x509-14-san-dn-mismatch/west.console.txt b/testing/pluto/ikev2-x509-14-san-dn-mismatch/west.console.txt
index 4786a7988ff4b7e370f5b1482ac2a9db675e99a7..f00057cce0fef6ff57cfee90558a07e4e0d14f17 100644 (file)
--- a/testing/pluto/ikev2-x509-14-san-dn-mismatch/west.console.txt
+++ b/testing/pluto/ikev2-x509-14-san-dn-mismatch/west.console.txt
@@ -29,7 +29,7 @@ west #
 "san" #1: X509: authentication failed; peer ID DER_ASN1_DN 'E=user-east@testing.libreswan.org,CN=east.testing.libreswan.org,OU=Test Department,O=Libreswan,L=Toronto,ST=Ontario,C=CA' does not match expected 'C=CA, ST=Ontario, L=Toronto, O=Libreswan, OU=Test Department, CN=NOTeast.testing.libreswan.org, E=user-NOTeast@testing.libreswan.org'
 "san" #1: deleting IKE SA (IKE_AUTH_I) and sending notification
 "san" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "san" #2: revival: skip scheduling revival event
+IMPAIR: "san" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  echo "done"
 done

diff --git a/testing/pluto/ikev2-x509-23-no-ca/west.console.txt b/testing/pluto/ikev2-x509-23-no-ca/west.console.txt
index 4dcf65f4eac6675207f764c9542b7b43948411c2..1ef246805875d00a1a1c7efb256ed50faa908a27 100644 (file)
--- a/testing/pluto/ikev2-x509-23-no-ca/west.console.txt
+++ b/testing/pluto/ikev2-x509-23-no-ca/west.console.txt
@@ -54,7 +54,7 @@ west #
 "ikev2-westnet-eastnet-x509-cr" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "ikev2-westnet-eastnet-x509-cr" #1: encountered fatal error in state IKE_AUTH_I
 "ikev2-westnet-eastnet-x509-cr" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ikev2-westnet-eastnet-x509-cr" #2: revival: skip scheduling revival event
+IMPAIR: "ikev2-westnet-eastnet-x509-cr" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "ikev2-westnet-eastnet-x509-cr" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo "done"

diff --git a/testing/pluto/ikev2-x509-24-fakewest/west.console.txt b/testing/pluto/ikev2-x509-24-fakewest/west.console.txt
index a234926cff19c0953d50e0866006664e21bf00d7..1ef4f6cc10ebcd5ae0b04b898471d6040627967f 100644 (file)
--- a/testing/pluto/ikev2-x509-24-fakewest/west.console.txt
+++ b/testing/pluto/ikev2-x509-24-fakewest/west.console.txt
@@ -86,7 +86,7 @@ west #
 "westnet-eastnet-ikev2" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "westnet-eastnet-ikev2" #1: encountered fatal error in state IKE_AUTH_I
 "westnet-eastnet-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ikev2" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo done

diff --git a/testing/pluto/ikev2-x509-25-missing-ca/west.console.txt b/testing/pluto/ikev2-x509-25-missing-ca/west.console.txt
index 9f3ab3208c663620beed933f6856c7d63b541d30..d4951ee8b1d4b3c152885eec694b85c8ea39e856 100644 (file)
--- a/testing/pluto/ikev2-x509-25-missing-ca/west.console.txt
+++ b/testing/pluto/ikev2-x509-25-missing-ca/west.console.txt
@@ -62,7 +62,7 @@ west #
 "ikev2-westnet-eastnet-x509-cr" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "ikev2-westnet-eastnet-x509-cr" #1: encountered fatal error in state IKE_AUTH_I
 "ikev2-westnet-eastnet-x509-cr" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ikev2-westnet-eastnet-x509-cr" #2: revival: skip scheduling revival event
+IMPAIR: "ikev2-westnet-eastnet-x509-cr" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "ikev2-westnet-eastnet-x509-cr" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo "done"

diff --git a/testing/pluto/ikev2-x509-37-fakeeast-westecca/west.console.txt b/testing/pluto/ikev2-x509-37-fakeeast-westecca/west.console.txt
index 4a6340d6d3cfa2923fdd851f91d3df1073f9d644..05991dca1b42e0da73638a76000c29d7da4d7c90 100644 (file)
--- a/testing/pluto/ikev2-x509-37-fakeeast-westecca/west.console.txt
+++ b/testing/pluto/ikev2-x509-37-fakeeast-westecca/west.console.txt
@@ -65,7 +65,7 @@ west #
 "ikev2-westnet-eastnet-x509-cr" #1: X509: certificate payload rejected for this connection
 "ikev2-westnet-eastnet-x509-cr" #1: encountered fatal error in state IKE_AUTH_I
 "ikev2-westnet-eastnet-x509-cr" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ikev2-westnet-eastnet-x509-cr" #2: revival: skip scheduling revival event
+IMPAIR: "ikev2-westnet-eastnet-x509-cr" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "ikev2-westnet-eastnet-x509-cr" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo "done"

diff --git a/testing/pluto/ikev2-x509-37-fakeeast-westnoca/west.console.txt b/testing/pluto/ikev2-x509-37-fakeeast-westnoca/west.console.txt
index 9ac89551f331a780a4b10a47af8c8f115bcd9e37..dfc1d993abd2df729af6312a36b90897bb2dd2d7 100644 (file)
--- a/testing/pluto/ikev2-x509-37-fakeeast-westnoca/west.console.txt
+++ b/testing/pluto/ikev2-x509-37-fakeeast-westnoca/west.console.txt
@@ -59,7 +59,7 @@ west #
 "ikev2-westnet-eastnet-x509-cr" #1: authentication failed: no certificate matched RSASSA-PSS with SHA2_512 and 'C=CA, ST=Ontario, L=Toronto, O=Libreswan, OU=Test Department, CN=east.testing.libreswan.org, E=user-east@testing.libreswan.org'
 "ikev2-westnet-eastnet-x509-cr" #1: deleting IKE SA (IKE_AUTH_I) and sending notification
 "ikev2-westnet-eastnet-x509-cr" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ikev2-westnet-eastnet-x509-cr" #2: revival: skip scheduling revival event
+IMPAIR: "ikev2-westnet-eastnet-x509-cr" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  echo "done"
 done

diff --git a/testing/pluto/ikev2-x509-37-fakeeast-westrsa/west.console.txt b/testing/pluto/ikev2-x509-37-fakeeast-westrsa/west.console.txt
index 3321a767c227be1c38bdfee7e3da301bd8f6de34..a1b883fb2d7773611b2d875b7414a6be164a5c02 100644 (file)
--- a/testing/pluto/ikev2-x509-37-fakeeast-westrsa/west.console.txt
+++ b/testing/pluto/ikev2-x509-37-fakeeast-westrsa/west.console.txt
@@ -60,7 +60,7 @@ west #
 "ikev2-westnet-eastnet-x509-cr" #1: X509: certificate payload rejected for this connection
 "ikev2-westnet-eastnet-x509-cr" #1: encountered fatal error in state IKE_AUTH_I
 "ikev2-westnet-eastnet-x509-cr" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ikev2-westnet-eastnet-x509-cr" #2: revival: skip scheduling revival event
+IMPAIR: "ikev2-westnet-eastnet-x509-cr" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "ikev2-westnet-eastnet-x509-cr" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo "done"

diff --git a/testing/pluto/impair-08-ikev1-key-length-attribute/west.console.txt b/testing/pluto/impair-08-ikev1-key-length-attribute/west.console.txt
index f14137b602306679de7958dc4807ac0472769094..0f68f08104eb0f7204207ee512fa505a552c09d9 100644 (file)
--- a/testing/pluto/impair-08-ikev1-key-length-attribute/west.console.txt
+++ b/testing/pluto/impair-08-ikev1-key-length-attribute/west.console.txt
@@ -55,7 +55,7 @@ IMPAIR: "aes128" #3: duplicating key-length
 "aes128" #3: ignoring unsecured informational payload BAD_PROPOSAL_SYNTAX, length=12
 IMPAIR: "aes128" #3: retransmit so timing out SA (may retry)
 "aes128" #3: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "aes128" #3: revival: skip scheduling revival event
+IMPAIR: "aes128" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "aes128" #3: deleting ISAKMP SA (MAIN_I1) and NOT sending notification
 west #
  ipsec whack --impair none
@@ -80,7 +80,7 @@ IMPAIR: "aes128" #5: duplicating key-length
 "aes128" #5: sent Quick Mode request
 IMPAIR: "aes128" #5: retransmit so timing out SA (may retry)
 "aes128" #5: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "aes128" #5: revival: skip scheduling revival event
+IMPAIR: "aes128" #5: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "aes128" #5: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  ipsec whack --impair none
@@ -102,7 +102,7 @@ IMPAIR: "aes128" #6: sending key-length attribute value 0
 "aes128" #6: ignoring unsecured informational payload NO_PROPOSAL_CHOSEN, length=12
 IMPAIR: "aes128" #6: retransmit so timing out SA (may retry)
 "aes128" #6: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "aes128" #6: revival: skip scheduling revival event
+IMPAIR: "aes128" #6: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "aes128" #6: deleting ISAKMP SA (MAIN_I1) and NOT sending notification
 west #
  ipsec whack --impair none
@@ -127,7 +127,7 @@ IMPAIR: "aes128" #8: sending key-length attribute value 0
 "aes128" #8: sent Quick Mode request
 IMPAIR: "aes128" #8: retransmit so timing out SA (may retry)
 "aes128" #8: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "aes128" #8: revival: skip scheduling revival event
+IMPAIR: "aes128" #8: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "aes128" #8: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  ipsec whack --impair none
@@ -181,7 +181,7 @@ IMPAIR: "aes128" #12: not sending key-length attribute
 "aes128" #12: sent Quick Mode request
 IMPAIR: "aes128" #12: retransmit so timing out SA (may retry)
 "aes128" #12: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "aes128" #12: revival: skip scheduling revival event
+IMPAIR: "aes128" #12: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "aes128" #12: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  ipsec whack --impair none
@@ -239,7 +239,7 @@ IMPAIR: "aes128" #16: key-length-attribute:empty not implemented
 "aes128" #16: sent Quick Mode request
 IMPAIR: "aes128" #16: retransmit so timing out SA (may retry)
 "aes128" #16: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "aes128" #16: revival: skip scheduling revival event
+IMPAIR: "aes128" #16: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "aes128" #16: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  ipsec whack --impair none
@@ -291,7 +291,7 @@ IMPAIR: "3des" #19: sending key-length attribute value 0
 "3des" #19: ignoring unsecured informational payload NO_PROPOSAL_CHOSEN, length=12
 IMPAIR: "3des" #19: retransmit so timing out SA (may retry)
 "3des" #19: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "3des" #19: revival: skip scheduling revival event
+IMPAIR: "3des" #19: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "3des" #19: deleting ISAKMP SA (MAIN_I1) and NOT sending notification
 west #
  ipsec whack --impair none

diff --git a/testing/pluto/impair-09-ikev2-omit-ike-auth-child-responder/west.console.txt b/testing/pluto/impair-09-ikev2-omit-ike-auth-child-responder/west.console.txt
index 7e6803ffc973c522087fcc87ba9781b527a87709..fcd314f95b85520b1229c1bdf2aa0126a953e6ed 100644 (file)
--- a/testing/pluto/impair-09-ikev2-omit-ike-auth-child-responder/west.console.txt
+++ b/testing/pluto/impair-09-ikev2-omit-ike-auth-child-responder/west.console.txt
@@ -26,7 +26,7 @@ west #
 "westnet-eastnet-ipv4-psk-ikev2" #2: IKE_AUTH response missing at least one of the Child SA payloads v2SA, v2TSi and v2TSr
 "westnet-eastnet-ipv4-psk-ikev2" #1: encountered fatal error in state ESTABLISHED_IKE_SA
 "westnet-eastnet-ipv4-psk-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ipv4-psk-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet-ipv4-psk-ikev2" #1: deleting IKE SA (established IKE SA)
 west #
  echo done

diff --git a/testing/pluto/impair-09-protected-ikev1/west.console.txt b/testing/pluto/impair-09-protected-ikev1/west.console.txt
index 4f0c113b04ce18caa67cef9da2dea80c35ef21a6..22e45cb9a990211581ecdf98b01243ee36330449 100644 (file)
--- a/testing/pluto/impair-09-protected-ikev1/west.console.txt
+++ b/testing/pluto/impair-09-protected-ikev1/west.console.txt
@@ -82,7 +82,7 @@ IMPAIR: "westnet-eastnet" #4: omitting HASH payload for outI1
 "westnet-eastnet" #4: sent Quick Mode request
 "westnet-eastnet" #4: STATE_QUICK_I1: 60 second timeout exceeded after 0 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "westnet-eastnet" #4: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet" #4: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet" #4: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet" #4: deleting IPsec SA (QUICK_I1) and NOT sending notification
 ERROR: "westnet-eastnet" #4: netlink response for Del SA esp.ESPSPIi@192.1.2.45: No such process (errno 3)
 west #
@@ -104,7 +104,7 @@ IMPAIR: "westnet-eastnet" #6: sending HASH payload with no data for outI1
 "westnet-eastnet" #6: sent Quick Mode request
 "westnet-eastnet" #6: STATE_QUICK_I1: 60 second timeout exceeded after 0 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "westnet-eastnet" #6: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet" #6: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet" #6: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet" #6: deleting IPsec SA (QUICK_I1) and NOT sending notification
 ERROR: "westnet-eastnet" #6: netlink response for Del SA esp.ESPSPIi@192.1.2.45: No such process (errno 3)
 west #
@@ -126,7 +126,7 @@ IMPAIR: "westnet-eastnet" #8: setting HASH payload bytes to 00
 "westnet-eastnet" #8: sent Quick Mode request
 "westnet-eastnet" #8: STATE_QUICK_I1: 60 second timeout exceeded after 0 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "westnet-eastnet" #8: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet" #8: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet" #8: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "westnet-eastnet" #8: deleting IPsec SA (QUICK_I1) and NOT sending notification
 ERROR: "westnet-eastnet" #8: netlink response for Del SA esp.ESPSPIi@192.1.2.45: No such process (errno 3)
 west #
@@ -401,7 +401,7 @@ west #
 |    length: 278 (01 16)
 "westnet-eastnet" #3: authenticated peer using preloaded certificate '@east' and 2nnn-bit RSA with SHA1 signature
 IMPAIR: "westnet-eastnet" #4: omitting HASH payload for outI1
-IMPAIR: "westnet-eastnet" #4: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet" #4: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 -- start message (ID)
 |    next payload type: ISAKMP_NEXT_ID (0x5)
 | ***parse ISAKMP Signature Payload:
@@ -409,7 +409,7 @@ IMPAIR: "westnet-eastnet" #4: revival: skip scheduling revival event
 |    length: 278 (01 16)
 "westnet-eastnet" #5: authenticated peer using preloaded certificate '@east' and 2nnn-bit RSA with SHA1 signature
 IMPAIR: "westnet-eastnet" #6: sending HASH payload with no data for outI1
-IMPAIR: "westnet-eastnet" #6: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet" #6: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 -- start message (ID)
 |    next payload type: ISAKMP_NEXT_ID (0x5)
 | ***parse ISAKMP Signature Payload:
@@ -417,7 +417,7 @@ IMPAIR: "westnet-eastnet" #6: revival: skip scheduling revival event
 |    length: 278 (01 16)
 "westnet-eastnet" #7: authenticated peer using preloaded certificate '@east' and 2nnn-bit RSA with SHA1 signature
 IMPAIR: "westnet-eastnet" #8: setting HASH payload bytes to 00
-IMPAIR: "westnet-eastnet" #8: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet" #8: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 -- start message (ID)
 |    next payload type: ISAKMP_NEXT_ID (0x5)
 | ***parse ISAKMP Signature Payload:

diff --git a/testing/pluto/impair-14-ike-initiator-spi-0-ikev1/west.console.txt b/testing/pluto/impair-14-ike-initiator-spi-0-ikev1/west.console.txt
index 968b7273df23405ec15b938d3a9254ff864067d1..026b6d5d357aa0a7dba3c633786774fcaafcfadf 100644 (file)
--- a/testing/pluto/impair-14-ike-initiator-spi-0-ikev1/west.console.txt
+++ b/testing/pluto/impair-14-ike-initiator-spi-0-ikev1/west.console.txt
@@ -24,13 +24,13 @@ IMPAIR: "west-east" #1: forcing IKE initiator SPI to 0x0
 "west-east" #1: ignoring unsecured informational payload INVALID_COOKIE, length=12
 IMPAIR: "west-east" #1: retransmit so timing out SA (may retry)
 "west-east" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #1: revival: skip scheduling revival event
+IMPAIR: "west-east" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-east" #1: deleting ISAKMP SA (MAIN_I1) and NOT sending notification
 west #
  grep IMPAIR: /tmp/pluto.log
 IMPAIR: "west-east" #1: forcing IKE initiator SPI to 0x0
 IMPAIR: "west-east" #1: retransmit so timing out SA (may retry)
-IMPAIR: "west-east" #1: revival: skip scheduling revival event
+IMPAIR: "west-east" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  grep '^packet from 192.1.2.45' /tmp/pluto.log
 west #

diff --git a/testing/pluto/impair-14-ike-initiator-spi-0-ikev2/west.console.txt b/testing/pluto/impair-14-ike-initiator-spi-0-ikev2/west.console.txt
index f0e99cff33308194b4b36c150fd353a46828bd65..24bd587d98b5d51d6886ec651b7cd3d3c08ff121 100644 (file)
--- a/testing/pluto/impair-14-ike-initiator-spi-0-ikev2/west.console.txt
+++ b/testing/pluto/impair-14-ike-initiator-spi-0-ikev2/west.console.txt
@@ -23,13 +23,13 @@ IMPAIR: "west-east" #1: forcing IKE initiator SPI to 0x0
 "west-east" #1: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 IMPAIR: "west-east" #1: retransmit so timing out SA (may retry)
 "west-east" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #1: revival: skip scheduling revival event
+IMPAIR: "west-east" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-east" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  grep IMPAIR: /tmp/pluto.log
 IMPAIR: "west-east" #1: forcing IKE initiator SPI to 0x0
 IMPAIR: "west-east" #1: retransmit so timing out SA (may retry)
-IMPAIR: "west-east" #1: revival: skip scheduling revival event
+IMPAIR: "west-east" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  grep '^packet from 192.1.2.45' /tmp/pluto.log
 west #

diff --git a/testing/pluto/impair-14-ike-responder-spi-0-ikev1/west.console.txt b/testing/pluto/impair-14-ike-responder-spi-0-ikev1/west.console.txt
index bba2e3b314a995725e1580b4e6433e2eb482867c..09525ba465344526b5dc2afbaa2fe1a4f31cec5f 100644 (file)
--- a/testing/pluto/impair-14-ike-responder-spi-0-ikev1/west.console.txt
+++ b/testing/pluto/impair-14-ike-responder-spi-0-ikev1/west.console.txt
@@ -21,12 +21,12 @@ west #
 "west-east" #1: discarding initial packet; already STATE_MAIN_I1
 IMPAIR: "west-east" #1: retransmit so timing out SA (may retry)
 "west-east" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #1: revival: skip scheduling revival event
+IMPAIR: "west-east" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-east" #1: deleting ISAKMP SA (MAIN_I1) and NOT sending notification
 west #
  grep IMPAIR: /tmp/pluto.log
 IMPAIR: "west-east" #1: retransmit so timing out SA (may retry)
-IMPAIR: "west-east" #1: revival: skip scheduling revival event
+IMPAIR: "west-east" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  grep '^packet from 192.1.2.45' /tmp/pluto.log
 west #

diff --git a/testing/pluto/impair-14-ike-responder-spi-0-ikev2/west.console.txt b/testing/pluto/impair-14-ike-responder-spi-0-ikev2/west.console.txt
index 55f1f2bc1e50089b96a870e72ff776bfd2c370cd..1595454f03ebf935156dfb5260f61fcbd536d8a8 100644 (file)
--- a/testing/pluto/impair-14-ike-responder-spi-0-ikev2/west.console.txt
+++ b/testing/pluto/impair-14-ike-responder-spi-0-ikev2/west.console.txt
@@ -21,7 +21,7 @@ west #
 "west-east" #1: IKE_SA_INIT response has zero IKE SA Responder SPI; dropping packet
 "west-east" #1: encountered fatal error in state IKE_SA_INIT_I
 "west-east" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #1: revival: skip scheduling revival event
+IMPAIR: "west-east" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-east" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ipsec down west-east
@@ -39,7 +39,7 @@ IMPAIR: "west-east" #2: IKE_SA_INIT response has zero IKE SA Responder SPI; allo
 "west-east" #3: initiator established Child SA using #2; IPsec tunnel [192.0.1.0/24===192.0.2.0/24] {ESP/ESN=>0xESPESP <0xESPESP xfrm=AES_GCM_16_256 DPD=passive}
 west #
  grep IMPAIR: /tmp/pluto.log
-IMPAIR: "west-east" #1: revival: skip scheduling revival event
+IMPAIR: "west-east" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 IMPAIR: "west-east" #2: IKE_SA_INIT response has zero IKE SA Responder SPI; allowing anyway
 west #
  grep '^packet from 192.1.2.45' /tmp/pluto.log

diff --git a/testing/pluto/impair-30-ikev1-ip-as-fqdn/west.console.txt b/testing/pluto/impair-30-ikev1-ip-as-fqdn/west.console.txt
index 6c7e2cdab5b19e766766d032b578fbe9ce3c1300..ad797bcb4886e68c616d3813f8eaa4c0dad1cc35 100644 (file)
--- a/testing/pluto/impair-30-ikev1-ip-as-fqdn/west.console.txt
+++ b/testing/pluto/impair-30-ikev1-ip-as-fqdn/west.console.txt
@@ -28,7 +28,7 @@ west #
 "west" #2: sent Quick Mode request
 "west" #2: STATE_QUICK_I1: 60 second timeout exceeded after 7 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "west" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west" #2: revival: skip scheduling revival event
+IMPAIR: "west" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 ERROR: "west" #2: netlink response for Del SA esp.ESPSPIi@192.1.2.45: No such process (errno 3)
 west #

diff --git a/testing/pluto/impair-31-ikev1-quick-id/west.console.txt b/testing/pluto/impair-31-ikev1-quick-id/west.console.txt
index cb516e5198db5ae823ebba63c7ec95d5e9365164..c049f0a0583242ad3cd1a325fd1fffc8791569ce 100644 (file)
--- a/testing/pluto/impair-31-ikev1-quick-id/west.console.txt
+++ b/testing/pluto/impair-31-ikev1-quick-id/west.console.txt
@@ -32,7 +32,7 @@ IMPAIR: "west" #2: skipping Quick Mode client responder ID (IDcr)
 "west" #2: sent Quick Mode request
 IMPAIR: "west" #2: retransmit so timing out SA (may retry)
 "west" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west" #2: revival: skip scheduling revival event
+IMPAIR: "west" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  ipsec whack --impair v1_emit_quick_id:1
@@ -43,7 +43,7 @@ IMPAIR: "west" #3: skipping Quick Mode client responder ID (IDcr)
 "west" #3: sent Quick Mode request
 IMPAIR: "west" #3: retransmit so timing out SA (may retry)
 "west" #3: connection is supposed to remain up; revival attempt 2 scheduled in 5 seconds
-IMPAIR: "west" #3: revival: skip scheduling revival event
+IMPAIR: "west" #3: revival: skip scheduling CONNECTION_REVIVAL event in 5 seconds
 "west" #3: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  ipsec whack --impair v1_emit_quick_id:3
@@ -54,7 +54,7 @@ IMPAIR: "west" #4: adding bonus Quick Mode client ID
 "west" #4: sent Quick Mode request
 IMPAIR: "west" #4: retransmit so timing out SA (may retry)
 "west" #4: connection is supposed to remain up; revival attempt 3 scheduled in 10 seconds
-IMPAIR: "west" #4: revival: skip scheduling revival event
+IMPAIR: "west" #4: revival: skip scheduling CONNECTION_REVIVAL event in 10 seconds
 "west" #4: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/impair-install-ipsec-sa-inbound-policy-initiator-ikev1/west.console.txt b/testing/pluto/impair-install-ipsec-sa-inbound-policy-initiator-ikev1/west.console.txt
index 5974ddead07b3ca7117f56db22a10b84787dfadb..36379928a1b089f364c7cf2e022590f37cfcb824 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-inbound-policy-initiator-ikev1/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-inbound-policy-initiator-ikev1/west.console.txt
@@ -48,7 +48,7 @@ west #
 IMPAIR: "west-east" #2: kernel: install_ipsec_sa_inbound_policy in install_inbound_ipsec_kernel_policies()
 "west-east" #2: state transition failed: failed
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-east" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 ERROR: "west-east" #2: netlink response for Del SA esp.ESPSPIi@192.1.2.23: No such process (errno 3)
 west #
@@ -68,7 +68,7 @@ west #
 down
 west #
  ../../guestbin/wait-for-pluto.sh 'IMPAIR: .* #3: revival'
-IMPAIR: "west-east" #3: revival: skip scheduling revival event
+IMPAIR: "west-east" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec _kernel state
 src 192.0.1.254 dst 192.0.2.254

diff --git a/testing/pluto/impair-install-ipsec-sa-inbound-policy-initiator-ikev2/west.console.txt b/testing/pluto/impair-install-ipsec-sa-inbound-policy-initiator-ikev2/west.console.txt
index 061f656ad9ef834ac64af337889686d32789f0b5..eb91886905df6e6c023788bd743e974232daeb8c 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-inbound-policy-initiator-ikev2/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-inbound-policy-initiator-ikev2/west.console.txt
@@ -48,7 +48,7 @@ IMPAIR: "west-east" #2: kernel: install_ipsec_sa_inbound_policy in install_inbou
 "west-east" #1: IKE SA established but initiator rejected Child SA response
 "west-east" #2: sent INFORMATIONAL request to delete larval Child SA using IKE SA #1
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 ERROR: "west-east" #2: netlink response for Del SA esp.ESPSPIi@192.1.2.23: No such process (errno 3)
 west #
  # expect the on-demand kernel policy
@@ -67,7 +67,7 @@ west #
 down
 west #
  ../../guestbin/wait-for-pluto.sh 'IMPAIR: .* #3: revival'
-IMPAIR: "west-east" #3: revival: skip scheduling revival event
+IMPAIR: "west-east" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec _kernel state
 src 192.0.1.254 dst 192.0.2.254

diff --git a/testing/pluto/impair-install-ipsec-sa-inbound-policy-responder-ikev1/west.console.txt b/testing/pluto/impair-install-ipsec-sa-inbound-policy-responder-ikev1/west.console.txt
index b047702c7c357c684f4271bd6d9e535f11db6a26..7d874948f26dd53bbdc8de1347828b472a269766 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-inbound-policy-responder-ikev1/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-inbound-policy-responder-ikev1/west.console.txt
@@ -45,7 +45,7 @@ west #
 "west-east" #2: sent Quick Mode request
 "west-east" #2: STATE_QUICK_I1: 60 second timeout exceeded after 0 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-east" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 ERROR: "west-east" #2: netlink response for Del SA esp.ESPSPIi@192.1.2.45: No such process (errno 3)
 west #
@@ -671,7 +671,7 @@ output: | revival: skip update_remote_port(), not an instance
 output: "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
 output: | string logger: newref @0x7f18d5449fc8(0->1) (schedule_connection_event() +44 programs/pluto/connection_event.c)
 output: | "west-east": addref @0x7f18d5ea1a78(4->5) event CONNECTION_REVIVAL for "west-east":  (schedule_connection_event() +49 programs/pluto/connection_event.c)
-IMPAIR: output: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: output: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 output: | spd_owner() looking for SPD owner of 192.0.1.0/24===192.0.2.0/24 with routing >= ROUTED_ONDEMAND[ONDEMAND]
 output: | FOR_EACH_SPD_ROUTE[remote_client_range=192.0.2.0/24]... in (routed_negotiation_to_routed_ondemand() +911 programs/pluto/routing.c)
 output: |   found "west-east" 192.0.1.0/24===192.0.2.0/24

diff --git a/testing/pluto/impair-install-ipsec-sa-inbound-policy-responder-ikev2/west.console.txt b/testing/pluto/impair-install-ipsec-sa-inbound-policy-responder-ikev2/west.console.txt
index 2d18a9210c034597a531d2661a11a7a7b69c42e3..cc3a797be05290e661f8e40ae704b298438a9201 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-inbound-policy-responder-ikev2/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-inbound-policy-responder-ikev2/west.console.txt
@@ -45,7 +45,7 @@ west #
 "west-east" #1: IKE SA established but initiator rejected Child SA response
 "west-east" #2: sent INFORMATIONAL request to delete larval Child SA using IKE SA #1
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  # expect the on-demand kernel policy
 west #
@@ -63,7 +63,7 @@ west #
 down
 west #
  ../../guestbin/wait-for-pluto.sh 'IMPAIR: .* #3: revival'
-IMPAIR: "west-east" #3: revival: skip scheduling revival event
+IMPAIR: "west-east" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec _kernel state
 src 192.0.1.254 dst 192.0.2.254

diff --git a/testing/pluto/impair-install-ipsec-sa-inbound-state-initiator-ikev1/west.console.txt b/testing/pluto/impair-install-ipsec-sa-inbound-state-initiator-ikev1/west.console.txt
index 9cb34fecc2ab592ca0c86ea35aca7f4d509d1deb..f061e0822e4f2a113949eed859de90df3a705de8 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-inbound-state-initiator-ikev1/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-inbound-state-initiator-ikev1/west.console.txt
@@ -48,7 +48,7 @@ west #
 IMPAIR: "west-east" #2: kernel: install_ipsec_sa_inbound_state in setup_half_kernel_state()
 "west-east" #2: state transition failed: failed
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 ERROR: "west-east" #2: kernel: xfrm XFRM_MSG_DELPOLICY delete response for flow (in): No such file or directory (errno 2)
 "west-east" #2: kernel: replace_ipsec_with_bare_kernel_policy() inbound delete failed
 "west-east" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
@@ -71,7 +71,7 @@ west #
 down
 west #
  ../../guestbin/wait-for-pluto.sh 'IMPAIR: .* #3: revival'
-IMPAIR: "west-east" #3: revival: skip scheduling revival event
+IMPAIR: "west-east" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec _kernel state
 src 192.0.1.254 dst 192.0.2.254

diff --git a/testing/pluto/impair-install-ipsec-sa-inbound-state-initiator-ikev2/west.console.txt b/testing/pluto/impair-install-ipsec-sa-inbound-state-initiator-ikev2/west.console.txt
index 0ce068ab2d996ac5c10651f76996ea510dafa7d0..2b47bfe40f8cd40e35ccce2fa89224d07575e5ae 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-inbound-state-initiator-ikev2/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-inbound-state-initiator-ikev2/west.console.txt
@@ -48,7 +48,7 @@ IMPAIR: "west-east" #2: kernel: install_ipsec_sa_inbound_state in setup_half_ker
 "west-east" #1: IKE SA established but initiator rejected Child SA response
 "west-east" #2: sent INFORMATIONAL request to delete larval Child SA using IKE SA #1
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 ERROR: "west-east" #2: kernel: xfrm XFRM_MSG_DELPOLICY delete response for flow (in): No such file or directory (errno 2)
 "west-east" #2: kernel: replace_ipsec_with_bare_kernel_policy() inbound delete failed
 ERROR: "west-east" #2: netlink response for Del SA esp.ESPSPIi@192.1.2.23: No such process (errno 3)
@@ -70,7 +70,7 @@ west #
 down
 west #
  ../../guestbin/wait-for-pluto.sh 'IMPAIR: .* #3: revival'
-IMPAIR: "west-east" #3: revival: skip scheduling revival event
+IMPAIR: "west-east" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec _kernel state
 src 192.0.1.254 dst 192.0.2.254

diff --git a/testing/pluto/impair-install-ipsec-sa-inbound-state-responder-ikev1/west.console.txt b/testing/pluto/impair-install-ipsec-sa-inbound-state-responder-ikev1/west.console.txt
index 33b5b7e2d9fa35d5508d067da5bb11fc69e8e7ee..2870bef2124f2059fbee61291ef042f866f39185 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-inbound-state-responder-ikev1/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-inbound-state-responder-ikev1/west.console.txt
@@ -45,7 +45,7 @@ west #
 "west-east" #2: sent Quick Mode request
 "west-east" #2: STATE_QUICK_I1: 60 second timeout exceeded after 0 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-east" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 ERROR: "west-east" #2: netlink response for Del SA esp.ESPSPIi@192.1.2.45: No such process (errno 3)
 west #
@@ -671,7 +671,7 @@ output: | revival: skip update_remote_port(), not an instance
 output: "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
 output: | string logger: newref @0x7ff4d060efc8(0->1) (schedule_connection_event() +44 programs/pluto/connection_event.c)
 output: | "west-east": addref @0x7ff4d1066a78(4->5) event CONNECTION_REVIVAL for "west-east":  (schedule_connection_event() +49 programs/pluto/connection_event.c)
-IMPAIR: output: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: output: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 output: | spd_owner() looking for SPD owner of 192.0.1.0/24===192.0.2.0/24 with routing >= ROUTED_ONDEMAND[ONDEMAND]
 output: | FOR_EACH_SPD_ROUTE[remote_client_range=192.0.2.0/24]... in (routed_negotiation_to_routed_ondemand() +911 programs/pluto/routing.c)
 output: |   found "west-east" 192.0.1.0/24===192.0.2.0/24

diff --git a/testing/pluto/impair-install-ipsec-sa-inbound-state-responder-ikev2/west.console.txt b/testing/pluto/impair-install-ipsec-sa-inbound-state-responder-ikev2/west.console.txt
index 2d18a9210c034597a531d2661a11a7a7b69c42e3..cc3a797be05290e661f8e40ae704b298438a9201 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-inbound-state-responder-ikev2/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-inbound-state-responder-ikev2/west.console.txt
@@ -45,7 +45,7 @@ west #
 "west-east" #1: IKE SA established but initiator rejected Child SA response
 "west-east" #2: sent INFORMATIONAL request to delete larval Child SA using IKE SA #1
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  # expect the on-demand kernel policy
 west #
@@ -63,7 +63,7 @@ west #
 down
 west #
  ../../guestbin/wait-for-pluto.sh 'IMPAIR: .* #3: revival'
-IMPAIR: "west-east" #3: revival: skip scheduling revival event
+IMPAIR: "west-east" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec _kernel state
 src 192.0.1.254 dst 192.0.2.254

diff --git a/testing/pluto/impair-install-ipsec-sa-outbound-policy-initiator-ikev1/west.console.txt b/testing/pluto/impair-install-ipsec-sa-outbound-policy-initiator-ikev1/west.console.txt
index c5230e4c763edde9420c46ab8f007aa01a7377b5..55fda65a2f2d4d5a66a52ffa796ea6ff20b98a7c 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-outbound-policy-initiator-ikev1/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-outbound-policy-initiator-ikev1/west.console.txt
@@ -48,7 +48,7 @@ west #
 IMPAIR: "west-east" #2: kernel: install_ipsec_sa_outbound_policy in install_outbound_ipsec_kernel_policies()
 "west-east" #2: state transition failed: failed
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-east" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  # expect the on-demand kernel policy
@@ -67,7 +67,7 @@ west #
 down
 west #
  ../../guestbin/wait-for-pluto.sh 'IMPAIR: .* #3: revival'
-IMPAIR: "west-east" #3: revival: skip scheduling revival event
+IMPAIR: "west-east" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec _kernel state
 src 192.0.1.254 dst 192.0.2.254

diff --git a/testing/pluto/impair-install-ipsec-sa-outbound-policy-initiator-ikev2/west.console.txt b/testing/pluto/impair-install-ipsec-sa-outbound-policy-initiator-ikev2/west.console.txt
index 548570616e1321fe2d85c4c8cae853aa97f70cb8..1772095110e85f39e71d2af133c536cc47ff308b 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-outbound-policy-initiator-ikev2/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-outbound-policy-initiator-ikev2/west.console.txt
@@ -48,7 +48,7 @@ IMPAIR: "west-east" #2: kernel: install_ipsec_sa_outbound_policy in install_outb
 "west-east" #1: IKE SA established but initiator rejected Child SA response
 "west-east" #2: sent INFORMATIONAL request to delete larval Child SA using IKE SA #1
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  # expect the on-demand kernel policy
 west #
@@ -66,7 +66,7 @@ west #
 down
 west #
  ../../guestbin/wait-for-pluto.sh 'IMPAIR: .* #3: revival'
-IMPAIR: "west-east" #3: revival: skip scheduling revival event
+IMPAIR: "west-east" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec _kernel state
 src 192.0.1.254 dst 192.0.2.254

diff --git a/testing/pluto/impair-install-ipsec-sa-outbound-policy-responder-ikev2/west.console.txt b/testing/pluto/impair-install-ipsec-sa-outbound-policy-responder-ikev2/west.console.txt
index 2d18a9210c034597a531d2661a11a7a7b69c42e3..cc3a797be05290e661f8e40ae704b298438a9201 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-outbound-policy-responder-ikev2/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-outbound-policy-responder-ikev2/west.console.txt
@@ -45,7 +45,7 @@ west #
 "west-east" #1: IKE SA established but initiator rejected Child SA response
 "west-east" #2: sent INFORMATIONAL request to delete larval Child SA using IKE SA #1
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  # expect the on-demand kernel policy
 west #
@@ -63,7 +63,7 @@ west #
 down
 west #
  ../../guestbin/wait-for-pluto.sh 'IMPAIR: .* #3: revival'
-IMPAIR: "west-east" #3: revival: skip scheduling revival event
+IMPAIR: "west-east" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec _kernel state
 src 192.0.1.254 dst 192.0.2.254

diff --git a/testing/pluto/impair-install-ipsec-sa-outbound-state-initiator-ikev1/west.console.txt b/testing/pluto/impair-install-ipsec-sa-outbound-state-initiator-ikev1/west.console.txt
index fef9f7b25ea2bd5edc9a4ce2b2417d4cd33b57f0..fac4da3d5f6724764ef6b8775ecd1f27964a3dfa 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-outbound-state-initiator-ikev1/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-outbound-state-initiator-ikev1/west.console.txt
@@ -48,7 +48,7 @@ west #
 IMPAIR: "west-east" #2: kernel: install_ipsec_sa_outbound_state in setup_half_kernel_state()
 "west-east" #2: state transition failed: failed
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-east" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 ERROR: "west-east" #2: netlink response for Del SA esp.ESPSPIi@192.1.2.23: No such process (errno 3)
 west #
@@ -68,7 +68,7 @@ west #
 down
 west #
  ../../guestbin/wait-for-pluto.sh 'IMPAIR: .* #3: revival'
-IMPAIR: "west-east" #3: revival: skip scheduling revival event
+IMPAIR: "west-east" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec _kernel state
 src 192.0.1.254 dst 192.0.2.254

diff --git a/testing/pluto/impair-install-ipsec-sa-outbound-state-initiator-ikev2/west.console.txt b/testing/pluto/impair-install-ipsec-sa-outbound-state-initiator-ikev2/west.console.txt
index c45aecada4fc01fdfbb10fd73275c98f149ff820..4c93317406b73982d6fd9b5b01684899ee3d7f57 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-outbound-state-initiator-ikev2/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-outbound-state-initiator-ikev2/west.console.txt
@@ -48,7 +48,7 @@ IMPAIR: "west-east" #2: kernel: install_ipsec_sa_outbound_state in setup_half_ke
 "west-east" #1: IKE SA established but initiator rejected Child SA response
 "west-east" #2: sent INFORMATIONAL request to delete larval Child SA using IKE SA #1
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 ERROR: "west-east" #2: netlink response for Del SA esp.ESPSPIi@192.1.2.23: No such process (errno 3)
 west #
  # expect the on-demand kernel policy
@@ -67,7 +67,7 @@ west #
 down
 west #
  ../../guestbin/wait-for-pluto.sh 'IMPAIR: .* #3: revival'
-IMPAIR: "west-east" #3: revival: skip scheduling revival event
+IMPAIR: "west-east" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec _kernel state
 src 192.0.1.254 dst 192.0.2.254

diff --git a/testing/pluto/impair-install-ipsec-sa-outbound-state-responder-ikev2/west.console.txt b/testing/pluto/impair-install-ipsec-sa-outbound-state-responder-ikev2/west.console.txt
index 2d18a9210c034597a531d2661a11a7a7b69c42e3..cc3a797be05290e661f8e40ae704b298438a9201 100644 (file)
--- a/testing/pluto/impair-install-ipsec-sa-outbound-state-responder-ikev2/west.console.txt
+++ b/testing/pluto/impair-install-ipsec-sa-outbound-state-responder-ikev2/west.console.txt
@@ -45,7 +45,7 @@ west #
 "west-east" #1: IKE SA established but initiator rejected Child SA response
 "west-east" #2: sent INFORMATIONAL request to delete larval Child SA using IKE SA #1
 "west-east" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-east" #2: revival: skip scheduling revival event
+IMPAIR: "west-east" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  # expect the on-demand kernel policy
 west #
@@ -63,7 +63,7 @@ west #
 down
 west #
  ../../guestbin/wait-for-pluto.sh 'IMPAIR: .* #3: revival'
-IMPAIR: "west-east" #3: revival: skip scheduling revival event
+IMPAIR: "west-east" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec _kernel state
 src 192.0.1.254 dst 192.0.2.254

diff --git a/testing/pluto/interop-ikev2-strongswan-21-transport-02/west.console.txt b/testing/pluto/interop-ikev2-strongswan-21-transport-02/west.console.txt
index 48e894e0e7582ef059f9790f3755b2d75bfce6ea..db1ba8c89d666080065630f19abf62f8ce0c23fa 100644 (file)
--- a/testing/pluto/interop-ikev2-strongswan-21-transport-02/west.console.txt
+++ b/testing/pluto/interop-ikev2-strongswan-21-transport-02/west.console.txt
@@ -32,7 +32,7 @@ west #
 "westnet-eastnet-ikev2" #1: response for Child SA #2 was rejected with NO_PROPOSAL_CHOSEN; initiating delete of Child SA (IKE SA will remain UP)
 "westnet-eastnet-ikev2" #2: sent INFORMATIONAL request to delete larval Child SA using IKE SA #1
 "westnet-eastnet-ikev2" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling revival event
+IMPAIR: "westnet-eastnet-ikev2" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 ERROR: "westnet-eastnet-ikev2" #2: netlink response for Get SA esp.ESPSPIi@192.1.2.23: No such process (errno 3)
 ERROR: "westnet-eastnet-ikev2" #2: netlink response for Del SA esp.ESPSPIi@192.1.2.23: No such process (errno 3)
 west #

diff --git a/testing/pluto/linux-audit-02-ike-fail-ikev1/west.console.txt b/testing/pluto/linux-audit-02-ike-fail-ikev1/west.console.txt
index b334a61aa11cf09853f26bd4a1ff5a241786140b..b06ab5c0458ae83bd329dea74f37961d99ab591e 100644 (file)
--- a/testing/pluto/linux-audit-02-ike-fail-ikev1/west.console.txt
+++ b/testing/pluto/linux-audit-02-ike-fail-ikev1/west.console.txt
@@ -35,7 +35,7 @@ west #
 "ikev1-failtest" #1: ignoring unsecured informational payload NO_PROPOSAL_CHOSEN, length=12
 "ikev1-failtest" #1: STATE_MAIN_I1: 2 second timeout exceeded after 2 retransmits.  No response (or no acceptable response) to our first IKEv1 message
 "ikev1-failtest" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ikev1-failtest" #1: revival: skip scheduling revival event
+IMPAIR: "ikev1-failtest" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "ikev1-failtest" #1: deleting ISAKMP SA (MAIN_I1) and NOT sending notification
 west #
  ipsec auto --delete ikev1-failtest
@@ -47,7 +47,7 @@ west #
 "ikev1-aggr-failtest" #2: authentication failed: using RSA with SHA1 for '@east-v1' tried preloaded: *000000000
 "ikev1-aggr-failtest" #2: sending notification INVALID_KEY_INFORMATION to 192.1.2.23:500
 "ikev1-aggr-failtest" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ikev1-aggr-failtest" #2: revival: skip scheduling revival event
+IMPAIR: "ikev1-aggr-failtest" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "ikev1-aggr-failtest" #2: deleting ISAKMP SA (AGGR_I1) and NOT sending notification
 west #
  ipsec auto --delete ikev1-aggr-failtest

diff --git a/testing/pluto/linux-audit-02-ike-fail-ikev2/west.console.txt b/testing/pluto/linux-audit-02-ike-fail-ikev2/west.console.txt
index c19aa15305b9a0c8705f198be87dc18dc812d9c9..5dc28311324e5a041b104df45ba39d8310fe04eb 100644 (file)
--- a/testing/pluto/linux-audit-02-ike-fail-ikev2/west.console.txt
+++ b/testing/pluto/linux-audit-02-ike-fail-ikev2/west.console.txt
@@ -34,7 +34,7 @@ west #
 "ikev2-failtest" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "ikev2-failtest" #1: encountered fatal error in state IKE_AUTH_I
 "ikev2-failtest" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ikev2-failtest" #2: revival: skip scheduling revival event
+IMPAIR: "ikev2-failtest" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "ikev2-failtest" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  ipsec auto --delete ikev2-failtest

diff --git a/testing/pluto/linux-audit-03-ipsec-fail-ikev1/west.console.txt b/testing/pluto/linux-audit-03-ipsec-fail-ikev1/west.console.txt
index 372b0f84c7277c1d036aed88a3cb19f9a2d7690d..494cdf0001bdb6c6db63b1b2a536b211073cb514 100644 (file)
--- a/testing/pluto/linux-audit-03-ipsec-fail-ikev1/west.console.txt
+++ b/testing/pluto/linux-audit-03-ipsec-fail-ikev1/west.console.txt
@@ -39,7 +39,7 @@ west #
 "ikev1-ipsec-fail" #2: STATE_QUICK_I1: retransmission; will wait 1 second for response
 "ikev1-ipsec-fail" #2: STATE_QUICK_I1: 2 second timeout exceeded after 2 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "ikev1-ipsec-fail" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ikev1-ipsec-fail" #2: revival: skip scheduling revival event
+IMPAIR: "ikev1-ipsec-fail" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "ikev1-ipsec-fail" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  ipsec auto --delete ikev1-ipsec-fail
@@ -58,7 +58,7 @@ west #
 "ikev1-aggr-ipsec-fail" #4: STATE_QUICK_I1: retransmission; will wait 1 second for response
 "ikev1-aggr-ipsec-fail" #4: STATE_QUICK_I1: 2 second timeout exceeded after 2 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "ikev1-aggr-ipsec-fail" #4: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ikev1-aggr-ipsec-fail" #4: revival: skip scheduling revival event
+IMPAIR: "ikev1-aggr-ipsec-fail" #4: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "ikev1-aggr-ipsec-fail" #4: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  ipsec auto --delete ikev1-aggr-ipsec-fail

diff --git a/testing/pluto/linux-audit-03-ipsec-fail-ikev2/west.console.txt b/testing/pluto/linux-audit-03-ipsec-fail-ikev2/west.console.txt
index fd3c77b2126c3fbbf6cdf34968e50eb053812fe8..f329e9c17d7a177034f8a59a3bc577c5d055aaa2 100644 (file)
--- a/testing/pluto/linux-audit-03-ipsec-fail-ikev2/west.console.txt
+++ b/testing/pluto/linux-audit-03-ipsec-fail-ikev2/west.console.txt
@@ -31,7 +31,7 @@ west #
 "ikev2-ipsec-fail" #1: initiator established IKE SA; authenticated peer using preloaded certificate '@east-v2' and 2nnn-bit RSASSA-PSS with SHA2_512 digital signature
 "ikev2-ipsec-fail" #2: IKE_AUTH response rejected Child SA with TS_UNACCEPTABLE
 "ikev2-ipsec-fail" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "ikev2-ipsec-fail" #2: revival: skip scheduling revival event
+IMPAIR: "ikev2-ipsec-fail" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec auto --delete ikev2-ipsec-fail
 "ikev2-ipsec-fail": terminating SAs using this connection

diff --git a/testing/pluto/nss-cert-ocsp-02-revoked-ikev1/west.console.txt b/testing/pluto/nss-cert-ocsp-02-revoked-ikev1/west.console.txt
index 2a7b694a96218baf4910794c016aa12f2d310a46..61d496fa2cf7339cf893b3aa6cd7c1d020fbe9ff 100644 (file)
--- a/testing/pluto/nss-cert-ocsp-02-revoked-ikev1/west.console.txt
+++ b/testing/pluto/nss-cert-ocsp-02-revoked-ikev1/west.console.txt
@@ -73,7 +73,7 @@ west #
 "nss-cert-ocsp" #1: ignoring secured informational payload INVALID_ID_INFORMATION, msgid=MSGID, length=12
 IMPAIR: "nss-cert-ocsp" #1: retransmit so timing out SA (may retry)
 "nss-cert-ocsp" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert-ocsp" #1: revival: skip scheduling revival event
+IMPAIR: "nss-cert-ocsp" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert-ocsp" #1: deleting ISAKMP SA (MAIN_I3) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/nss-cert-ocsp-02-revoked-ikev2/west.console.txt b/testing/pluto/nss-cert-ocsp-02-revoked-ikev2/west.console.txt
index c5fb4927647f285d9b83ff7647aa70995e1a89be..78334b7db66d5e0e471065385b330164002f446c 100644 (file)
--- a/testing/pluto/nss-cert-ocsp-02-revoked-ikev2/west.console.txt
+++ b/testing/pluto/nss-cert-ocsp-02-revoked-ikev2/west.console.txt
@@ -72,7 +72,7 @@ west #
 "nss-cert-ocsp" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "nss-cert-ocsp" #1: encountered fatal error in state IKE_AUTH_I
 "nss-cert-ocsp" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert-ocsp" #2: revival: skip scheduling revival event
+IMPAIR: "nss-cert-ocsp" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert-ocsp" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo done

diff --git a/testing/pluto/nss-cert-ocsp-07-nic-no-ocsp-ikev1/west.console.txt b/testing/pluto/nss-cert-ocsp-07-nic-no-ocsp-ikev1/west.console.txt
index 1ea498f7df1d4a542dc823cf13287fb4459c95e9..12bbe8c7a15676c4733935084700685fec3276a7 100644 (file)
--- a/testing/pluto/nss-cert-ocsp-07-nic-no-ocsp-ikev1/west.console.txt
+++ b/testing/pluto/nss-cert-ocsp-07-nic-no-ocsp-ikev1/west.console.txt
@@ -73,7 +73,7 @@ west #
 "nss-cert-ocsp" #1: ignoring secured informational payload INVALID_ID_INFORMATION, msgid=MSGID, length=12
 IMPAIR: "nss-cert-ocsp" #1: retransmit so timing out SA (may retry)
 "nss-cert-ocsp" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert-ocsp" #1: revival: skip scheduling revival event
+IMPAIR: "nss-cert-ocsp" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert-ocsp" #1: deleting ISAKMP SA (MAIN_I3) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/nss-cert-ocsp-07-nic-no-ocsp-ikev2/west.console.txt b/testing/pluto/nss-cert-ocsp-07-nic-no-ocsp-ikev2/west.console.txt
index 1f9f2bffc8ecfd7d02d4447961da8c415cacffe6..8a698e0c0d643a5ebd917c5f8fc1da1dcba683cd 100644 (file)
--- a/testing/pluto/nss-cert-ocsp-07-nic-no-ocsp-ikev2/west.console.txt
+++ b/testing/pluto/nss-cert-ocsp-07-nic-no-ocsp-ikev2/west.console.txt
@@ -72,7 +72,7 @@ west #
 "nss-cert-ocsp" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "nss-cert-ocsp" #1: encountered fatal error in state IKE_AUTH_I
 "nss-cert-ocsp" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert-ocsp" #2: revival: skip scheduling revival event
+IMPAIR: "nss-cert-ocsp" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert-ocsp" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo done

diff --git a/testing/pluto/nss-cert-ocsp-08-post-ikev1/west.console.txt b/testing/pluto/nss-cert-ocsp-08-post-ikev1/west.console.txt
index 1ea498f7df1d4a542dc823cf13287fb4459c95e9..12bbe8c7a15676c4733935084700685fec3276a7 100644 (file)
--- a/testing/pluto/nss-cert-ocsp-08-post-ikev1/west.console.txt
+++ b/testing/pluto/nss-cert-ocsp-08-post-ikev1/west.console.txt
@@ -73,7 +73,7 @@ west #
 "nss-cert-ocsp" #1: ignoring secured informational payload INVALID_ID_INFORMATION, msgid=MSGID, length=12
 IMPAIR: "nss-cert-ocsp" #1: retransmit so timing out SA (may retry)
 "nss-cert-ocsp" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert-ocsp" #1: revival: skip scheduling revival event
+IMPAIR: "nss-cert-ocsp" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert-ocsp" #1: deleting ISAKMP SA (MAIN_I3) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/whack-delete-01-child-1then2-ikev2/west.console.txt b/testing/pluto/whack-delete-01-child-1then2-ikev2/west.console.txt
index e9b9fe0034d763d644ca3008d1061253f3b4b09f..31a6a8f290c883588b53b7f7b8d1adf6eae2eac6 100644 (file)
--- a/testing/pluto/whack-delete-01-child-1then2-ikev2/west.console.txt
+++ b/testing/pluto/whack-delete-01-child-1then2-ikev2/west.console.txt
@@ -50,7 +50,7 @@ west #
 "west-cuckold" #1: deleting IKE SA (ESTABLISHED_IKE_SA) and sending notification
 "west-cuckold" #2: ESP traffic information: in=84B out=84B
 "west-cuckoo" #3: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-cuckoo" #3: revival: skip scheduling revival event
+IMPAIR: "west-cuckoo" #3: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-cuckoo" #3: ESP traffic information: in=84B out=84B
 west #
  ipsec delete west-cuckoo

diff --git a/testing/pluto/whack-delete-03-up-revival-ikev1/west.console.txt b/testing/pluto/whack-delete-03-up-revival-ikev1/west.console.txt
index 399bf2ab092cc7c4a9f1587578f3d7d00cae167c..64e13583b1cd997a1bfa47532239b499754a586c 100644 (file)
--- a/testing/pluto/whack-delete-03-up-revival-ikev1/west.console.txt
+++ b/testing/pluto/whack-delete-03-up-revival-ikev1/west.console.txt
@@ -23,7 +23,7 @@ west #
 "west" #1: sent Main Mode request
 IMPAIR: "west" #1: retransmit so timing out SA (may retry)
 "west" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west" #1: revival: skip scheduling revival event
+IMPAIR: "west" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #1: deleting ISAKMP SA (MAIN_I1) and NOT sending notification
 west #
  ipsec delete west

diff --git a/testing/pluto/whack-delete-03-up-revival-ikev2/west.console.txt b/testing/pluto/whack-delete-03-up-revival-ikev2/west.console.txt
index 5a53b750def8fbec5450cb5fb38da710b87800a3..5fb1469a4735c6cc1d7ed27b576091eb7352a62c 100644 (file)
--- a/testing/pluto/whack-delete-03-up-revival-ikev2/west.console.txt
+++ b/testing/pluto/whack-delete-03-up-revival-ikev2/west.console.txt
@@ -23,7 +23,7 @@ west #
 "west" #1: sent IKE_SA_INIT request to 192.1.2.23:UDP/500
 IMPAIR: "west" #1: retransmit so timing out SA (may retry)
 "west" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west" #1: revival: skip scheduling revival event
+IMPAIR: "west" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #1: deleting IKE SA (sent IKE_SA_INIT request)
 west #
  ipsec delete west

diff --git a/testing/pluto/whack-down-03-child-1then2then0-ikev1/west.console.txt b/testing/pluto/whack-down-03-child-1then2then0-ikev1/west.console.txt
index 7bfa116d6823c418080f607c6df54d18a92c3f4e..0011c884f23a9395b30860cc273e53c2c3bce1d7 100644 (file)
--- a/testing/pluto/whack-down-03-child-1then2then0-ikev1/west.console.txt
+++ b/testing/pluto/whack-down-03-child-1then2then0-ikev1/west.console.txt
@@ -35,7 +35,7 @@ west #
 "west-cuckold" #2: sent Quick Mode request
 "west-cuckold" #2: STATE_QUICK_I1: 5 second timeout exceeded after 4 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "west-cuckold" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-cuckold" #2: revival: skip scheduling revival event
+IMPAIR: "west-cuckold" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-cuckold" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  ipsec up west-cuckoo-1

diff --git a/testing/pluto/whack-down-03-child-1then2then0-ikev2/west.console.txt b/testing/pluto/whack-down-03-child-1then2then0-ikev2/west.console.txt
index 17e16828e917e8572bd2a5612698fda0361dcc4e..1944df075b255873f93a24f77b1340469ed1849f 100644 (file)
--- a/testing/pluto/whack-down-03-child-1then2then0-ikev2/west.console.txt
+++ b/testing/pluto/whack-down-03-child-1then2then0-ikev2/west.console.txt
@@ -33,7 +33,7 @@ west #
 "west-cuckold" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "west-cuckold" #2: IKE_AUTH response rejected Child SA with TS_UNACCEPTABLE
 "west-cuckold" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-cuckold" #2: revival: skip scheduling revival event
+IMPAIR: "west-cuckold" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec up west-cuckoo-1
 "west-cuckoo-1" #3: initiating Child SA using IKE SA #1

diff --git a/testing/pluto/whack-down-04-child-0then1then2-ikev1/west.console.txt b/testing/pluto/whack-down-04-child-0then1then2-ikev1/west.console.txt
index 9f5a23a78383266a374a0f2356048e2110162d94..5444edf57851eed25b444b0e2120aeb6f849ef64 100644 (file)
--- a/testing/pluto/whack-down-04-child-0then1then2-ikev1/west.console.txt
+++ b/testing/pluto/whack-down-04-child-0then1then2-ikev1/west.console.txt
@@ -35,7 +35,7 @@ west #
 "west-cuckold" #2: sent Quick Mode request
 "west-cuckold" #2: STATE_QUICK_I1: 5 second timeout exceeded after 4 retransmits.  No acceptable response to our first Quick Mode message: perhaps peer likes no proposal
 "west-cuckold" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-cuckold" #2: revival: skip scheduling revival event
+IMPAIR: "west-cuckold" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-cuckold" #2: deleting IPsec SA (QUICK_I1) and NOT sending notification
 west #
  ipsec up west-cuckoo-1

diff --git a/testing/pluto/whack-down-04-child-0then1then2-ikev2/west.console.txt b/testing/pluto/whack-down-04-child-0then1then2-ikev2/west.console.txt
index ad265b02ed91871faf7b327d408f29dbe1539e6f..64664c52e97181bd5a0680f657c0a82d84260f6e 100644 (file)
--- a/testing/pluto/whack-down-04-child-0then1then2-ikev2/west.console.txt
+++ b/testing/pluto/whack-down-04-child-0then1then2-ikev2/west.console.txt
@@ -33,7 +33,7 @@ west #
 "west-cuckold" #1: initiator established IKE SA; authenticated peer using authby=secret and FQDN '@east'
 "west-cuckold" #2: IKE_AUTH response rejected Child SA with TS_UNACCEPTABLE
 "west-cuckold" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-cuckold" #2: revival: skip scheduling revival event
+IMPAIR: "west-cuckold" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 west #
  ipsec up west-cuckoo-1
 "west-cuckoo-1" #3: initiating Child SA using IKE SA #1

diff --git a/testing/pluto/x509-cert-08-expired-initiator-ikev1/west.console.txt b/testing/pluto/x509-cert-08-expired-initiator-ikev1/west.console.txt
index b56847f2348589d148a77f89b2a478878ad1b79f..9a5356f4ee3fb5fa69550b123ad22f06755c5bd6 100644 (file)
--- a/testing/pluto/x509-cert-08-expired-initiator-ikev1/west.console.txt
+++ b/testing/pluto/x509-cert-08-expired-initiator-ikev1/west.console.txt
@@ -65,7 +65,7 @@ west #
 "west" #1: ignoring secured informational payload INVALID_ID_INFORMATION, msgid=MSGID, length=12
 "west" #1: STATE_MAIN_I3: 60 second timeout exceeded after 0 retransmits.  Possible authentication failure: no acceptable response to our first encrypted message
 "west" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west" #1: revival: skip scheduling revival event
+IMPAIR: "west" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #1: deleting ISAKMP SA (MAIN_I3) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/x509-cert-08-expired-initiator-ikev2/west.console.txt b/testing/pluto/x509-cert-08-expired-initiator-ikev2/west.console.txt
index a2fe7920d10d74d7c663cde5118b58a5bd9b5497..5fe0715b181e4256ad26fab2be830bcda9f39465 100644 (file)
--- a/testing/pluto/x509-cert-08-expired-initiator-ikev2/west.console.txt
+++ b/testing/pluto/x509-cert-08-expired-initiator-ikev2/west.console.txt
@@ -63,7 +63,7 @@ west #
 "west" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "west" #1: encountered fatal error in state IKE_AUTH_I
 "west" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west" #2: revival: skip scheduling revival event
+IMPAIR: "west" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo done

diff --git a/testing/pluto/x509-cert-08-expired-responder-ikev1/west.console.txt b/testing/pluto/x509-cert-08-expired-responder-ikev1/west.console.txt
index a2344a23bb4c1c1706f91593b71c0a732deb80e1..7f5904f314a195d86915450f4490ac22055dfca9 100644 (file)
--- a/testing/pluto/x509-cert-08-expired-responder-ikev1/west.console.txt
+++ b/testing/pluto/x509-cert-08-expired-responder-ikev1/west.console.txt
@@ -41,7 +41,7 @@ west #
 "west" #1: sending encrypted notification INVALID_ID_INFORMATION to 192.1.2.23:500
 "west" #1: STATE_MAIN_I3: 60 second timeout exceeded after 0 retransmits.  Possible authentication failure: no acceptable response to our first encrypted message
 "west" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west" #1: revival: skip scheduling revival event
+IMPAIR: "west" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #1: deleting ISAKMP SA (MAIN_I3) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/x509-cert-08-expired-responder-ikev2/west.console.txt b/testing/pluto/x509-cert-08-expired-responder-ikev2/west.console.txt
index abf49d56647090dac4877861995385ce9efbd269..39d129145754c81edd69ec7aff7e366ec752758c 100644 (file)
--- a/testing/pluto/x509-cert-08-expired-responder-ikev2/west.console.txt
+++ b/testing/pluto/x509-cert-08-expired-responder-ikev2/west.console.txt
@@ -38,7 +38,7 @@ west #
 "west" #1: X509: certificate payload rejected for this connection
 "west" #1: encountered fatal error in state IKE_AUTH_I
 "west" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west" #2: revival: skip scheduling revival event
+IMPAIR: "west" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo done

diff --git a/testing/pluto/x509-cert-09-notyetvalid-initiator-ikev1/west.console.txt b/testing/pluto/x509-cert-09-notyetvalid-initiator-ikev1/west.console.txt
index 0826c19a39f599b8f5449ae60d2be01ffd0a26c4..7f3d8bf52603a9cb3fc6515b5ccd5f86cdd63525 100644 (file)
--- a/testing/pluto/x509-cert-09-notyetvalid-initiator-ikev1/west.console.txt
+++ b/testing/pluto/x509-cert-09-notyetvalid-initiator-ikev1/west.console.txt
@@ -60,7 +60,7 @@ west #
 "nss-cert" #1: ignoring secured informational payload INVALID_ID_INFORMATION, msgid=MSGID, length=12
 "nss-cert" #1: STATE_MAIN_I3: 60 second timeout exceeded after 0 retransmits.  Possible authentication failure: no acceptable response to our first encrypted message
 "nss-cert" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert" #1: revival: skip scheduling revival event
+IMPAIR: "nss-cert" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert" #1: deleting ISAKMP SA (MAIN_I3) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/x509-cert-09-notyetvalid-initiator-ikev2/west.console.txt b/testing/pluto/x509-cert-09-notyetvalid-initiator-ikev2/west.console.txt
index 5f1385fc2529452715a04c72a47bbdbc829f39cd..213ea560d01a790b632b92858af746234c0736af 100644 (file)
--- a/testing/pluto/x509-cert-09-notyetvalid-initiator-ikev2/west.console.txt
+++ b/testing/pluto/x509-cert-09-notyetvalid-initiator-ikev2/west.console.txt
@@ -58,7 +58,7 @@ west #
 "nss-cert" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "nss-cert" #1: encountered fatal error in state IKE_AUTH_I
 "nss-cert" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert" #2: revival: skip scheduling revival event
+IMPAIR: "nss-cert" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo done

diff --git a/testing/pluto/x509-cert-09-notyetvalid-responder-ikev1/west.console.txt b/testing/pluto/x509-cert-09-notyetvalid-responder-ikev1/west.console.txt
index a1d865bc8c4955d63f891f072c3561951e0faf49..4d3c634d67f4a392fb6311db0f20d0c650ab6565 100644 (file)
--- a/testing/pluto/x509-cert-09-notyetvalid-responder-ikev1/west.console.txt
+++ b/testing/pluto/x509-cert-09-notyetvalid-responder-ikev1/west.console.txt
@@ -39,7 +39,7 @@ west #
 "nss-cert" #1: sending encrypted notification INVALID_ID_INFORMATION to 192.1.2.23:500
 "nss-cert" #1: STATE_MAIN_I3: 60 second timeout exceeded after 0 retransmits.  Possible authentication failure: no acceptable response to our first encrypted message
 "nss-cert" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert" #1: revival: skip scheduling revival event
+IMPAIR: "nss-cert" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert" #1: deleting ISAKMP SA (MAIN_I3) and NOT sending notification
 west #
  echo done

diff --git a/testing/pluto/x509-cert-09-notyetvalid-responder-ikev2/west.console.txt b/testing/pluto/x509-cert-09-notyetvalid-responder-ikev2/west.console.txt
index 88511dafdf8e9e418f210261e33c75e0ad012ea6..3729dd319093450485c68895c349c08ce8c6b51d 100644 (file)
--- a/testing/pluto/x509-cert-09-notyetvalid-responder-ikev2/west.console.txt
+++ b/testing/pluto/x509-cert-09-notyetvalid-responder-ikev2/west.console.txt
@@ -36,7 +36,7 @@ west #
 "nss-cert" #1: X509: certificate payload rejected for this connection
 "nss-cert" #1: encountered fatal error in state IKE_AUTH_I
 "nss-cert" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert" #2: revival: skip scheduling revival event
+IMPAIR: "nss-cert" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  echo done

diff --git a/testing/pluto/x509-crl-02-old-crl-strict-no-ikev1/west.console.txt b/testing/pluto/x509-crl-02-old-crl-strict-no-ikev1/west.console.txt
index b5f21c4774ba7e9f115f8be5f07993a502c599f0..343c275690d4c0d3ec653d1923424b15d0d72b1c 100644 (file)
--- a/testing/pluto/x509-crl-02-old-crl-strict-no-ikev1/west.console.txt
+++ b/testing/pluto/x509-crl-02-old-crl-strict-no-ikev1/west.console.txt
@@ -58,7 +58,7 @@ west #
 "nss-cert-crl" #1: sending encrypted notification INVALID_ID_INFORMATION to 192.1.2.23:500
 "nss-cert-crl" #1: STATE_MAIN_I3: 15 second timeout exceeded after 0 retransmits.  Possible authentication failure: no acceptable response to our first encrypted message
 "nss-cert-crl" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert-crl" #1: revival: skip scheduling revival event
+IMPAIR: "nss-cert-crl" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert-crl" #1: deleting ISAKMP SA (MAIN_I3) and NOT sending notification
 west #
  # check there's a pending CRL; fetch it and confirm it has cleared
@@ -103,7 +103,7 @@ IMPAIR: "nss-cert-crl": dispatch REVIVAL; attempt 1 next in 5s; timeout IKE SA
 "nss-cert-crl" #2: sending encrypted notification INVALID_ID_INFORMATION to 192.1.2.23:500
 "nss-cert-crl" #2: STATE_MAIN_I3: 15 second timeout exceeded after 0 retransmits.  Possible authentication failure: no acceptable response to our first encrypted message
 "nss-cert-crl" #2: connection is supposed to remain up; revival attempt 2 scheduled in 5 seconds
-IMPAIR: "nss-cert-crl" #2: revival: skip scheduling revival event
+IMPAIR: "nss-cert-crl" #2: revival: skip scheduling CONNECTION_REVIVAL event in 5 seconds
 "nss-cert-crl" #2: deleting ISAKMP SA (MAIN_I3) and NOT sending notification
 west #
  test -r /tmp/pluto.log && grep -e '^[^|].*ERROR' /tmp/pluto.log

diff --git a/testing/pluto/x509-crl-02-old-crl-strict-no-ikev2/west.console.txt b/testing/pluto/x509-crl-02-old-crl-strict-no-ikev2/west.console.txt
index 4c385b6237a104b93494ac62c00d728da3652b7d..babb7ab9d0446e5fbfdabe333c784595b606f28a 100644 (file)
--- a/testing/pluto/x509-crl-02-old-crl-strict-no-ikev2/west.console.txt
+++ b/testing/pluto/x509-crl-02-old-crl-strict-no-ikev2/west.console.txt
@@ -55,7 +55,7 @@ west #
 "nss-cert-crl" #1: X509: certificate payload rejected for this connection
 "nss-cert-crl" #1: encountered fatal error in state IKE_AUTH_I
 "nss-cert-crl" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert-crl" #2: revival: skip scheduling revival event
+IMPAIR: "nss-cert-crl" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert-crl" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  # check there's a pending CRL; fetch it and confirm it has cleared
@@ -97,7 +97,7 @@ IMPAIR: "nss-cert-crl": dispatch REVIVAL; attempt 1 next in 5s; delete Child SA
 "nss-cert-crl" #3: X509: certificate payload rejected for this connection
 "nss-cert-crl" #3: encountered fatal error in state IKE_AUTH_I
 "nss-cert-crl" #4: connection is supposed to remain up; revival attempt 2 scheduled in 5 seconds
-IMPAIR: "nss-cert-crl" #4: revival: skip scheduling revival event
+IMPAIR: "nss-cert-crl" #4: revival: skip scheduling CONNECTION_REVIVAL event in 5 seconds
 "nss-cert-crl" #3: deleting IKE SA (sent IKE_AUTH request)
 west #
  test -r /tmp/pluto.log && grep -e '^[^|].*ERROR' /tmp/pluto.log

diff --git a/testing/pluto/x509-crl-02-old-crl-strict-yes-ikev1/west.console.txt b/testing/pluto/x509-crl-02-old-crl-strict-yes-ikev1/west.console.txt
index ee32df2f0c8340cb3c5a05aff0269e066ab9b7ae..4c024f818199ed061772173949fa4f137c17849d 100644 (file)
--- a/testing/pluto/x509-crl-02-old-crl-strict-yes-ikev1/west.console.txt
+++ b/testing/pluto/x509-crl-02-old-crl-strict-yes-ikev1/west.console.txt
@@ -59,7 +59,7 @@ IMPAIR: "nss-cert-crl" #1: not initiating FETCH_CRL
 "nss-cert-crl" #1: sending encrypted notification INVALID_ID_INFORMATION to 192.1.2.23:500
 "nss-cert-crl" #1: STATE_MAIN_I3: 15 second timeout exceeded after 0 retransmits.  Possible authentication failure: no acceptable response to our first encrypted message
 "nss-cert-crl" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert-crl" #1: revival: skip scheduling revival event
+IMPAIR: "nss-cert-crl" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert-crl" #1: deleting ISAKMP SA (MAIN_I3) and NOT sending notification
 west #
  # check there's a pending CRL; fetch it and confirm it has cleared
@@ -110,7 +110,7 @@ IMPAIR: "nss-cert-crl": dispatch REVIVAL; attempt 1 next in 5s; timeout IKE SA
 "nss-cert-crl" #2: sending encrypted notification INVALID_ID_INFORMATION to 192.1.2.23:500
 "nss-cert-crl" #2: STATE_MAIN_I3: 15 second timeout exceeded after 0 retransmits.  Possible authentication failure: no acceptable response to our first encrypted message
 "nss-cert-crl" #2: connection is supposed to remain up; revival attempt 2 scheduled in 5 seconds
-IMPAIR: "nss-cert-crl" #2: revival: skip scheduling revival event
+IMPAIR: "nss-cert-crl" #2: revival: skip scheduling CONNECTION_REVIVAL event in 5 seconds
 "nss-cert-crl" #2: deleting ISAKMP SA (MAIN_I3) and NOT sending notification
 west #
  test -r /tmp/pluto.log && grep -e '^[^|].*ERROR' /tmp/pluto.log

diff --git a/testing/pluto/x509-crl-02-old-crl-strict-yes-ikev2-manual/west.console.txt b/testing/pluto/x509-crl-02-old-crl-strict-yes-ikev2-manual/west.console.txt
index 7e5179e48a8c0b7e14253fe67df28ffbe992a845..4ad523bd3628af14f05456d3cc139b71de9291b1 100644 (file)
--- a/testing/pluto/x509-crl-02-old-crl-strict-yes-ikev2-manual/west.console.txt
+++ b/testing/pluto/x509-crl-02-old-crl-strict-yes-ikev2-manual/west.console.txt
@@ -51,7 +51,7 @@ warning: "nss-cert-crl" #1: automatic update of Certificate Revocation List (CRL
 "nss-cert-crl" #1: X509: certificate payload rejected for this connection
 "nss-cert-crl" #1: encountered fatal error in state IKE_AUTH_I
 "nss-cert-crl" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert-crl" #2: revival: skip scheduling revival event
+IMPAIR: "nss-cert-crl" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert-crl" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  # should be no pending CRL fetches; force an update

diff --git a/testing/pluto/x509-crl-02-old-crl-strict-yes-ikev2/west.console.txt b/testing/pluto/x509-crl-02-old-crl-strict-yes-ikev2/west.console.txt
index f402daa948563b173ef3a523b915ceccec740a24..846cd1db80a809c8c9ccb7d5c147baa04df2e7ab 100644 (file)
--- a/testing/pluto/x509-crl-02-old-crl-strict-yes-ikev2/west.console.txt
+++ b/testing/pluto/x509-crl-02-old-crl-strict-yes-ikev2/west.console.txt
@@ -56,7 +56,7 @@ IMPAIR: "nss-cert-crl" #1: not initiating FETCH_CRL
 "nss-cert-crl" #1: X509: certificate payload rejected for this connection
 "nss-cert-crl" #1: encountered fatal error in state IKE_AUTH_I
 "nss-cert-crl" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "nss-cert-crl" #2: revival: skip scheduling revival event
+IMPAIR: "nss-cert-crl" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "nss-cert-crl" #1: deleting IKE SA (sent IKE_AUTH request)
 west #
  # check there's a pending CRL; fetch it and confirm it has cleared
@@ -104,7 +104,7 @@ IMPAIR: "nss-cert-crl": dispatch REVIVAL; attempt 1 next in 5s; delete Child SA
 "nss-cert-crl" #3: X509: certificate payload rejected for this connection
 "nss-cert-crl" #3: encountered fatal error in state IKE_AUTH_I
 "nss-cert-crl" #4: connection is supposed to remain up; revival attempt 2 scheduled in 5 seconds
-IMPAIR: "nss-cert-crl" #4: revival: skip scheduling revival event
+IMPAIR: "nss-cert-crl" #4: revival: skip scheduling CONNECTION_REVIVAL event in 5 seconds
 "nss-cert-crl" #3: deleting IKE SA (sent IKE_AUTH request)
 west #
  test -r /tmp/pluto.log && grep -e '^[^|].*ERROR' /tmp/pluto.log

diff --git a/testing/pluto/x509-pluto-frag-03/road.console.txt b/testing/pluto/x509-pluto-frag-03/road.console.txt
index 3b6e87cd2066d41c5c6b5c94f722712cc72a0c64..1c83f0618bae038de7bee3bbc617c06d7266e6c4 100644 (file)
--- a/testing/pluto/x509-pluto-frag-03/road.console.txt
+++ b/testing/pluto/x509-pluto-frag-03/road.console.txt
@@ -35,7 +35,7 @@ road #
 "x509" #1: sent Main Mode I3
 IMPAIR: "x509" #1: retransmit so timing out SA (may retry)
 "x509" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "x509" #1: revival: skip scheduling revival event
+IMPAIR: "x509" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "x509" #1: deleting ISAKMP SA (MAIN_I3) and NOT sending notification
 road #
  echo done

diff --git a/testing/pluto/x509-profile-01-key-usage/west.console.txt b/testing/pluto/x509-profile-01-key-usage/west.console.txt
index d8da8560138180124582d0da104fe5dcc2adaa7b..b4f87c72204ec5c47409f834ebd95d038581e41d 100644 (file)
--- a/testing/pluto/x509-profile-01-key-usage/west.console.txt
+++ b/testing/pluto/x509-profile-01-key-usage/west.console.txt
@@ -223,7 +223,7 @@ Redirecting to: [initsystem]
 "west-ku-certSigning" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "west-ku-certSigning" #1: encountered fatal error in state IKE_AUTH_I
 "west-ku-certSigning" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-ku-certSigning" #2: revival: skip scheduling revival event
+IMPAIR: "west-ku-certSigning" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-ku-certSigning" #1: deleting IKE SA (sent IKE_AUTH request)
  ipsec stop
 Redirecting to: [initsystem]

diff --git a/testing/pluto/x509-profile-02-extended-key-usage/west.console.txt b/testing/pluto/x509-profile-02-extended-key-usage/west.console.txt
index 4d79682ab67ded1d4c217cd662087fb6c3603dac..daae8b8fc915d28d4d4479732601aedbbfa7d117 100644 (file)
--- a/testing/pluto/x509-profile-02-extended-key-usage/west.console.txt
+++ b/testing/pluto/x509-profile-02-extended-key-usage/west.console.txt
@@ -578,7 +578,7 @@ Redirecting to: [initsystem]
 "west-eku-codeSigning" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "west-eku-codeSigning" #1: encountered fatal error in state IKE_AUTH_I
 "west-eku-codeSigning" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-eku-codeSigning" #2: revival: skip scheduling revival event
+IMPAIR: "west-eku-codeSigning" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-eku-codeSigning" #1: deleting IKE SA (sent IKE_AUTH request)
  ipsec stop
 Redirecting to: [initsystem]

diff --git a/testing/pluto/x509-profile-03-basic-constraints-ca/west.console.txt b/testing/pluto/x509-profile-03-basic-constraints-ca/west.console.txt
index 596b65cd23345ebdbb76e718c98af07a92dd0561..1fa972062f849167b19c0b801b4d816f18228419 100644 (file)
--- a/testing/pluto/x509-profile-03-basic-constraints-ca/west.console.txt
+++ b/testing/pluto/x509-profile-03-basic-constraints-ca/west.console.txt
@@ -86,7 +86,7 @@ begin #
 "west-bc-missing-chain-end" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "west-bc-missing-chain-end" #1: encountered fatal error in state IKE_AUTH_I
 "west-bc-missing-chain-end" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-bc-missing-chain-end" #2: revival: skip scheduling revival event
+IMPAIR: "west-bc-missing-chain-end" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-bc-missing-chain-end" #1: deleting IKE SA (sent IKE_AUTH request)
 end #
 begin #
@@ -215,7 +215,7 @@ begin #
 "bc-n-ca-west" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "bc-n-ca-west" #1: encountered fatal error in state IKE_AUTH_I
 "bc-n-ca-west" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "bc-n-ca-west" #2: revival: skip scheduling revival event
+IMPAIR: "bc-n-ca-west" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "bc-n-ca-west" #1: deleting IKE SA (sent IKE_AUTH request)
 end #
 begin #

diff --git a/testing/pluto/x509-profile-03-basic-constraints-end/west.console.txt b/testing/pluto/x509-profile-03-basic-constraints-end/west.console.txt
index 24ebab9a734caed13f4b185ea7c831305f297445..8438632f0c7b336a2ddd3a370a3198050bce7cda 100644 (file)
--- a/testing/pluto/x509-profile-03-basic-constraints-end/west.console.txt
+++ b/testing/pluto/x509-profile-03-basic-constraints-end/west.console.txt
@@ -232,7 +232,7 @@ Redirecting to: [initsystem]
 "west-bc-ca-y" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "west-bc-ca-y" #1: encountered fatal error in state IKE_AUTH_I
 "west-bc-ca-y" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-bc-ca-y" #2: revival: skip scheduling revival event
+IMPAIR: "west-bc-ca-y" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-bc-ca-y" #1: deleting IKE SA (sent IKE_AUTH request)
  ipsec stop
 Redirecting to: [initsystem]
@@ -291,7 +291,7 @@ Redirecting to: [initsystem]
 "west-bc-ca-y-critical" #1: IKE SA authentication request rejected by peer: AUTHENTICATION_FAILED
 "west-bc-ca-y-critical" #1: encountered fatal error in state IKE_AUTH_I
 "west-bc-ca-y-critical" #2: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "west-bc-ca-y-critical" #2: revival: skip scheduling revival event
+IMPAIR: "west-bc-ca-y-critical" #2: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 "west-bc-ca-y-critical" #1: deleting IKE SA (sent IKE_AUTH request)
  ipsec stop
 Redirecting to: [initsystem]

diff --git a/testing/pluto/xauth-pluto-20-pam-timeout/road.console.txt b/testing/pluto/xauth-pluto-20-pam-timeout/road.console.txt
index 72cd2d7f2bfb174342c534695c1e77cc5934f429..ab6c6a0a466700a9f19604903d3a1eaa573d0128 100644 (file)
--- a/testing/pluto/xauth-pluto-20-pam-timeout/road.console.txt
+++ b/testing/pluto/xauth-pluto-20-pam-timeout/road.console.txt
@@ -40,7 +40,7 @@ road #
 "xauth-road-eastnet" #1: encountered fatal error in state STATE_XAUTH_I1
 "xauth-road-eastnet" #1: deleting ISAKMP SA (XAUTH_I1) and sending notification
 "xauth-road-eastnet" #1: connection is supposed to remain up; revival attempt 1 scheduled in 0 seconds
-IMPAIR: "xauth-road-eastnet" #1: revival: skip scheduling revival event
+IMPAIR: "xauth-road-eastnet" #1: revival: skip scheduling CONNECTION_REVIVAL event in 0 seconds
 road #
  # next one should succeed and ping pass throguh
 road #