From: Martin Willi Date: Mon, 20 Dec 2010 14:56:00 +0000 (+0100) Subject: Renamed default config to -v4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8d238c68db951f4c5ae8168e81163ee8f5f365f;p=thirdparty%2Fstrongswan.git 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 ba564ed280..22ee6681b1 100644 --- 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 61ef326c7d..e31e285876 100644 --- 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 269a858688..15b950f9b7 100644 --- 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 ad929375b1..9bd1e52403 100644 --- 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 3fe9ce2029..ac39c85aac 100644 --- 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 05a2b40c4e..271c8a460c 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9650f90483..3182c851da 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 93c605fb17..cde62026eb 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 c6c29e07b6..0719b452c3 100644 --- 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 45d5c51528..03fb7f4062 100644 --- 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 b80b58e46b..7637a39cec 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 5f239a8bc6..5c6748203b 100644 --- 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 7c2d6e6b32..5f99ffc043 100644 --- 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 ff2a4c1930..440ece74e5 100644 --- 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 0106fb7e26..979249aefa 100644 --- 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 7c2d6e6b32..5f99ffc043 100644 --- 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 aa00e1028e..ed8aa25374 100644 --- 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 2740fddb3e..a757940c2f 100644 --- 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 d6ec9eda95..ea80ef57ae 100644 --- 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 ff2a4c1930..440ece74e5 100644 --- 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 064ba13e9d..85517d59d2 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 8288be5061..0071758190 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 e59e0d3396..45666ede9e 100644 --- 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 112faa40f8..2505f63ca1 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 3c2477b8df..17c7f5c7d3 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 fa33eae8ad..4b57a7572b 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 8edf262560..332086a6af 100644 --- 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 b4730879ae..46337bf0bc 100644 --- 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 3fe9ce2029..ac39c85aac 100644 --- 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 0bebb7f58b..ee7e45c887 100644 --- 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 e3329827dd..12afb40ee8 100644 --- 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 8edf262560..332086a6af 100644 --- 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 112faa40f8..2505f63ca1 100644 --- 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 81a66a4e3f..2a034bf9a4 100644 --- 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 e3ff175c2c..677fbe9291 100644 --- 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 03982c60e7..08c7720f2f 100644 --- 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 28eecefc8a..0a46f1e995 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 653055fffb..094ca25008 100644 --- 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 36d286aad2..0a8ca51e39 100644 --- 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 8f86e0f1a6..9a11d9bd4d 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 af758e8caf..aa184ec52a 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 ecf65cebda..bc1e408d9f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 ecf65cebda..bc1e408d9f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 9534c1d1bb..3de2ec794f 100644 --- 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 bd96f3cc96..9614721519 100644 --- 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 2178d376a2..a055a1aff0 100644 --- 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 }