Renamed default config to -v4

diff --git a/src/conftest/suiteb/1.3.1/test.conf b/src/conftest/suiteb/1.3.1/test.conf
index ba564ed28000d39846655d3e1160caa2c06c847e..22ee6681b1bf8a3d7fee6adf2d1cb56e91e127b7 100644 (file)
--- a/src/conftest/suiteb/1.3.1/test.conf
+++ b/src/conftest/suiteb/1.3.1/test.conf
@@ -9,6 +9,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/1.3.2/test.conf b/src/conftest/suiteb/1.3.2/test.conf
index 61ef326c7df33d747add2aac05747abfa486e3a8..e31e28587663a1db0550bdbfa8654d5a7bd804ea 100644 (file)
--- a/src/conftest/suiteb/1.3.2/test.conf
+++ b/src/conftest/suiteb/1.3.2/test.conf
@@ -9,10 +9,10 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
        rekey_child {
-               config = child-default
+               config = child-v4
                delay = 1
        }
 }

diff --git a/src/conftest/suiteb/1.4.1/test.conf b/src/conftest/suiteb/1.4.1/test.conf
index 269a858688501e035170722e9b11228e3c73b090..15b950f9b73bf73b39daf21f8f36fc6f1be0ad5c 100644 (file)
--- a/src/conftest/suiteb/1.4.1/test.conf
+++ b/src/conftest/suiteb/1.4.1/test.conf
@@ -10,10 +10,10 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
        liveness {
-               config = ike-default
+               config = ike-v4
                delay = 1
        }
 }

diff --git a/src/conftest/suiteb/1.5.1/test.conf b/src/conftest/suiteb/1.5.1/test.conf
index ad929375b12a387a2dcd98307e7c40d52aebca79..9bd1e5240370a0ff68a21a8062e04b830f186dc1 100644 (file)
--- a/src/conftest/suiteb/1.5.1/test.conf
+++ b/src/conftest/suiteb/1.5.1/test.conf
@@ -8,6 +8,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/1.6.1/dut.conf b/src/conftest/suiteb/1.6.1/dut.conf
index 3fe9ce2029d990d7a63725b91ef8c40ba85b6675..ac39c85aacf4be0fce74fb7d02d5c1fda54336b4 100644 (file)
--- a/src/conftest/suiteb/1.6.1/dut.conf
+++ b/src/conftest/suiteb/1.6.1/dut.conf
@@ -1,7 +1,7 @@
 
 actions {
        rekey_child {
-               config = child-default
+               config = child-v4
                delay = 10
        }
 }

diff --git a/src/conftest/suiteb/1.6.1/test.conf b/src/conftest/suiteb/1.6.1/test.conf
index 05a2b40c4edda26408b8d5808bb640f1897fc573..271c8a460c3f7795583906f42cdfe15050455f25 100644 (file)
--- a/src/conftest/suiteb/1.6.1/test.conf
+++ b/src/conftest/suiteb/1.6.1/test.conf
@@ -9,6 +9,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/1.7.1/dut.conf b/src/conftest/suiteb/1.7.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/1.7.1/dut.conf
+++ b/src/conftest/suiteb/1.7.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/1.7.1/test.conf b/src/conftest/suiteb/1.7.1/test.conf
index 9650f904839b6c7de0b6a1d4fc5cd96ddefddc6c..3182c851da77e5c7bcca6dd6dee7a54026237328 100644 (file)
--- a/src/conftest/suiteb/1.7.1/test.conf
+++ b/src/conftest/suiteb/1.7.1/test.conf
@@ -9,7 +9,7 @@ hooks {
 
 actions {
        liveness {
-               config = ike-default
+               config = ike-v4
                delay = 5
        }
 }

diff --git a/src/conftest/suiteb/1.7.2/dut.conf b/src/conftest/suiteb/1.7.2/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/1.7.2/dut.conf
+++ b/src/conftest/suiteb/1.7.2/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/1.7.2/test.conf b/src/conftest/suiteb/1.7.2/test.conf
index 93c605fb17a94b3eeed7fefaf5bd9fc948be67ee..cde62026eba91e4c9f7aed2b3f239c5cdd3e35e0 100644 (file)
--- a/src/conftest/suiteb/1.7.2/test.conf
+++ b/src/conftest/suiteb/1.7.2/test.conf
@@ -9,7 +9,7 @@ hooks {
 
 actions {
        liveness {
-               config = ike-default
+               config = ike-v4
                delay = 5
        }
 }

diff --git a/src/conftest/suiteb/1.8.1/dut.conf b/src/conftest/suiteb/1.8.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/1.8.1/dut.conf
+++ b/src/conftest/suiteb/1.8.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/1.9.1/test.conf b/src/conftest/suiteb/1.9.1/test.conf
index c6c29e07b641fe0855b00eb52f84b1e1b15185f9..0719b452c3fdb88b21083757c6cbc66b631b53ab 100644 (file)
--- a/src/conftest/suiteb/1.9.1/test.conf
+++ b/src/conftest/suiteb/1.9.1/test.conf
@@ -9,6 +9,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/1.9.2/test.conf b/src/conftest/suiteb/1.9.2/test.conf
index 45d5c515288b5a95c68c63645b9b4bbac400dd98..03fb7f406216126491696a8e6078f3808637d1dc 100644 (file)
--- a/src/conftest/suiteb/1.9.2/test.conf
+++ b/src/conftest/suiteb/1.9.2/test.conf
@@ -9,6 +9,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/12.1.1/dut.conf b/src/conftest/suiteb/12.1.1/dut.conf
index b80b58e46b7ae62c7cfab1f6c3093d41910c83da..7637a39cecea10a073d0e42889b8199e425f240f 100644 (file)
--- a/src/conftest/suiteb/12.1.1/dut.conf
+++ b/src/conftest/suiteb/12.1.1/dut.conf
@@ -1,10 +1,10 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
        rekey_child {
-               config = child-default
+               config = child-v4
                delay = 5
        }
 }

diff --git a/src/conftest/suiteb/19.2.1/test.conf b/src/conftest/suiteb/19.2.1/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/19.2.1/test.conf
+++ b/src/conftest/suiteb/19.2.1/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/19.3.1/test.conf b/src/conftest/suiteb/19.3.1/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/19.3.1/test.conf
+++ b/src/conftest/suiteb/19.3.1/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/19.7.1/test.conf b/src/conftest/suiteb/19.7.1/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/19.7.1/test.conf
+++ b/src/conftest/suiteb/19.7.1/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/19.8.1/test.conf b/src/conftest/suiteb/19.8.1/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/19.8.1/test.conf
+++ b/src/conftest/suiteb/19.8.1/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/19.9.1/test.conf b/src/conftest/suiteb/19.9.1/test.conf
index 5f239a8bc6573845ec3d766c5ec0ff0c21f80f4b..5c6748203b53d59b1d12e52d40a81f2fb2206c09 100644 (file)
--- a/src/conftest/suiteb/19.9.1/test.conf
+++ b/src/conftest/suiteb/19.9.1/test.conf
@@ -7,6 +7,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/2.1.1/test.conf b/src/conftest/suiteb/2.1.1/test.conf
index 7c2d6e6b3295fb23bc7ce9bbde123b63dff2d324..5f99ffc04391857388371062ba78eb6cff3bc6f3 100644 (file)
--- a/src/conftest/suiteb/2.1.1/test.conf
+++ b/src/conftest/suiteb/2.1.1/test.conf
@@ -11,6 +11,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/2.2.1/test.conf b/src/conftest/suiteb/2.2.1/test.conf
index ff2a4c19301293c7a37cec581794ca4ffdae729a..440ece74e5eda149a045c47f170a19cb70c3814a 100644 (file)
--- a/src/conftest/suiteb/2.2.1/test.conf
+++ b/src/conftest/suiteb/2.2.1/test.conf
@@ -11,6 +11,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/2.2.2/test.conf b/src/conftest/suiteb/2.2.2/test.conf
index 0106fb7e260d88b58ef29ee80de7e2cd9c6436db..979249aefa6e1c2d8a9402ff2a9cc887cf2fb00a 100644 (file)
--- a/src/conftest/suiteb/2.2.2/test.conf
+++ b/src/conftest/suiteb/2.2.2/test.conf
@@ -11,10 +11,10 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
        rekey_child {
-               config = child-default
+               config = child-v4
                delay = 2
        }
 }

diff --git a/src/conftest/suiteb/2.3.1/test.conf b/src/conftest/suiteb/2.3.1/test.conf
index 7c2d6e6b3295fb23bc7ce9bbde123b63dff2d324..5f99ffc04391857388371062ba78eb6cff3bc6f3 100644 (file)
--- a/src/conftest/suiteb/2.3.1/test.conf
+++ b/src/conftest/suiteb/2.3.1/test.conf
@@ -11,6 +11,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/2.3.2/test.conf b/src/conftest/suiteb/2.3.2/test.conf
index aa00e1028e43a951e8cf45f4615d77fdd7ea2b56..ed8aa253740a1ed5733519be01750949455c58df 100644 (file)
--- a/src/conftest/suiteb/2.3.2/test.conf
+++ b/src/conftest/suiteb/2.3.2/test.conf
@@ -11,10 +11,10 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
        rekey_child {
-               config = child-default
+               config = child-v4
                delay = 2
        }
 }

diff --git a/src/conftest/suiteb/2.4.1/test.conf b/src/conftest/suiteb/2.4.1/test.conf
index 2740fddb3e0af9967c87885805cd55a2d0bc3163..a757940c2fef1a071d523538531b7a170aff2772 100644 (file)
--- a/src/conftest/suiteb/2.4.1/test.conf
+++ b/src/conftest/suiteb/2.4.1/test.conf
@@ -1,14 +1,14 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
        rekey_child {
-               config = child-default
+               config = child-v4
                delay = 5
        }
        rekey_ike {
-               config = child-default
+               config = child-v4
                delay = 10
        }
 }

diff --git a/src/conftest/suiteb/2.5.1/test.conf b/src/conftest/suiteb/2.5.1/test.conf
index d6ec9eda95363ec9d8837760475f4591f5e61162..ea80ef57ae3417ec509d410d28e7929e8ab7dfd7 100644 (file)
--- a/src/conftest/suiteb/2.5.1/test.conf
+++ b/src/conftest/suiteb/2.5.1/test.conf
@@ -9,10 +9,10 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
        rekey_child {
-               config = child-default
+               config = child-v4
                delay = 2
        }
 }

diff --git a/src/conftest/suiteb/2.6.1/test.conf b/src/conftest/suiteb/2.6.1/test.conf
index ff2a4c19301293c7a37cec581794ca4ffdae729a..440ece74e5eda149a045c47f170a19cb70c3814a 100644 (file)
--- a/src/conftest/suiteb/2.6.1/test.conf
+++ b/src/conftest/suiteb/2.6.1/test.conf
@@ -11,6 +11,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/2.6.2/test.conf b/src/conftest/suiteb/2.6.2/test.conf
index 064ba13e9db01d207197d3fb0ace302be632ad54..85517d59d299d0d4bf0d95d158d4c9e86c7c29c5 100644 (file)
--- a/src/conftest/suiteb/2.6.2/test.conf
+++ b/src/conftest/suiteb/2.6.2/test.conf
@@ -11,6 +11,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/20.3.1/test.conf b/src/conftest/suiteb/20.3.1/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/20.3.1/test.conf
+++ b/src/conftest/suiteb/20.3.1/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/20.4.1/test.conf b/src/conftest/suiteb/20.4.1/test.conf
index 8288be5061fa43dfc22453c6da25af1b3379deb8..00717581908c5c1b053fadd37c9d16c3f327f019 100644 (file)
--- a/src/conftest/suiteb/20.4.1/test.conf
+++ b/src/conftest/suiteb/20.4.1/test.conf
@@ -12,6 +12,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/20.6.1/test.conf b/src/conftest/suiteb/20.6.1/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/20.6.1/test.conf
+++ b/src/conftest/suiteb/20.6.1/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/20.7.1/test.conf b/src/conftest/suiteb/20.7.1/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/20.7.1/test.conf
+++ b/src/conftest/suiteb/20.7.1/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/21.1.1/test.conf b/src/conftest/suiteb/21.1.1/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/21.1.1/test.conf
+++ b/src/conftest/suiteb/21.1.1/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.1.1/test.conf b/src/conftest/suiteb/3.1.1/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.1.1/test.conf
+++ b/src/conftest/suiteb/3.1.1/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.1.2/dut.conf b/src/conftest/suiteb/3.1.2/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.1.2/dut.conf
+++ b/src/conftest/suiteb/3.1.2/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.11.1/dut.conf b/src/conftest/suiteb/3.11.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.11.1/dut.conf
+++ b/src/conftest/suiteb/3.11.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.12.2/dut.conf b/src/conftest/suiteb/3.12.2/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.12.2/dut.conf
+++ b/src/conftest/suiteb/3.12.2/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.13.1/dut.conf b/src/conftest/suiteb/3.13.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.13.1/dut.conf
+++ b/src/conftest/suiteb/3.13.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.13.2/dut.conf b/src/conftest/suiteb/3.13.2/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.13.2/dut.conf
+++ b/src/conftest/suiteb/3.13.2/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.14.1/dut.conf b/src/conftest/suiteb/3.14.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.14.1/dut.conf
+++ b/src/conftest/suiteb/3.14.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.14.2/dut.conf b/src/conftest/suiteb/3.14.2/dut.conf
index e59e0d33961c7a0be0ca02c3f2a9dae75e63d68d..45666ede9e9cdf6b3722353b409c729274649cbc 100644 (file)
--- a/src/conftest/suiteb/3.14.2/dut.conf
+++ b/src/conftest/suiteb/3.14.2/dut.conf
@@ -6,6 +6,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.15.1/test.conf b/src/conftest/suiteb/3.15.1/test.conf
index 112faa40f8b450e471e9eaa126354fa459820e9d..2505f63ca1e10eb7eead6f2aeeb0091bab5f0cfb 100644 (file)
--- a/src/conftest/suiteb/3.15.1/test.conf
+++ b/src/conftest/suiteb/3.15.1/test.conf
@@ -1,7 +1,7 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }
 

diff --git a/src/conftest/suiteb/3.15.2/dut.conf b/src/conftest/suiteb/3.15.2/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.15.2/dut.conf
+++ b/src/conftest/suiteb/3.15.2/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.16.1/test.conf b/src/conftest/suiteb/3.16.1/test.conf
index 3c2477b8df084406834e6d8a38571ad419d41839..17c7f5c7d3d6d9091fda04f2e76c60cfe252ed87 100644 (file)
--- a/src/conftest/suiteb/3.16.1/test.conf
+++ b/src/conftest/suiteb/3.16.1/test.conf
@@ -8,6 +8,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.19.1/dut.conf b/src/conftest/suiteb/3.19.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.19.1/dut.conf
+++ b/src/conftest/suiteb/3.19.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.2.1/dut.conf b/src/conftest/suiteb/3.2.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.2.1/dut.conf
+++ b/src/conftest/suiteb/3.2.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.3.1/test.conf b/src/conftest/suiteb/3.3.1/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.3.1/test.conf
+++ b/src/conftest/suiteb/3.3.1/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.4.1/dut.conf b/src/conftest/suiteb/3.4.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.4.1/dut.conf
+++ b/src/conftest/suiteb/3.4.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.5.1/dut.conf b/src/conftest/suiteb/3.5.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.5.1/dut.conf
+++ b/src/conftest/suiteb/3.5.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.7.1/dut.conf b/src/conftest/suiteb/3.7.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.7.1/dut.conf
+++ b/src/conftest/suiteb/3.7.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.7.2/test.conf b/src/conftest/suiteb/3.7.2/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.7.2/test.conf
+++ b/src/conftest/suiteb/3.7.2/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.8.1/test.conf b/src/conftest/suiteb/3.8.1/test.conf
index fa33eae8ad970e2bbcadc48e8a87b20b3f245531..4b57a7572bc5f368aa246f4bdc8e2ee7c2d22bc2 100644 (file)
--- a/src/conftest/suiteb/3.8.1/test.conf
+++ b/src/conftest/suiteb/3.8.1/test.conf
@@ -10,6 +10,6 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.9.1/dut.conf b/src/conftest/suiteb/3.9.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/3.9.1/dut.conf
+++ b/src/conftest/suiteb/3.9.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/4.2.1/dut.conf b/src/conftest/suiteb/4.2.1/dut.conf
index 8edf262560dd551a04342ebf89b723cb53f6e65d..332086a6afe920f84c3b4f9d80ac7ee1541bea07 100644 (file)
--- a/src/conftest/suiteb/4.2.1/dut.conf
+++ b/src/conftest/suiteb/4.2.1/dut.conf
@@ -1,7 +1,7 @@
 
 actions {
        rekey_ike {
-               config = ike-default
+               config = ike-v4
                delay = 10
        }
 }

diff --git a/src/conftest/suiteb/4.2.1/test.conf b/src/conftest/suiteb/4.2.1/test.conf
index b4730879aecbb2fd3b18256d0f3866a0acc63923..46337bf0bc0f494ef0bb0c09ba532143b860f107 100644 (file)
--- a/src/conftest/suiteb/4.2.1/test.conf
+++ b/src/conftest/suiteb/4.2.1/test.conf
@@ -1,7 +1,7 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }
 

diff --git a/src/conftest/suiteb/4.3.1/dut.conf b/src/conftest/suiteb/4.3.1/dut.conf
index 3fe9ce2029d990d7a63725b91ef8c40ba85b6675..ac39c85aacf4be0fce74fb7d02d5c1fda54336b4 100644 (file)
--- a/src/conftest/suiteb/4.3.1/dut.conf
+++ b/src/conftest/suiteb/4.3.1/dut.conf
@@ -1,7 +1,7 @@
 
 actions {
        rekey_child {
-               config = child-default
+               config = child-v4
                delay = 10
        }
 }

diff --git a/src/conftest/suiteb/4.3.1/test.conf b/src/conftest/suiteb/4.3.1/test.conf
index 0bebb7f58b781b645353022ffce2b3088027f811..ee7e45c887888d7c44602b56cd53f5fed6e42504 100644 (file)
--- a/src/conftest/suiteb/4.3.1/test.conf
+++ b/src/conftest/suiteb/4.3.1/test.conf
@@ -1,7 +1,7 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }
 

diff --git a/src/conftest/suiteb/4.4.1/test.conf b/src/conftest/suiteb/4.4.1/test.conf
index e3329827dd4e669d44a8c9023cc48d024d68b771..12afb40ee802d9d0b12a4a51a4ef63e08f94e7e2 100644 (file)
--- a/src/conftest/suiteb/4.4.1/test.conf
+++ b/src/conftest/suiteb/4.4.1/test.conf
@@ -13,10 +13,10 @@ hooks {
 }
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
        rekey_child {
-               config = child-default
+               config = child-v4
                delay = 3
        }
 }

diff --git a/src/conftest/suiteb/4.5.1/dut.conf b/src/conftest/suiteb/4.5.1/dut.conf
index 8edf262560dd551a04342ebf89b723cb53f6e65d..332086a6afe920f84c3b4f9d80ac7ee1541bea07 100644 (file)
--- a/src/conftest/suiteb/4.5.1/dut.conf
+++ b/src/conftest/suiteb/4.5.1/dut.conf
@@ -1,7 +1,7 @@
 
 actions {
        rekey_ike {
-               config = ike-default
+               config = ike-v4
                delay = 10
        }
 }

diff --git a/src/conftest/suiteb/4.5.1/test.conf b/src/conftest/suiteb/4.5.1/test.conf
index 112faa40f8b450e471e9eaa126354fa459820e9d..2505f63ca1e10eb7eead6f2aeeb0091bab5f0cfb 100644 (file)
--- a/src/conftest/suiteb/4.5.1/test.conf
+++ b/src/conftest/suiteb/4.5.1/test.conf
@@ -1,7 +1,7 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }
 

diff --git a/src/conftest/suiteb/4.6.1/test.conf b/src/conftest/suiteb/4.6.1/test.conf
index 81a66a4e3f482c0e9f985e02c0a3239bd011f3a0..2a034bf9a4b44bc742b76fddae60d80791d7a597 100644 (file)
--- a/src/conftest/suiteb/4.6.1/test.conf
+++ b/src/conftest/suiteb/4.6.1/test.conf
@@ -1,10 +1,10 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
        rekey_ike {
-               config = ike-default
+               config = ike-v4
                delay = 3
        }
 }

diff --git a/src/conftest/suiteb/4.7.1/dut.conf b/src/conftest/suiteb/4.7.1/dut.conf
index e3ff175c2c4614ac8e25e7cac2016440104508d9..677fbe9291fc35c8781ac466fda121b05e611cdf 100644 (file)
--- a/src/conftest/suiteb/4.7.1/dut.conf
+++ b/src/conftest/suiteb/4.7.1/dut.conf
@@ -1,7 +1,7 @@
 
 actions {
        rekey_ike {
-               config = ike-default
+               config = ike-v4
                delay = 5
        }
 }

diff --git a/src/conftest/suiteb/4.7.1/test.conf b/src/conftest/suiteb/4.7.1/test.conf
index 03982c60e7383c645fad8ed23c24a54a796e2886..08c7720f2f57613ae40b478d5799bd7c7b1fe2cb 100644 (file)
--- a/src/conftest/suiteb/4.7.1/test.conf
+++ b/src/conftest/suiteb/4.7.1/test.conf
@@ -1,10 +1,10 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
        liveness {
-               config = ike-default
+               config = ike-v4
                delay = 10
        }
 }

diff --git a/src/conftest/suiteb/4.8.1/dut.conf b/src/conftest/suiteb/4.8.1/dut.conf
index 28eecefc8a54f8aa9957c33deedc0aebaffeb48a..0a46f1e995a7db05ddb86b58261d1443ab695bfe 100644 (file)
--- a/src/conftest/suiteb/4.8.1/dut.conf
+++ b/src/conftest/suiteb/4.8.1/dut.conf
@@ -1,11 +1,11 @@
 
 actions {
        rekey_ike-1 {
-               config = ike-default
+               config = ike-v4
                delay = 5
        }
        rekey_ike-2 {
-               config = ike-default
+               config = ike-v4
                delay = 10
        }
 }

diff --git a/src/conftest/suiteb/4.8.1/test.conf b/src/conftest/suiteb/4.8.1/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/4.8.1/test.conf
+++ b/src/conftest/suiteb/4.8.1/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/5.1.1/test.conf b/src/conftest/suiteb/5.1.1/test.conf
index 653055fffba79911aab28f0da761643e468c0cfa..094ca2500897a4cde58586b441d51715d57eac4d 100644 (file)
--- a/src/conftest/suiteb/5.1.1/test.conf
+++ b/src/conftest/suiteb/5.1.1/test.conf
@@ -1,7 +1,7 @@
 
 # This config fakes NAT and uses a custom source port. This does not work
 # to port 500, 4500 is used instead. If this test uses a real NAPT box in front,
-# a simple initiate using child-default would be sufficient.
+# a simple initiate using child-v4 would be sufficient.
 
 preload = socket-dynamic
 

diff --git a/src/conftest/suiteb/5.12.1/test.conf b/src/conftest/suiteb/5.12.1/test.conf
index 36d286aad2704f47d5ec1c5cb1ad518ac82f8153..0a8ca51e393efc9111a0dc78a67360b23f9eab78 100644 (file)
--- a/src/conftest/suiteb/5.12.1/test.conf
+++ b/src/conftest/suiteb/5.12.1/test.conf
@@ -14,10 +14,10 @@ hooks {
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
        liveness {
-               config = ike-default
+               config = ike-v4
                delay = 5
        }
 }

diff --git a/src/conftest/suiteb/5.4.1/test.conf b/src/conftest/suiteb/5.4.1/test.conf
index 8f86e0f1a632cd109721cf9a21581cd7fb476bc3..9a11d9bd4dc9fbee235c07115da09f5e6a2721d0 100644 (file)
--- a/src/conftest/suiteb/5.4.1/test.conf
+++ b/src/conftest/suiteb/5.4.1/test.conf
@@ -1,7 +1,7 @@
 
 actions {
        close_ike {
-               config = ike-default
+               config = ike-v4
                delay = 10
        }
 }

diff --git a/src/conftest/suiteb/5.6.1/test.conf b/src/conftest/suiteb/5.6.1/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/5.6.1/test.conf
+++ b/src/conftest/suiteb/5.6.1/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/5.8.1/test.conf b/src/conftest/suiteb/5.8.1/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/5.8.1/test.conf
+++ b/src/conftest/suiteb/5.8.1/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/5.8.2/dut.conf b/src/conftest/suiteb/5.8.2/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/5.8.2/dut.conf
+++ b/src/conftest/suiteb/5.8.2/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.10.1/dut.conf b/src/conftest/suiteb/7.10.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/7.10.1/dut.conf
+++ b/src/conftest/suiteb/7.10.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.2.1/test.conf b/src/conftest/suiteb/7.2.1/test.conf
index af758e8cafbd2402543bf13480d8489eb4429c89..aa184ec52a38a838402e3ab24ce00ddbe3e2ea87 100644 (file)
--- a/src/conftest/suiteb/7.2.1/test.conf
+++ b/src/conftest/suiteb/7.2.1/test.conf
@@ -10,6 +10,6 @@ hooks {
 }
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.3.1/dut.conf b/src/conftest/suiteb/7.3.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/7.3.1/dut.conf
+++ b/src/conftest/suiteb/7.3.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.3.2/dut.conf b/src/conftest/suiteb/7.3.2/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/7.3.2/dut.conf
+++ b/src/conftest/suiteb/7.3.2/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.3.3/dut.conf b/src/conftest/suiteb/7.3.3/dut.conf
index ecf65cebdaf4e15b5374557803e2ac7849e24ee2..bc1e408d9f3cc55c9b9ae98501ddea4efdcc9bcc 100644 (file)
--- a/src/conftest/suiteb/7.3.3/dut.conf
+++ b/src/conftest/suiteb/7.3.3/dut.conf
@@ -1,11 +1,11 @@
 
 actions {
        rekey_ike {
-               config = ike-default
+               config = ike-v4
                delay = 5
        }
        liveness {
-               config = ike-default
+               config = ike-v4
                delay = 8
        }
 }

diff --git a/src/conftest/suiteb/7.3.3/test.conf b/src/conftest/suiteb/7.3.3/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/7.3.3/test.conf
+++ b/src/conftest/suiteb/7.3.3/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.3.4/dut.conf b/src/conftest/suiteb/7.3.4/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/7.3.4/dut.conf
+++ b/src/conftest/suiteb/7.3.4/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.3.4/test.conf b/src/conftest/suiteb/7.3.4/test.conf
index ecf65cebdaf4e15b5374557803e2ac7849e24ee2..bc1e408d9f3cc55c9b9ae98501ddea4efdcc9bcc 100644 (file)
--- a/src/conftest/suiteb/7.3.4/test.conf
+++ b/src/conftest/suiteb/7.3.4/test.conf
@@ -1,11 +1,11 @@
 
 actions {
        rekey_ike {
-               config = ike-default
+               config = ike-v4
                delay = 5
        }
        liveness {
-               config = ike-default
+               config = ike-v4
                delay = 8
        }
 }

diff --git a/src/conftest/suiteb/7.4.1/dut.conf b/src/conftest/suiteb/7.4.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/7.4.1/dut.conf
+++ b/src/conftest/suiteb/7.4.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.4.2/dut.conf b/src/conftest/suiteb/7.4.2/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/7.4.2/dut.conf
+++ b/src/conftest/suiteb/7.4.2/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.4.3/dut.conf b/src/conftest/suiteb/7.4.3/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/7.4.3/dut.conf
+++ b/src/conftest/suiteb/7.4.3/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.5.1/dut.conf b/src/conftest/suiteb/7.5.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/7.5.1/dut.conf
+++ b/src/conftest/suiteb/7.5.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.5.2/test.conf b/src/conftest/suiteb/7.5.2/test.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/7.5.2/test.conf
+++ b/src/conftest/suiteb/7.5.2/test.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.6.1/dut.conf b/src/conftest/suiteb/7.6.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/7.6.1/dut.conf
+++ b/src/conftest/suiteb/7.6.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.8.1/dut.conf b/src/conftest/suiteb/7.8.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/7.8.1/dut.conf
+++ b/src/conftest/suiteb/7.8.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/7.9.1/dut.conf b/src/conftest/suiteb/7.9.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/7.9.1/dut.conf
+++ b/src/conftest/suiteb/7.9.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/8.1.1/dut.conf b/src/conftest/suiteb/8.1.1/dut.conf
index 9534c1d1bbdecd1314ec2c90073deac9f1ffdbff..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/8.1.1/dut.conf
+++ b/src/conftest/suiteb/8.1.1/dut.conf
@@ -1,6 +1,6 @@
 
 actions {
        initiate {
-               config = child-default
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/dut.conf b/src/conftest/suiteb/dut.conf
index bd96f3cc96b7c1a194cc28e51f048a312b38ad6f..961472151917061a85e918445854692df09baf83 100644 (file)
--- a/src/conftest/suiteb/dut.conf
+++ b/src/conftest/suiteb/dut.conf
@@ -22,13 +22,13 @@ keys {
 }
 
 configs {
-       ike-default {
+       ike-v4 {
                proposal = aes128-sha1-modp1024
                lhost = 172.16.1.10
                rhost = 172.16.1.20
                lid = dut.strongswan.org
                rid = ls.strongswan.org
-               child-default {
+               child-v4 {
                        lts = 10.10.10.0/24
                        rts = 10.20.20.0/24
                }

diff --git a/src/conftest/suiteb/suite.conf b/src/conftest/suiteb/suite.conf
index 2178d376a2bf6a5b26dc4222c41ae9e4c8c2ff2b..a055a1aff0cace038686d78b68e39bf6aefa8168 100644 (file)
--- a/src/conftest/suiteb/suite.conf
+++ b/src/conftest/suiteb/suite.conf
@@ -22,13 +22,13 @@ keys {
 }
 
 configs {
-       ike-default {
+       ike-v4 {
                proposal = aes128-sha1-modp1024
                lhost = 172.16.1.20
                rhost = 172.16.1.10
                lid = ls.strongswan.org
                rid = dut.strongswan.org
-               child-default {
+               child-v4 {
                        lts = 10.20.20.0/24
                        rts = 10.10.10.0/24
                }