Reuse existing suite configs to construct test configs

diff --git a/src/conftest/suiteb/1.1.1/dut.conf b/src/conftest/suiteb/1.1.1/dut.conf
index 3e24a4b70527e2a780113503f83bac7834a543a5..c166f7f078587f546188339a06be9bcafc4f94c5 100644 (file)
--- a/src/conftest/suiteb/1.1.1/dut.conf
+++ b/src/conftest/suiteb/1.1.1/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-ctr {
+       ike-v4 {
                proposal = aes128ctr-aes128ccm8-aes128gcm8-aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-ctr {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/1.1.1/test.conf b/src/conftest/suiteb/1.1.1/test.conf
index 5bbc6a060517e8f9ca88bec416a3d73dc9ae1e03..b05446eeaadb97f34da28d4b491a83bd77149c19 100644 (file)
--- a/src/conftest/suiteb/1.1.1/test.conf
+++ b/src/conftest/suiteb/1.1.1/test.conf
@@ -8,25 +8,17 @@ hooks {
 }
 
 configs {
-       ike-ctr {
+       ike-v4 {
                proposal = aes128ctr-aes128ccm8-aes128gcm8-aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-ctr {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-ctr
+               config = child-v4
        }
        close_ike {
-               config = ike-ctr
+               config = ike-v4
                delay = 1
        }
 }

diff --git a/src/conftest/suiteb/1.2.1/dut.conf b/src/conftest/suiteb/1.2.1/dut.conf
index 3e24a4b70527e2a780113503f83bac7834a543a5..c166f7f078587f546188339a06be9bcafc4f94c5 100644 (file)
--- a/src/conftest/suiteb/1.2.1/dut.conf
+++ b/src/conftest/suiteb/1.2.1/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-ctr {
+       ike-v4 {
                proposal = aes128ctr-aes128ccm8-aes128gcm8-aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-ctr {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/1.2.1/test.conf b/src/conftest/suiteb/1.2.1/test.conf
index b000eeb3295696df6c35d45f2fbf8eb46eb089d4..6b097085e42c8e854675781e9a141c2c00a19f75 100644 (file)
--- a/src/conftest/suiteb/1.2.1/test.conf
+++ b/src/conftest/suiteb/1.2.1/test.conf
@@ -8,25 +8,17 @@ hooks {
 }
 
 configs {
-       ike-ctr {
+       ike-v4 {
                proposal = aes128ctr-aes128ccm8-aes128gcm8-aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-ctr {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-ctr
+               config = child-v4
        }
        close_ike {
-               config = ike-ctr
+               config = ike-v4
                delay = 1
        }
 }

diff --git a/src/conftest/suiteb/10.3.1/dut.conf b/src/conftest/suiteb/10.3.1/dut.conf
index 91d63e0bd1fc531fae5aa7e222c01e4f85e30622..fe77aa8861452a1975ade4e20bffcc579bef82ee 100644 (file)
--- a/src/conftest/suiteb/10.3.1/dut.conf
+++ b/src/conftest/suiteb/10.3.1/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-gcm128
+               config = child-v4
        }
 }
 
 configs {
-       ike-gcm128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-gcm128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/10.3.1/test.conf b/src/conftest/suiteb/10.3.1/test.conf
index 9bbc88732966cb12a487d9f16ff94c70986d3fdb..7112bd59ce8096bd8e5d40e01eb4d3f278da1236 100644 (file)
--- a/src/conftest/suiteb/10.3.1/test.conf
+++ b/src/conftest/suiteb/10.3.1/test.conf
@@ -5,16 +5,10 @@ hooks {
 }
 
 configs {
-       ike-gcm128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-gcm128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/10.3.2/dut.conf b/src/conftest/suiteb/10.3.2/dut.conf
index abb747ebcdc5636512d45ec7a02b35be242132b5..f28093255a86ab9c802fb6c9dc3a82adca4d18c1 100644 (file)
--- a/src/conftest/suiteb/10.3.2/dut.conf
+++ b/src/conftest/suiteb/10.3.2/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-gcm256
+               config = child-v4
        }
 }
 
 configs {
-       ike-gcm256 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-gcm256 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/10.3.2/test.conf b/src/conftest/suiteb/10.3.2/test.conf
index 02c35f4111969d199aad50140b80e2b0acdfa48c..2d9a6a77977768f7427150d59f56793c3347a801 100644 (file)
--- a/src/conftest/suiteb/10.3.2/test.conf
+++ b/src/conftest/suiteb/10.3.2/test.conf
@@ -5,16 +5,10 @@ hooks {
 }
 
 configs {
-       ike-gcm256 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-gcm256 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/10.3.3/dut.conf b/src/conftest/suiteb/10.3.3/dut.conf
index c688bdb93f29db68b5e0e2697a287d100fe65a0d..7e65772cdf35cccd20bbe01c4139374d898dcdc1 100644 (file)
--- a/src/conftest/suiteb/10.3.3/dut.conf
+++ b/src/conftest/suiteb/10.3.3/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-gmac128
+               config = child-v4
        }
 }
 
 configs {
-       ike-gmac128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-gmac128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/10.3.3/test.conf b/src/conftest/suiteb/10.3.3/test.conf
index 60f62a1beffce3c097726e36de49924dc750004e..5c9c245622856813918fbfb0be68928058821283 100644 (file)
--- a/src/conftest/suiteb/10.3.3/test.conf
+++ b/src/conftest/suiteb/10.3.3/test.conf
@@ -5,16 +5,10 @@ hooks {
 }
 
 configs {
-       ike-gmac128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-gmac128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/10.3.4/dut.conf b/src/conftest/suiteb/10.3.4/dut.conf
index 5bcf2410a2f77ee543a09f5e459a8d7ebffcc3bd..8634f966388750e099fa34bcd22a496af0ed2ee8 100644 (file)
--- a/src/conftest/suiteb/10.3.4/dut.conf
+++ b/src/conftest/suiteb/10.3.4/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-gmac256
+               config = child-v4
        }
 }
 
 configs {
-       ike-gmac256 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-gmac256 {
+               child-v4 {
                        proposal = aes256gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/10.3.4/test.conf b/src/conftest/suiteb/10.3.4/test.conf
index 46a5c8dace370c437fce1390d3d7b600c5bd532f..7cfa2e426284e172c459b6c0e2b291c31476f50c 100644 (file)
--- a/src/conftest/suiteb/10.3.4/test.conf
+++ b/src/conftest/suiteb/10.3.4/test.conf
@@ -5,16 +5,10 @@ hooks {
 }
 
 configs {
-       ike-gmac256 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-gmac256 {
+               child-v4 {
                        proposal = aes256gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/10.6.1/dut.conf b/src/conftest/suiteb/10.6.1/dut.conf
index 6e1a13b2103d4bdf67f04b8f3d5009cd0c0d0bb5..211ad92a708d30fe7ab50f6ddb83e091af5a7404 100644 (file)
--- a/src/conftest/suiteb/10.6.1/dut.conf
+++ b/src/conftest/suiteb/10.6.1/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-gcm128
+               config = child-v4
        }
 }
 
 configs {
-       ike-gcm128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256,aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-gcm128 {
+               child-v4 {
                        proposal = aes128gcm16,aes256gcm16,aes128gmac,aes256gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/10.6.1/test.conf b/src/conftest/suiteb/10.6.1/test.conf
index e97899ee2bbb4e363c03f020f103af81e11cb734..5718ea87af7b33e9d9778af05df13a367e625611 100644 (file)
--- a/src/conftest/suiteb/10.6.1/test.conf
+++ b/src/conftest/suiteb/10.6.1/test.conf
@@ -5,16 +5,10 @@ hooks {
 }
 
 configs {
-       ike-allb {
+       ike-v4 {
                proposal = aes128-sha256-ecp256,aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-allb {
+               child-v4 {
                        proposal = aes128gcm16,aes256gcm16,aes128gmac,aes256gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/10.7.1/dut.conf b/src/conftest/suiteb/10.7.1/dut.conf
index 6e1a13b2103d4bdf67f04b8f3d5009cd0c0d0bb5..211ad92a708d30fe7ab50f6ddb83e091af5a7404 100644 (file)
--- a/src/conftest/suiteb/10.7.1/dut.conf
+++ b/src/conftest/suiteb/10.7.1/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-gcm128
+               config = child-v4
        }
 }
 
 configs {
-       ike-gcm128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256,aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-gcm128 {
+               child-v4 {
                        proposal = aes128gcm16,aes256gcm16,aes128gmac,aes256gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/10.7.1/test.conf b/src/conftest/suiteb/10.7.1/test.conf
index e97899ee2bbb4e363c03f020f103af81e11cb734..5718ea87af7b33e9d9778af05df13a367e625611 100644 (file)
--- a/src/conftest/suiteb/10.7.1/test.conf
+++ b/src/conftest/suiteb/10.7.1/test.conf
@@ -5,16 +5,10 @@ hooks {
 }
 
 configs {
-       ike-allb {
+       ike-v4 {
                proposal = aes128-sha256-ecp256,aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-allb {
+               child-v4 {
                        proposal = aes128gcm16,aes256gcm16,aes128gmac,aes256gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/11.1.1/dut.conf b/src/conftest/suiteb/11.1.1/dut.conf
index 7e9db62ebb753960b2958194d20cdabd0a7fe279..25c383fdc119bc9d11d1f00b9783543f1fd81354 100644 (file)
--- a/src/conftest/suiteb/11.1.1/dut.conf
+++ b/src/conftest/suiteb/11.1.1/dut.conf
@@ -1,14 +1,7 @@
 
 configs {
-       ike-wrong {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
+       ike-v4 {
                lid = 172.16.1.10
                rid = 172.16.1.20
-               child-wrong {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/11.1.1/test.conf b/src/conftest/suiteb/11.1.1/test.conf
index 273099f7acd5d7930a9bf1b84ae99b0387642bc9..02fb9900735e2a68a87d8da7d1879391bb6babbb 100644 (file)
--- a/src/conftest/suiteb/11.1.1/test.conf
+++ b/src/conftest/suiteb/11.1.1/test.conf
@@ -13,17 +13,10 @@ hooks {
 }
 
 configs {
-       ike-wrong {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                # certificate IP to look it up, change ID in hook
                lid = 172.16.1.99
                rid = 172.16.1.10
-               child-wrong {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
@@ -35,6 +28,6 @@ certs {
 
 actions {
        initiate {
-               config = child-wrong
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/11.1.2/dut.conf b/src/conftest/suiteb/11.1.2/dut.conf
index 2f5b7b4862566ce28e212f7e6446b71591f28c0e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/src/conftest/suiteb/11.1.2/dut.conf
+++ b/src/conftest/suiteb/11.1.2/dut.conf
@@ -1,14 +0,0 @@
-
-configs {
-       ike-wrong {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-wrong {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
-       }
-}

diff --git a/src/conftest/suiteb/11.1.2/test.conf b/src/conftest/suiteb/11.1.2/test.conf
index 3d410cdbf81b98d81a7e37d5d467def4a3bcdef3..e51571e226a959c48114beeabd96f7e1207984c7 100644 (file)
--- a/src/conftest/suiteb/11.1.2/test.conf
+++ b/src/conftest/suiteb/11.1.2/test.conf
@@ -13,17 +13,10 @@ hooks {
 }
 
 configs {
-       ike-wrong {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                # certificate FQDN to look it up, change ID in hook
                lid = ls.wrong.strongswan.org
                rid = dut.strongswan.org
-               child-wrong {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
@@ -35,6 +28,6 @@ certs {
 
 actions {
        initiate {
-               config = child-wrong
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/11.1.3/dut.conf b/src/conftest/suiteb/11.1.3/dut.conf
index ee4d57a8c5e980464fc933723b50b77369fc64a2..3cd6f1706d505b90f7dff3aaf6dbadebddf968d9 100644 (file)
--- a/src/conftest/suiteb/11.1.3/dut.conf
+++ b/src/conftest/suiteb/11.1.3/dut.conf
@@ -1,14 +1,7 @@
 
 configs {
-       ike-wrong {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
+       ike-v4 {
                lid = dut@strongswan.org
                rid = ls@strongswan.org
-               child-wrong {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/11.1.3/test.conf b/src/conftest/suiteb/11.1.3/test.conf
index 5adab0455f9c42dd21d8a722550deb04f5c63c9c..4949b7795754c70180f204527d796c2ed653dbf4 100644 (file)
--- a/src/conftest/suiteb/11.1.3/test.conf
+++ b/src/conftest/suiteb/11.1.3/test.conf
@@ -13,17 +13,10 @@ hooks {
 }
 
 configs {
-       ike-wrong {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                # certificate E-Mail to look it up, change ID in hook
                lid = ls.wrong@strongswan.org
                rid = dut@strongswan.org
-               child-wrong {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
@@ -35,6 +28,6 @@ certs {
 
 actions {
        initiate {
-               config = child-wrong
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/11.3.1/dut.conf b/src/conftest/suiteb/11.3.1/dut.conf
index c1763c7621b174310c01e91de56cbd98abca86af..a5fea54b30fdb0de36a832aded8e4c92c493d91a 100644 (file)
--- a/src/conftest/suiteb/11.3.1/dut.conf
+++ b/src/conftest/suiteb/11.3.1/dut.conf
@@ -1,15 +1,7 @@
 
 configs {
        ike-rsa {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
                rid = ls.rsa.strongswan.org
                ecdsa_strength = 256
-               child-rsa {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/11.3.1/test.conf b/src/conftest/suiteb/11.3.1/test.conf
index 7cbb2a56b2bbd25246ae63baab4107de2d29c0c8..e246f3ead80a80d176204f6e0501525a00ba7924 100644 (file)
--- a/src/conftest/suiteb/11.3.1/test.conf
+++ b/src/conftest/suiteb/11.3.1/test.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-rsa {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.rsa.strongswan.org
-               rid = dut.strongswan.org
-               child-rsa {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
@@ -26,6 +18,6 @@ keys {
 
 actions {
        initiate {
-               config = child-rsa
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/11.3.2/dut.conf b/src/conftest/suiteb/11.3.2/dut.conf
index b80666dc8e70dc0a8c73b807f4553ce65ae87424..9ab2e1d549a5786c584457a0b65b12100ff7d351 100644 (file)
--- a/src/conftest/suiteb/11.3.2/dut.conf
+++ b/src/conftest/suiteb/11.3.2/dut.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-rsa {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.icarsa.strongswan.org
                ecdsa_strength = 256
-               child-rsa {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/11.3.2/test.conf b/src/conftest/suiteb/11.3.2/test.conf
index 68c35b88c4c455995bdc8fe36097ad560a1c8269..5308491ed1d4ea66d60f2f7941320dbb6c159811 100644 (file)
--- a/src/conftest/suiteb/11.3.2/test.conf
+++ b/src/conftest/suiteb/11.3.2/test.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-rsa {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.icarsa.strongswan.org
-               rid = dut.strongswan.org
-               child-rsa {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
@@ -21,6 +13,6 @@ certs {
 
 actions {
        initiate {
-               config = child-rsa
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/11.4.2/dut.conf b/src/conftest/suiteb/11.4.2/dut.conf
index c4cf07cdc4ca5859fbb23c781fee1542a95bcefb..d417c84455552a699e0a3b27011c206968e386f9 100644 (file)
--- a/src/conftest/suiteb/11.4.2/dut.conf
+++ b/src/conftest/suiteb/11.4.2/dut.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-256 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.256-256.strongswan.org
                ecdsa_strength = 256
-               child-256 {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/11.4.2/test.conf b/src/conftest/suiteb/11.4.2/test.conf
index e28455757fd06c0a291138057278b11fcd1d39c5..84f2f95b52519c17f10fa5a5c231ef717c8bdd68 100644 (file)
--- a/src/conftest/suiteb/11.4.2/test.conf
+++ b/src/conftest/suiteb/11.4.2/test.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-256 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.256-256.strongswan.org
-               rid = dut.strongswan.org
-               child-256 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
@@ -26,6 +18,6 @@ keys {
 
 actions {
        initiate {
-               config = child-256
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/11.4.3/dut.conf b/src/conftest/suiteb/11.4.3/dut.conf
index d044f7877fef19ee5543329570b212d363ad97cf..d25379ccc953f372c982bbd92d0c7895fbea4ba9 100644 (file)
--- a/src/conftest/suiteb/11.4.3/dut.conf
+++ b/src/conftest/suiteb/11.4.3/dut.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-256 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.256-384.strongswan.org
                ecdsa_strength = 256
-               child-256 {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/11.4.3/test.conf b/src/conftest/suiteb/11.4.3/test.conf
index ba27767228b1dbcdf279572c92cb306dbe1d0b9e..9a0f03c38945c178d8e6fc56b6e4bd61e3f0ff37 100644 (file)
--- a/src/conftest/suiteb/11.4.3/test.conf
+++ b/src/conftest/suiteb/11.4.3/test.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-256 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.256-384.strongswan.org
-               rid = dut.strongswan.org
-               child-256 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
@@ -26,6 +18,6 @@ keys {
 
 actions {
        initiate {
-               config = child-256
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/11.5.1/dut.conf b/src/conftest/suiteb/11.5.1/dut.conf
index 13f4b75cff31b0a3079bd07fce2d81f47400c8a9..94a52e1fb039bfc21c29038ad7aef14ca576226f 100644 (file)
--- a/src/conftest/suiteb/11.5.1/dut.conf
+++ b/src/conftest/suiteb/11.5.1/dut.conf
@@ -1,16 +1,11 @@
 
 configs {
-       ike-ecdsa {
+       ike-v4 {
                proposal = aes128-sha256-ecp256,aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
                rid = ls.384-256.strongswan.org
                ecdsa_strength = 384
-               child-ecdsa {
+               child-v4 {
                        proposal = aes128gcm16,aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/11.5.1/test.conf b/src/conftest/suiteb/11.5.1/test.conf
index 4cdbf697b323f4bf6fdfd8de8f4bb90f185e45d3..61736f0437812862a44d148fd4903e46cda71007 100644 (file)
--- a/src/conftest/suiteb/11.5.1/test.conf
+++ b/src/conftest/suiteb/11.5.1/test.conf
@@ -1,15 +1,10 @@
 
 configs {
-       ike-ecdsa {
+       ike-v4 {
                proposal = aes128-sha256-ecp256,aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.384-256.strongswan.org
-               rid = dut.strongswan.org
-               child-ecdsa {
+               child-v4 {
                        proposal = aes128gcm16,aes256gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }
@@ -22,6 +17,6 @@ certs {
 
 actions {
        initiate {
-               config = child-ecdsa
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/11.5.2/dut.conf b/src/conftest/suiteb/11.5.2/dut.conf
index 41989bf7fb8013db17d6b75cb364e76b4b86404b..58544061e623d8e73979ddd64aa53af6a1e9d309 100644 (file)
--- a/src/conftest/suiteb/11.5.2/dut.conf
+++ b/src/conftest/suiteb/11.5.2/dut.conf
@@ -1,16 +1,11 @@
 
 configs {
-       ike-ecdsa {
+       ike-v4 {
                proposal = aes128-sha256-ecp256,aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
                rid = ls.icalowhigh.strongswan.org
                ecdsa_strength = 384
-               child-ecdsa {
+               child-v4 {
                        proposal = aes128gcm16,aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/11.5.2/test.conf b/src/conftest/suiteb/11.5.2/test.conf
index 530766b2fdf505195d86a176b60b53286b83d0a9..2aa057922ef1f0ceba001956b26919198e2e4cac 100644 (file)
--- a/src/conftest/suiteb/11.5.2/test.conf
+++ b/src/conftest/suiteb/11.5.2/test.conf
@@ -1,15 +1,10 @@
 
 configs {
-       ike-ecdsa {
+       ike-v4 {
                proposal = aes128-sha256-ecp256,aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.icalowhigh.strongswan.org
-               rid = dut.strongswan.org
-               child-ecdsa {
+               child-v4 {
                        proposal = aes128gcm16,aes256gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }
@@ -22,6 +17,6 @@ certs {
 
 actions {
        initiate {
-               config = child-ecdsa
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/11.6.1/dut.conf b/src/conftest/suiteb/11.6.1/dut.conf
index e039b79b004536f3fc5a4c874376978467d5a606..edf305fb26803fe79c0bb3e965f9278b6c59f33b 100644 (file)
--- a/src/conftest/suiteb/11.6.1/dut.conf
+++ b/src/conftest/suiteb/11.6.1/dut.conf
@@ -6,16 +6,8 @@ certs {
 }
 
 configs {
-       ike-mixed {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.256-revrsa.strongswan.org
                ecdsa_strength = 256
-               child-mixed {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/11.6.1/test.conf b/src/conftest/suiteb/11.6.1/test.conf
index ba4fda36140a458f196f99e4ed6ce92ca3c73c5b..2f0ad10e5c239cb2bd64aabd9fb0df2795bc328a 100644 (file)
--- a/src/conftest/suiteb/11.6.1/test.conf
+++ b/src/conftest/suiteb/11.6.1/test.conf
@@ -10,21 +10,13 @@ keys {
 }
 
 configs {
-       ike-mixed {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.256-revrsa.strongswan.org
-               rid = dut.strongswan.org
-               child-mixed {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-mixed
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/11.7.1/dut.conf b/src/conftest/suiteb/11.7.1/dut.conf
index 5ab414fa54eaed2ab896c20373abe3ffe8ba8f96..9f9691617efe654bfac82f8d42c9e53cb14db42f 100644 (file)
--- a/src/conftest/suiteb/11.7.1/dut.conf
+++ b/src/conftest/suiteb/11.7.1/dut.conf
@@ -6,16 +6,8 @@ certs {
 }
 
 configs {
-       ike-mixed {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.revrsa.strongswan.org
                ecdsa_strength = 384
-               child-mixed {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/11.7.1/test.conf b/src/conftest/suiteb/11.7.1/test.conf
index bd26a423b22df82ba4d3d2a55e1ba9a6a108c2c6..57b03e173730b896cb2b379f8914071e61c05ec3 100644 (file)
--- a/src/conftest/suiteb/11.7.1/test.conf
+++ b/src/conftest/suiteb/11.7.1/test.conf
@@ -6,21 +6,13 @@ certs {
 }
 
 configs {
-       ike-mixed {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.revrsa.strongswan.org
-               rid = dut.strongswan.org
-               child-mixed {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-mixed
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/11.7.2/dut.conf b/src/conftest/suiteb/11.7.2/dut.conf
index a7226af1cd6adb9435091dab83667319aad14083..93e16826f8dd30acf2b7ce5489db006b41080c22 100644 (file)
--- a/src/conftest/suiteb/11.7.2/dut.conf
+++ b/src/conftest/suiteb/11.7.2/dut.conf
@@ -6,16 +6,8 @@ certs {
 }
 
 configs {
-       ike-mixed {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.rev256.strongswan.org
                ecdsa_strength = 384
-               child-mixed {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/11.7.2/test.conf b/src/conftest/suiteb/11.7.2/test.conf
index 2055e0fd2c100b0d0ff8fa8efd8bff5919f302af..438bef5e068ec3f4a48328c704dbe601bb61215f 100644 (file)
--- a/src/conftest/suiteb/11.7.2/test.conf
+++ b/src/conftest/suiteb/11.7.2/test.conf
@@ -6,21 +6,13 @@ certs {
 }
 
 configs {
-       ike-mixed {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.rev256.strongswan.org
-               rid = dut.strongswan.org
-               child-mixed {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-mixed
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/12.2.1/dut.conf b/src/conftest/suiteb/12.2.1/dut.conf
index eb6e197baca9a22b0b452da0af66a1144ac1281a..cee2e3b6a30309d68ad7f243eaaf3027fae6b655 100644 (file)
--- a/src/conftest/suiteb/12.2.1/dut.conf
+++ b/src/conftest/suiteb/12.2.1/dut.conf
@@ -1,25 +1,19 @@
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
        rekey_child {
-               config = child-128
+               config = child-v4
                delay = 5
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16-ecp256
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/12.2.1/test.conf b/src/conftest/suiteb/12.2.1/test.conf
index 34c35841a9b5e5c72e133a33e248ec7f2646792d..72b3fcddd299c26fcbc97fa966732525c7d55de5 100644 (file)
--- a/src/conftest/suiteb/12.2.1/test.conf
+++ b/src/conftest/suiteb/12.2.1/test.conf
@@ -5,16 +5,10 @@ hooks {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16-ecp256
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/12.2.2/dut.conf b/src/conftest/suiteb/12.2.2/dut.conf
index 6752b7926b8c06b233d8d0741fa5763f6710bc06..14486f84aa0daa6fba8c940be35420a603e5492e 100644 (file)
--- a/src/conftest/suiteb/12.2.2/dut.conf
+++ b/src/conftest/suiteb/12.2.2/dut.conf
@@ -1,25 +1,19 @@
 
 actions {
        initiate {
-               config = child-256
+               config = child-v4
        }
        rekey_child {
-               config = child-256
+               config = child-v4
                delay = 5
        }
 }
 
 configs {
-       ike-256 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-256 {
+               child-v4 {
                        proposal = aes256gcm16-ecp384
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/12.2.2/test.conf b/src/conftest/suiteb/12.2.2/test.conf
index fda74aac2c4d775708f712ab5c096f7b840ccca0..3983a4dd8429b589309ef82ae93c73f6d2d7a3e8 100644 (file)
--- a/src/conftest/suiteb/12.2.2/test.conf
+++ b/src/conftest/suiteb/12.2.2/test.conf
@@ -5,16 +5,10 @@ hooks {
 }
 
 configs {
-       ike-256 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-256 {
+               child-v4 {
                        proposal = aes256gcm16-ecp384
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/12.3.1/dut.conf b/src/conftest/suiteb/12.3.1/dut.conf
index 5c19c277a4eeb061b917d7355458d8a896df9a22..f1972b43cd066c1f28d94cd8955a3910182ad4e6 100644 (file)
--- a/src/conftest/suiteb/12.3.1/dut.conf
+++ b/src/conftest/suiteb/12.3.1/dut.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16-ecp256
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/12.3.1/test.conf b/src/conftest/suiteb/12.3.1/test.conf
index bb490ba49d6ce85117efc039fc6d92046b157855..42224514bed75848c5ea1913617b28bd2850bbc7 100644 (file)
--- a/src/conftest/suiteb/12.3.1/test.conf
+++ b/src/conftest/suiteb/12.3.1/test.conf
@@ -6,25 +6,19 @@ hooks {
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
        rekey_child {
-               config = child-128
+               config = child-v4
                delay = 5
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16-ecp256
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/12.3.2/dut.conf b/src/conftest/suiteb/12.3.2/dut.conf
index 595754e368b32a023045fe70594c3c8cfc85f178..3a1b37df591c81595ba5af3fa9e90a1374ed84aa 100644 (file)
--- a/src/conftest/suiteb/12.3.2/dut.conf
+++ b/src/conftest/suiteb/12.3.2/dut.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-256 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-256 {
+               child-v4 {
                        proposal = aes256gcm16-ecp384
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/12.3.2/test.conf b/src/conftest/suiteb/12.3.2/test.conf
index 361967074abbec04e2c66f03e33f87a5154ba4e1..3b00744159e36c1d3413aa34040f4c4c7482ca43 100644 (file)
--- a/src/conftest/suiteb/12.3.2/test.conf
+++ b/src/conftest/suiteb/12.3.2/test.conf
@@ -6,25 +6,19 @@ hooks {
 
 actions {
        initiate {
-               config = child-256
+               config = child-v4
        }
        rekey_child {
-               config = child-256
+               config = child-v4
                delay = 5
        }
 }
 
 configs {
-       ike-256 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-256 {
+               child-v4 {
                        proposal = aes256gcm16-ecp384
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.1.1/dut.conf b/src/conftest/suiteb/13.1.1/dut.conf
index 6153ff8f4bea9b0323210b01ef85c14f71daf28b..98ed62b82f36b87f128fb02571ce75cea642825b 100644 (file)
--- a/src/conftest/suiteb/13.1.1/dut.conf
+++ b/src/conftest/suiteb/13.1.1/dut.conf
@@ -16,16 +16,12 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
                lid = dut.256-384.strongswan.org
                rid = ls.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.1.1/test.conf b/src/conftest/suiteb/13.1.1/test.conf
index 9646c3611156c7a1bbee9b5417762045b03d0756..7b88736bf79a5d734bc96d64c634939e5a4d51e9 100644 (file)
--- a/src/conftest/suiteb/13.1.1/test.conf
+++ b/src/conftest/suiteb/13.1.1/test.conf
@@ -17,16 +17,12 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.256-384.strongswan.org
                rid = dut.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.1.2/dut.conf b/src/conftest/suiteb/13.1.2/dut.conf
index bd2c815d0c948b716434dea3fd1c121b36a3c524..fe77aa8861452a1975ade4e20bffcc579bef82ee 100644 (file)
--- a/src/conftest/suiteb/13.1.2/dut.conf
+++ b/src/conftest/suiteb/13.1.2/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.1.2/test.conf b/src/conftest/suiteb/13.1.2/test.conf
index 052d84f7ad4fae4a634782107e45093b9da9dfba..9c9910033bcf761101cf17fe4b7ecbfeb532b72b 100644 (file)
--- a/src/conftest/suiteb/13.1.2/test.conf
+++ b/src/conftest/suiteb/13.1.2/test.conf
@@ -7,16 +7,10 @@ hooks {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.1.3/dut.conf b/src/conftest/suiteb/13.1.3/dut.conf
index 38697ff14f960450f019fd52866ca59a55a86325..45cbf944608f3d88a7a544d49a695f2666dcdf81 100644 (file)
--- a/src/conftest/suiteb/13.1.3/dut.conf
+++ b/src/conftest/suiteb/13.1.3/dut.conf
@@ -1,21 +1,16 @@
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
                rid = ls.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.1.3/test.conf b/src/conftest/suiteb/13.1.3/test.conf
index d709e69aaa819e5c4fce5dccd0807807b89f085f..7c6ba0884564bf2198e89090239d62a4c619fa4f 100644 (file)
--- a/src/conftest/suiteb/13.1.3/test.conf
+++ b/src/conftest/suiteb/13.1.3/test.conf
@@ -17,16 +17,11 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.256-384.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.1.4/dut.conf b/src/conftest/suiteb/13.1.4/dut.conf
index 33ef4abd145dddfdcd092f81a6fd8a02d6d8c447..5576c3cbcc44647bd593f620abef28aa813c8e5d 100644 (file)
--- a/src/conftest/suiteb/13.1.4/dut.conf
+++ b/src/conftest/suiteb/13.1.4/dut.conf
@@ -1,7 +1,7 @@
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
@@ -16,16 +16,11 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
                lid = dut.256-384.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.1.4/test.conf b/src/conftest/suiteb/13.1.4/test.conf
index 88f427a1367eb08c8d1d2669ee328ee72a6f87f9..ca370b4243834821422c80571b45f6132cc3e36a 100644 (file)
--- a/src/conftest/suiteb/13.1.4/test.conf
+++ b/src/conftest/suiteb/13.1.4/test.conf
@@ -7,16 +7,11 @@ hooks {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
                rid = dut.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.2.1/dut.conf b/src/conftest/suiteb/13.2.1/dut.conf
index 82e1df1897352d220271de4fd6c2f4acbf146fca..dfcfa18c40c24d7cd9ab0edb0d53bf0f2c23b9bc 100644 (file)
--- a/src/conftest/suiteb/13.2.1/dut.conf
+++ b/src/conftest/suiteb/13.2.1/dut.conf
@@ -10,16 +10,12 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
                lid = dut.256-384.strongswan.org
                rid = ls.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.2.1/test.conf b/src/conftest/suiteb/13.2.1/test.conf
index fd8d4712170c267cf8c79d7bd1cfb2d197204482..3caa3eee3edeca0c870a6fca03526efb83f60fc5 100644 (file)
--- a/src/conftest/suiteb/13.2.1/test.conf
+++ b/src/conftest/suiteb/13.2.1/test.conf
@@ -8,7 +8,7 @@ hooks {
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
@@ -23,16 +23,12 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.256-384.strongswan.org
                rid = dut.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.2.2/dut.conf b/src/conftest/suiteb/13.2.2/dut.conf
index 8716c77e1a09bb1042f2f338b47d63d50f1caebe..e4e3b1ab1996f59b74001968df1e0a7b07127d3f 100644 (file)
--- a/src/conftest/suiteb/13.2.2/dut.conf
+++ b/src/conftest/suiteb/13.2.2/dut.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.2.2/test.conf b/src/conftest/suiteb/13.2.2/test.conf
index 00ff93269c6b3bb4ce5a97ff81146296656534f1..c1ccb96566c7a3ae0a45443b88ace2ca59f97fe2 100644 (file)
--- a/src/conftest/suiteb/13.2.2/test.conf
+++ b/src/conftest/suiteb/13.2.2/test.conf
@@ -8,21 +8,15 @@ hooks {
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.2.3/dut.conf b/src/conftest/suiteb/13.2.3/dut.conf
index 498b7630462a9aae76a4c66a7fc57103a66a0d19..b8f3b58a4fce96cd7bafb7184dda66a051598f03 100644 (file)
--- a/src/conftest/suiteb/13.2.3/dut.conf
+++ b/src/conftest/suiteb/13.2.3/dut.conf
@@ -1,15 +1,10 @@
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
                rid = ls.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.2.3/test.conf b/src/conftest/suiteb/13.2.3/test.conf
index 12abbb6e3a53c89134059b7e791d364c2a81883f..efc1e1d3dbba7d9844223eadb09be63a126ba27c 100644 (file)
--- a/src/conftest/suiteb/13.2.3/test.conf
+++ b/src/conftest/suiteb/13.2.3/test.conf
@@ -8,7 +8,7 @@ hooks {
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
@@ -23,16 +23,11 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.256-384.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.2.4/dut.conf b/src/conftest/suiteb/13.2.4/dut.conf
index 63c4551133be7656a9fc53e199e00f2f4fda3889..7d31b7f06718fbc51a183d6b81e0a101e845756c 100644 (file)
--- a/src/conftest/suiteb/13.2.4/dut.conf
+++ b/src/conftest/suiteb/13.2.4/dut.conf
@@ -10,16 +10,11 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
                lid = dut.256-384.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/13.2.4/test.conf b/src/conftest/suiteb/13.2.4/test.conf
index d4c4969dbcaac4ef1ca37c36c29d97ed8b0883e7..cbfb6985915779889a6255554be19340f0fcb886 100644 (file)
--- a/src/conftest/suiteb/13.2.4/test.conf
+++ b/src/conftest/suiteb/13.2.4/test.conf
@@ -8,21 +8,16 @@ hooks {
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
                rid = dut.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/14.1.1/dut.conf b/src/conftest/suiteb/14.1.1/dut.conf
index 15f53112a03dc6ba5f31405947d1f080834a8a7b..6bde0c17a92728195b73503357e84801f1e0fde9 100644 (file)
--- a/src/conftest/suiteb/14.1.1/dut.conf
+++ b/src/conftest/suiteb/14.1.1/dut.conf
@@ -1,22 +1,16 @@
 
 actions {
        initiate {
-               config = child-192
+               config = child-v4
        }
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/14.1.1/test.conf b/src/conftest/suiteb/14.1.1/test.conf
index 87ae57c31b8f5d6ca57c6f0e2f262ca1d1a1f57d..26d06e72cbd01c8ffe477c81391a70f66ddc639c 100644 (file)
--- a/src/conftest/suiteb/14.1.1/test.conf
+++ b/src/conftest/suiteb/14.1.1/test.conf
@@ -7,17 +7,11 @@ hooks {
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/14.1.2/dut.conf b/src/conftest/suiteb/14.1.2/dut.conf
index 2f3e051a035fa9f26057360fb0981285f33f69bc..9c9031e2c3f75f7fa7cf2cca4d6acbf23a5f1776 100644 (file)
--- a/src/conftest/suiteb/14.1.2/dut.conf
+++ b/src/conftest/suiteb/14.1.2/dut.conf
@@ -1,22 +1,17 @@
 
 actions {
        initiate {
-               config = child-192
+               config = child-v4
        }
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
                rid = ls.256-384.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/14.1.2/test.conf b/src/conftest/suiteb/14.1.2/test.conf
index 29ed3c3304fda70c87e974ba80eb2853993596f0..1768c1cd379f4b12030ec50e0d464430d91ddb97 100644 (file)
--- a/src/conftest/suiteb/14.1.2/test.conf
+++ b/src/conftest/suiteb/14.1.2/test.conf
@@ -17,17 +17,12 @@ certs {
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.256-384.strongswan.org
-               rid = dut.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/14.2.1/dut.conf b/src/conftest/suiteb/14.2.1/dut.conf
index dc724b198213d31deffb04c0fb81fe8b5caf9d66..6eb6e4c6bba112cbd71a6150cf88272940704543 100644 (file)
--- a/src/conftest/suiteb/14.2.1/dut.conf
+++ b/src/conftest/suiteb/14.2.1/dut.conf
@@ -1,16 +1,10 @@
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/14.2.1/test.conf b/src/conftest/suiteb/14.2.1/test.conf
index d93845fec537f03c0a9fd46d49402257e36cd08a..b3f93ac956d3ba10075dc97a97f576f247099c7f 100644 (file)
--- a/src/conftest/suiteb/14.2.1/test.conf
+++ b/src/conftest/suiteb/14.2.1/test.conf
@@ -8,22 +8,16 @@ hooks {
 
 actions {
        initiate {
-               config = child-192
+               config = child-v4
        }
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/14.2.2/dut.conf b/src/conftest/suiteb/14.2.2/dut.conf
index 220e7127d49a48c915a1163a7420025152ce586c..273df06ffaeb26e0fa8454f4b78238d6b50d13c9 100644 (file)
--- a/src/conftest/suiteb/14.2.2/dut.conf
+++ b/src/conftest/suiteb/14.2.2/dut.conf
@@ -1,16 +1,11 @@
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
                rid = ls.256-384.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/14.2.2/test.conf b/src/conftest/suiteb/14.2.2/test.conf
index b7ab27b0419246e9a3426ec2dbccd85521f30e4c..c24b9f055baa25e0ecbc10493fa9c12362537869 100644 (file)
--- a/src/conftest/suiteb/14.2.2/test.conf
+++ b/src/conftest/suiteb/14.2.2/test.conf
@@ -8,7 +8,7 @@ hooks {
 
 actions {
        initiate {
-               config = child-192
+               config = child-v4
        }
 }
 
@@ -23,17 +23,12 @@ certs {
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.256-384.strongswan.org
-               rid = dut.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.1.1/dut.conf b/src/conftest/suiteb/15.1.1/dut.conf
index 08ad71d87853cbc3feff05ed1b79056f14eea4d5..e634752ceb27eb1142e75c9a792f715c728274c7 100644 (file)
--- a/src/conftest/suiteb/15.1.1/dut.conf
+++ b/src/conftest/suiteb/15.1.1/dut.conf
@@ -1,7 +1,7 @@
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
@@ -16,16 +16,12 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
                lid = dut.256-384.strongswan.org
                rid = ls.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.1.1/test.conf b/src/conftest/suiteb/15.1.1/test.conf
index ef554a9c5d2ed652010ae65fe5199140c13496ae..6b81b7bc13bbe2f9183f9a7f4591397324830041 100644 (file)
--- a/src/conftest/suiteb/15.1.1/test.conf
+++ b/src/conftest/suiteb/15.1.1/test.conf
@@ -17,16 +17,12 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.256-384.strongswan.org
                rid = dut.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.1.2/dut.conf b/src/conftest/suiteb/15.1.2/dut.conf
index 076a70cd68d561ee49d0ebbb56df7114d2781225..7e65772cdf35cccd20bbe01c4139374d898dcdc1 100644 (file)
--- a/src/conftest/suiteb/15.1.2/dut.conf
+++ b/src/conftest/suiteb/15.1.2/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.1.2/test.conf b/src/conftest/suiteb/15.1.2/test.conf
index b6efe73d8a02a9cb8f821c199f95b21f4c77765b..2488248cac2d16fb73a2fdecef49e78d92c3c562 100644 (file)
--- a/src/conftest/suiteb/15.1.2/test.conf
+++ b/src/conftest/suiteb/15.1.2/test.conf
@@ -7,16 +7,10 @@ hooks {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.1.3/dut.conf b/src/conftest/suiteb/15.1.3/dut.conf
index 7638f4e37dcca1d18f734d709b89cd5966cc435e..ddee33c2577733e8d1a7ae0551688f05d6cdec55 100644 (file)
--- a/src/conftest/suiteb/15.1.3/dut.conf
+++ b/src/conftest/suiteb/15.1.3/dut.conf
@@ -1,21 +1,16 @@
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
                rid = ls.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.1.3/test.conf b/src/conftest/suiteb/15.1.3/test.conf
index 1fdb2707eda8994b8da98c57ca0274ffee0eed8a..a2e99537cad7949d12240a0cd2d9f2286b2bab41 100644 (file)
--- a/src/conftest/suiteb/15.1.3/test.conf
+++ b/src/conftest/suiteb/15.1.3/test.conf
@@ -17,16 +17,11 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.256-384.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.1.4/dut.conf b/src/conftest/suiteb/15.1.4/dut.conf
index f06563ce7db333bde5a1f6656d26c572a5a5047d..d093b7ed1bb865326b96225f08def2e1b4a91086 100644 (file)
--- a/src/conftest/suiteb/15.1.4/dut.conf
+++ b/src/conftest/suiteb/15.1.4/dut.conf
@@ -1,7 +1,7 @@
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
@@ -16,16 +16,11 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
                lid = dut.256-384.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.1.4/test.conf b/src/conftest/suiteb/15.1.4/test.conf
index 9e30491d2c74ab83f81c80f50ada73cc2d35d801..4b441c528ef2e8ebb01a7626bce91d8c910e8a09 100644 (file)
--- a/src/conftest/suiteb/15.1.4/test.conf
+++ b/src/conftest/suiteb/15.1.4/test.conf
@@ -7,16 +7,11 @@ hooks {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
                rid = dut.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.2.1/dut.conf b/src/conftest/suiteb/15.2.1/dut.conf
index 68e682fc9c9cc3ded474ee02125f389e92d375cc..cdb022f764cdf6ac797e3fab265c50bc0af44b9f 100644 (file)
--- a/src/conftest/suiteb/15.2.1/dut.conf
+++ b/src/conftest/suiteb/15.2.1/dut.conf
@@ -10,16 +10,12 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
                lid = dut.256-384.strongswan.org
                rid = ls.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.2.1/test.conf b/src/conftest/suiteb/15.2.1/test.conf
index f73ed5b0fa9b2ae6759dbd3c9fc6746b65c226ef..c294cb6adebaf51dee06b35eb2d785cdc4545480 100644 (file)
--- a/src/conftest/suiteb/15.2.1/test.conf
+++ b/src/conftest/suiteb/15.2.1/test.conf
@@ -8,7 +8,7 @@ hooks {
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
@@ -23,16 +23,12 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.256-384.strongswan.org
                rid = dut.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.2.2/dut.conf b/src/conftest/suiteb/15.2.2/dut.conf
index fb146951551ff41d6cf01556d9a51c7ecdd214a5..793a57d5b93fa376141df87f04015821c027350d 100644 (file)
--- a/src/conftest/suiteb/15.2.2/dut.conf
+++ b/src/conftest/suiteb/15.2.2/dut.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.2.2/test.conf b/src/conftest/suiteb/15.2.2/test.conf
index 0ba3a6240554739c75e9ba3a2f809045acd78189..c25693f47dc426d90f1e423453110d93f17d8064 100644 (file)
--- a/src/conftest/suiteb/15.2.2/test.conf
+++ b/src/conftest/suiteb/15.2.2/test.conf
@@ -8,21 +8,15 @@ hooks {
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.2.3/dut.conf b/src/conftest/suiteb/15.2.3/dut.conf
index 22ec76634c1b5fa651924711514cc83dfe53096e..022a1d226691d85d4b817273be39378ea2e89300 100644 (file)
--- a/src/conftest/suiteb/15.2.3/dut.conf
+++ b/src/conftest/suiteb/15.2.3/dut.conf
@@ -1,15 +1,10 @@
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
                rid = ls.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.2.3/test.conf b/src/conftest/suiteb/15.2.3/test.conf
index 4af5f3052038f48d636418a432fc87b7b5a641b7..6466dba238150d9815ba27cd779d53453fc02056 100644 (file)
--- a/src/conftest/suiteb/15.2.3/test.conf
+++ b/src/conftest/suiteb/15.2.3/test.conf
@@ -8,7 +8,7 @@ hooks {
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
@@ -23,16 +23,11 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.256-384.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.2.4/dut.conf b/src/conftest/suiteb/15.2.4/dut.conf
index b9796d726ed3b00db463745c00248f646a978696..3e6bc81b94f55025bc2a00cea1c365918cd53455 100644 (file)
--- a/src/conftest/suiteb/15.2.4/dut.conf
+++ b/src/conftest/suiteb/15.2.4/dut.conf
@@ -10,16 +10,11 @@ certs {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
                lid = dut.256-384.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/15.2.4/test.conf b/src/conftest/suiteb/15.2.4/test.conf
index c244cb6937306bcf2b0ad19425a73d3afe089afd..0dd1c4390732e536185eff83503aeab289946c7c 100644 (file)
--- a/src/conftest/suiteb/15.2.4/test.conf
+++ b/src/conftest/suiteb/15.2.4/test.conf
@@ -8,21 +8,16 @@ hooks {
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
                rid = dut.256-384.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/16.1.1/dut.conf b/src/conftest/suiteb/16.1.1/dut.conf
index 15f53112a03dc6ba5f31405947d1f080834a8a7b..6bde0c17a92728195b73503357e84801f1e0fde9 100644 (file)
--- a/src/conftest/suiteb/16.1.1/dut.conf
+++ b/src/conftest/suiteb/16.1.1/dut.conf
@@ -1,22 +1,16 @@
 
 actions {
        initiate {
-               config = child-192
+               config = child-v4
        }
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/16.1.1/test.conf b/src/conftest/suiteb/16.1.1/test.conf
index 87ae57c31b8f5d6ca57c6f0e2f262ca1d1a1f57d..26d06e72cbd01c8ffe477c81391a70f66ddc639c 100644 (file)
--- a/src/conftest/suiteb/16.1.1/test.conf
+++ b/src/conftest/suiteb/16.1.1/test.conf
@@ -7,17 +7,11 @@ hooks {
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/16.1.2/dut.conf b/src/conftest/suiteb/16.1.2/dut.conf
index 2f3e051a035fa9f26057360fb0981285f33f69bc..9c9031e2c3f75f7fa7cf2cca4d6acbf23a5f1776 100644 (file)
--- a/src/conftest/suiteb/16.1.2/dut.conf
+++ b/src/conftest/suiteb/16.1.2/dut.conf
@@ -1,22 +1,17 @@
 
 actions {
        initiate {
-               config = child-192
+               config = child-v4
        }
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
                rid = ls.256-384.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/16.1.2/test.conf b/src/conftest/suiteb/16.1.2/test.conf
index 29ed3c3304fda70c87e974ba80eb2853993596f0..1768c1cd379f4b12030ec50e0d464430d91ddb97 100644 (file)
--- a/src/conftest/suiteb/16.1.2/test.conf
+++ b/src/conftest/suiteb/16.1.2/test.conf
@@ -17,17 +17,12 @@ certs {
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.256-384.strongswan.org
-               rid = dut.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/16.2.1/dut.conf b/src/conftest/suiteb/16.2.1/dut.conf
index dc724b198213d31deffb04c0fb81fe8b5caf9d66..6eb6e4c6bba112cbd71a6150cf88272940704543 100644 (file)
--- a/src/conftest/suiteb/16.2.1/dut.conf
+++ b/src/conftest/suiteb/16.2.1/dut.conf
@@ -1,16 +1,10 @@
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/16.2.1/test.conf b/src/conftest/suiteb/16.2.1/test.conf
index d93845fec537f03c0a9fd46d49402257e36cd08a..b3f93ac956d3ba10075dc97a97f576f247099c7f 100644 (file)
--- a/src/conftest/suiteb/16.2.1/test.conf
+++ b/src/conftest/suiteb/16.2.1/test.conf
@@ -8,22 +8,16 @@ hooks {
 
 actions {
        initiate {
-               config = child-192
+               config = child-v4
        }
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/16.2.2/dut.conf b/src/conftest/suiteb/16.2.2/dut.conf
index 220e7127d49a48c915a1163a7420025152ce586c..273df06ffaeb26e0fa8454f4b78238d6b50d13c9 100644 (file)
--- a/src/conftest/suiteb/16.2.2/dut.conf
+++ b/src/conftest/suiteb/16.2.2/dut.conf
@@ -1,16 +1,11 @@
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
                rid = ls.256-384.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/16.2.2/test.conf b/src/conftest/suiteb/16.2.2/test.conf
index b7ab27b0419246e9a3426ec2dbccd85521f30e4c..c24b9f055baa25e0ecbc10493fa9c12362537869 100644 (file)
--- a/src/conftest/suiteb/16.2.2/test.conf
+++ b/src/conftest/suiteb/16.2.2/test.conf
@@ -8,7 +8,7 @@ hooks {
 
 actions {
        initiate {
-               config = child-192
+               config = child-v4
        }
 }
 
@@ -23,17 +23,12 @@ certs {
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
                lid = ls.256-384.strongswan.org
-               rid = dut.strongswan.org
                ecdsa_strength = 384
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/17.1.1/dut.conf b/src/conftest/suiteb/17.1.1/dut.conf
index bd2c815d0c948b716434dea3fd1c121b36a3c524..fe77aa8861452a1975ade4e20bffcc579bef82ee 100644 (file)
--- a/src/conftest/suiteb/17.1.1/dut.conf
+++ b/src/conftest/suiteb/17.1.1/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/17.1.1/test.conf b/src/conftest/suiteb/17.1.1/test.conf
index 2cca112366c1f18d71ed890de499b102f11db1e3..7112bd59ce8096bd8e5d40e01eb4d3f278da1236 100644 (file)
--- a/src/conftest/suiteb/17.1.1/test.conf
+++ b/src/conftest/suiteb/17.1.1/test.conf
@@ -5,16 +5,10 @@ hooks {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/17.1.2/dut.conf b/src/conftest/suiteb/17.1.2/dut.conf
index fd97c709a2b3fcf0099be5dc5ea81c06f0bc2a42..f28093255a86ab9c802fb6c9dc3a82adca4d18c1 100644 (file)
--- a/src/conftest/suiteb/17.1.2/dut.conf
+++ b/src/conftest/suiteb/17.1.2/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-192
+               config = child-v4
        }
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/17.1.2/test.conf b/src/conftest/suiteb/17.1.2/test.conf
index 10ed96c63dcdec31766002a48f63bbc506f09b4f..2d9a6a77977768f7427150d59f56793c3347a801 100644 (file)
--- a/src/conftest/suiteb/17.1.2/test.conf
+++ b/src/conftest/suiteb/17.1.2/test.conf
@@ -5,16 +5,10 @@ hooks {
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/17.2.1/dut.conf b/src/conftest/suiteb/17.2.1/dut.conf
index 8716c77e1a09bb1042f2f338b47d63d50f1caebe..e4e3b1ab1996f59b74001968df1e0a7b07127d3f 100644 (file)
--- a/src/conftest/suiteb/17.2.1/dut.conf
+++ b/src/conftest/suiteb/17.2.1/dut.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/17.2.1/test.conf b/src/conftest/suiteb/17.2.1/test.conf
index 02aedb4af0d1e75361dc65a2c4d5b0d99c4f81f1..150823a8c40998be835734085b20c0b98065f8f5 100644 (file)
--- a/src/conftest/suiteb/17.2.1/test.conf
+++ b/src/conftest/suiteb/17.2.1/test.conf
@@ -6,21 +6,15 @@ hooks {
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm8
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/17.2.2/dut.conf b/src/conftest/suiteb/17.2.2/dut.conf
index 7aac027bef5717082f6a8987c5025873ed12710f..d6995a1205a12ffd8ed0c4a039063b54df2e7939 100644 (file)
--- a/src/conftest/suiteb/17.2.2/dut.conf
+++ b/src/conftest/suiteb/17.2.2/dut.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/17.2.2/test.conf b/src/conftest/suiteb/17.2.2/test.conf
index 2d15ad537c7453e04654dd1cec1d9c76c0d7c3e3..c4f8f31627f8fc68a26b074850d05a0c93b8920d 100644 (file)
--- a/src/conftest/suiteb/17.2.2/test.conf
+++ b/src/conftest/suiteb/17.2.2/test.conf
@@ -6,21 +6,15 @@ hooks {
 
 actions {
        initiate {
-               config = child-192
+               config = child-v4
        }
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm8
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/18.1.1/dut.conf b/src/conftest/suiteb/18.1.1/dut.conf
index 076a70cd68d561ee49d0ebbb56df7114d2781225..7e65772cdf35cccd20bbe01c4139374d898dcdc1 100644 (file)
--- a/src/conftest/suiteb/18.1.1/dut.conf
+++ b/src/conftest/suiteb/18.1.1/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/18.1.1/test.conf b/src/conftest/suiteb/18.1.1/test.conf
index e13a4b05edebd90c6bfd9ae3567044cfe19becaf..5c9c245622856813918fbfb0be68928058821283 100644 (file)
--- a/src/conftest/suiteb/18.1.1/test.conf
+++ b/src/conftest/suiteb/18.1.1/test.conf
@@ -5,16 +5,10 @@ hooks {
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/18.1.2/dut.conf b/src/conftest/suiteb/18.1.2/dut.conf
index fdb5ba0b26d21817fba981445b2fd58a4fb0ad07..8634f966388750e099fa34bcd22a496af0ed2ee8 100644 (file)
--- a/src/conftest/suiteb/18.1.2/dut.conf
+++ b/src/conftest/suiteb/18.1.2/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-192
+               config = child-v4
        }
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-192 {
+               child-v4 {
                        proposal = aes256gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/18.1.2/test.conf b/src/conftest/suiteb/18.1.2/test.conf
index a6702b1813dc483064cd8b503ce0a8b624c46a42..7cfa2e426284e172c459b6c0e2b291c31476f50c 100644 (file)
--- a/src/conftest/suiteb/18.1.2/test.conf
+++ b/src/conftest/suiteb/18.1.2/test.conf
@@ -5,16 +5,10 @@ hooks {
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-192 {
+               child-v4 {
                        proposal = aes256gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/18.2.1/dut.conf b/src/conftest/suiteb/18.2.1/dut.conf
index fb146951551ff41d6cf01556d9a51c7ecdd214a5..793a57d5b93fa376141df87f04015821c027350d 100644 (file)
--- a/src/conftest/suiteb/18.2.1/dut.conf
+++ b/src/conftest/suiteb/18.2.1/dut.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/18.2.1/test.conf b/src/conftest/suiteb/18.2.1/test.conf
index 02aedb4af0d1e75361dc65a2c4d5b0d99c4f81f1..150823a8c40998be835734085b20c0b98065f8f5 100644 (file)
--- a/src/conftest/suiteb/18.2.1/test.conf
+++ b/src/conftest/suiteb/18.2.1/test.conf
@@ -6,21 +6,15 @@ hooks {
 
 actions {
        initiate {
-               config = child-128
+               config = child-v4
        }
 }
 
 configs {
-       ike-128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-128 {
+               child-v4 {
                        proposal = aes128gcm8
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/18.2.2/dut.conf b/src/conftest/suiteb/18.2.2/dut.conf
index e629e1899bb4862ed73f0a4b64d977a5ec608b50..40869adfcb23a142a5dce5812b8d04911673c75d 100644 (file)
--- a/src/conftest/suiteb/18.2.2/dut.conf
+++ b/src/conftest/suiteb/18.2.2/dut.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-192 {
+               child-v4 {
                        proposal = aes256gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/18.2.2/test.conf b/src/conftest/suiteb/18.2.2/test.conf
index 2d15ad537c7453e04654dd1cec1d9c76c0d7c3e3..c4f8f31627f8fc68a26b074850d05a0c93b8920d 100644 (file)
--- a/src/conftest/suiteb/18.2.2/test.conf
+++ b/src/conftest/suiteb/18.2.2/test.conf
@@ -6,21 +6,15 @@ hooks {
 
 actions {
        initiate {
-               config = child-192
+               config = child-v4
        }
 }
 
 configs {
-       ike-192 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-192 {
+               child-v4 {
                        proposal = aes256gcm8
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/19.2.2/dut.conf b/src/conftest/suiteb/19.2.2/dut.conf
index 9caf16441c3fc149fba8769ca6a74fe866c50c41..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/src/conftest/suiteb/19.2.2/dut.conf
+++ b/src/conftest/suiteb/19.2.2/dut.conf
@@ -1,14 +0,0 @@
-
-configs {
-       ike-ipv6 {
-               proposal = aes128-sha1-modp1024
-               lhost = 2001:0db8:aaaa:bbbb::0010
-               rhost = 2001:0db8:aaaa:bbbb::0020
-               lid = 2001:0db8:aaaa:bbbb::0010
-               rid = 2001:0db8:aaaa:bbbb::0020
-               child-ipv6 {
-                       lts = 2001:0db8:face:0010::/64
-                       rts = 2001:0db8:face:0020::/64
-               }
-       }
-}

diff --git a/src/conftest/suiteb/19.2.2/test.conf b/src/conftest/suiteb/19.2.2/test.conf
index 8865e2edd4c3b67e4fff5a7959b7c686016a4c35..c18401957d487d5691fb34143fd0a9253a5a576b 100644 (file)
--- a/src/conftest/suiteb/19.2.2/test.conf
+++ b/src/conftest/suiteb/19.2.2/test.conf
@@ -1,20 +1,6 @@
 
 actions {
        initiate {
-               config = child-ipv6
-       }
-}
-
-configs {
-       ike-ipv6 {
-               proposal = aes128-sha1-modp1024
-               lhost = 2001:0db8:aaaa:bbbb::0020
-               rhost = 2001:0db8:aaaa:bbbb::0010
-               lid = 2001:0db8:aaaa:bbbb::0020
-               rid = 2001:0db8:aaaa:bbbb::0010
-               child-ipv6 {
-                       lts = 2001:0db8:face:0020::/64
-                       rts = 2001:0db8:face:0010::/64
-               }
+               config = child-v6
        }
 }

diff --git a/src/conftest/suiteb/19.6.1/test.conf b/src/conftest/suiteb/19.6.1/test.conf
index 3567108d03ea88ccf8ee3f5a3d6e96a9108daecb..c812b11e83144d4a6691d77f7d6a28cd8d3db83d 100644 (file)
--- a/src/conftest/suiteb/19.6.1/test.conf
+++ b/src/conftest/suiteb/19.6.1/test.conf
@@ -1,22 +1,15 @@
 
 configs {
-       ike-tfc {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-tfc {
+       ike-v4 {
+               child-v4 {
                        # ~20 bytes, for a 64 byte ICMP ping
                        tfc_padding = 100
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }
 
 actions {
        initiate {
-               config = child-tfc
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/19.6.2/test.conf b/src/conftest/suiteb/19.6.2/test.conf
index dbfdbbc7ba424df7a479db85fc7dbf3a601834df..55737bf16145ce2d82fe9fc6d39a3ab458ab09d2 100644 (file)
--- a/src/conftest/suiteb/19.6.2/test.conf
+++ b/src/conftest/suiteb/19.6.2/test.conf
@@ -1,22 +1,15 @@
 
 configs {
-       ike-tfc {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-tfc {
+       ike-v4 {
+               child-v4 {
                        # ~100 bytes, for a 64 byte ICMP ping
                        tfc_padding = 180
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }
 
 actions {
        initiate {
-               config = child-tfc
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/20.1.1/dut.conf b/src/conftest/suiteb/20.1.1/dut.conf
index 4c0c2d27cdc6fad46094c7ece6caf9ba05e46254..303b3869d5e260cd9d979f8e1dcb9c68e7080e59 100644 (file)
--- a/src/conftest/suiteb/20.1.1/dut.conf
+++ b/src/conftest/suiteb/20.1.1/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-foo {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls-bitchanged.strongswan.org
-               child-foo {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/20.1.1/test.conf b/src/conftest/suiteb/20.1.1/test.conf
index a912643d2d07c6987975bc961cae5298356febe3..3e9d96a9f9f7a51d1485bd3d7a7aeb86fb8dfedd 100644 (file)
--- a/src/conftest/suiteb/20.1.1/test.conf
+++ b/src/conftest/suiteb/20.1.1/test.conf
@@ -7,21 +7,13 @@ certs {
 
 
 configs {
-       ike-bitchanged {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls-bitchanged.strongswan.org
-               rid = dut.strongswan.org
-               child-bitchanged {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-bitchanged
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/20.2.1/dut.conf b/src/conftest/suiteb/20.2.1/dut.conf
index 7f41a2977c41a43d4bb09854412404270733802c..20dd738741f962eba2aeae8b9886968a235ecba9 100644 (file)
--- a/src/conftest/suiteb/20.2.1/dut.conf
+++ b/src/conftest/suiteb/20.2.1/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-foo {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls-expired.strongswan.org
-               child-foo {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/20.2.1/test.conf b/src/conftest/suiteb/20.2.1/test.conf
index 4acf4fc69b5962d367415327a729efad35806224..fda6e63fb0e7d7c40f6d2aaddce9671f3b2b8834 100644 (file)
--- a/src/conftest/suiteb/20.2.1/test.conf
+++ b/src/conftest/suiteb/20.2.1/test.conf
@@ -7,21 +7,13 @@ certs {
 
 
 configs {
-       ike-expired {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls-expired.strongswan.org
-               rid = dut.strongswan.org
-               child-expired {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-expired
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/21.2.1/dut.conf b/src/conftest/suiteb/21.2.1/dut.conf
index 41b02bcbf5f113ed9e9de512672f5e21de47e17c..acf3eea0d60db676fe310cf854bec974f7e8b0b7 100644 (file)
--- a/src/conftest/suiteb/21.2.1/dut.conf
+++ b/src/conftest/suiteb/21.2.1/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-ica384 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls-ica384.strongswan.org
-               child-ica384 {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/21.2.1/test.conf b/src/conftest/suiteb/21.2.1/test.conf
index d15877ca017c43155f135d795a10c566426fc113..15c77ea86c95f6f5d0cf915110f0eb2e9800b492 100644 (file)
--- a/src/conftest/suiteb/21.2.1/test.conf
+++ b/src/conftest/suiteb/21.2.1/test.conf
@@ -7,21 +7,13 @@ certs {
 
 
 configs {
-       ike-ica384 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls-ica384.strongswan.org
-               rid = dut.strongswan.org
-               child-ica384 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-ica384
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/21.2.2/dut.conf b/src/conftest/suiteb/21.2.2/dut.conf
index ad3e4a2c571c2856f51f4ff26338be9b0db3aea3..480ab2095a26715c8f2163f7bc1f986a974cb900 100644 (file)
--- a/src/conftest/suiteb/21.2.2/dut.conf
+++ b/src/conftest/suiteb/21.2.2/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-ca3 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls-ca3.strongswan.org
-               child-ca3 {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/21.2.2/test.conf b/src/conftest/suiteb/21.2.2/test.conf
index e0430792d482e864c550b8ba2abcfb52b0ff74aa..531bab2bd5b6338d3474e904c415ab77a60323c8 100644 (file)
--- a/src/conftest/suiteb/21.2.2/test.conf
+++ b/src/conftest/suiteb/21.2.2/test.conf
@@ -7,21 +7,13 @@ certs {
 }
 
 configs {
-       ike-ca3 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls-ca3.strongswan.org
-               rid = dut.strongswan.org
-               child-ca3 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-ca3
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/21.3.1/dut.conf b/src/conftest/suiteb/21.3.1/dut.conf
index bb55ba64837caa95376ffdead3e823e1dd1ae0fd..cceb74c794defe8bc2cc08e5cb846abeba64706e 100644 (file)
--- a/src/conftest/suiteb/21.3.1/dut.conf
+++ b/src/conftest/suiteb/21.3.1/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-foo {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = foo.example.com
-               child-foo {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/21.3.1/test.conf b/src/conftest/suiteb/21.3.1/test.conf
index e8f21d106c864caa74360b471bc32fa73adbc9ae..5717af89ebce2188cda97c586209527c411ca7f9 100644 (file)
--- a/src/conftest/suiteb/21.3.1/test.conf
+++ b/src/conftest/suiteb/21.3.1/test.conf
@@ -7,21 +7,13 @@ certs {
 }
 
 configs {
-       ike-foo {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = foo.example.com
-               rid = dut.strongswan.org
-               child-foo {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-foo
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/21.3.2/dut.conf b/src/conftest/suiteb/21.3.2/dut.conf
index 5f069cd518c71f3ca1b4b8bbf479990d6b16fe37..c3445eefa6f08ce1f1e1dd12f8c75cd008e78761 100644 (file)
--- a/src/conftest/suiteb/21.3.2/dut.conf
+++ b/src/conftest/suiteb/21.3.2/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-foo {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = foo.example.net
-               child-foo {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/21.3.2/test.conf b/src/conftest/suiteb/21.3.2/test.conf
index b91f617a0f1de82fd0d964a1a324d9f700a8a30f..b02cc24680e4e9cc9c0e5d77fa9fce000b3f7c9b 100644 (file)
--- a/src/conftest/suiteb/21.3.2/test.conf
+++ b/src/conftest/suiteb/21.3.2/test.conf
@@ -7,21 +7,13 @@ certs {
 }
 
 configs {
-       ike-foo {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = foo.example.net
-               rid = dut.strongswan.org
-               child-foo {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-foo
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/21.3.3/dut.conf b/src/conftest/suiteb/21.3.3/dut.conf
index 5f069cd518c71f3ca1b4b8bbf479990d6b16fe37..c3445eefa6f08ce1f1e1dd12f8c75cd008e78761 100644 (file)
--- a/src/conftest/suiteb/21.3.3/dut.conf
+++ b/src/conftest/suiteb/21.3.3/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-foo {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = foo.example.net
-               child-foo {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/21.3.3/test.conf b/src/conftest/suiteb/21.3.3/test.conf
index eb36af91e0e063c4c449ca766a4d835b636ba843..5aae4779e1aaad53db4dd12ea3e65f2e193e223b 100644 (file)
--- a/src/conftest/suiteb/21.3.3/test.conf
+++ b/src/conftest/suiteb/21.3.3/test.conf
@@ -8,21 +8,13 @@ certs {
 }
 
 configs {
-       ike-foo {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = foo.example.net
-               rid = dut.strongswan.org
-               child-foo {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-foo
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/21.4.1/dut.conf b/src/conftest/suiteb/21.4.1/dut.conf
index 7fd08601cd7f739175003d89e60ed471c5489275..d7de7a5b358baf3a370706f0dd5cd8e5f96f0935 100644 (file)
--- a/src/conftest/suiteb/21.4.1/dut.conf
+++ b/src/conftest/suiteb/21.4.1/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-ca2 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls-ca2.strongswan.org
-               child-ca2 {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/21.4.1/test.conf b/src/conftest/suiteb/21.4.1/test.conf
index 04b04e6da77d0ae9ddd9f5a7a4298509c9984198..99d0acc29a757ef9d398203bc2bb43861a473d48 100644 (file)
--- a/src/conftest/suiteb/21.4.1/test.conf
+++ b/src/conftest/suiteb/21.4.1/test.conf
@@ -7,21 +7,13 @@ certs {
 }
 
 configs {
-       ike-ca2 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls-ca2.strongswan.org
-               rid = dut.strongswan.org
-               child-ca2 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-ca2
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/21.4.2/dut.conf b/src/conftest/suiteb/21.4.2/dut.conf
index ad3e4a2c571c2856f51f4ff26338be9b0db3aea3..480ab2095a26715c8f2163f7bc1f986a974cb900 100644 (file)
--- a/src/conftest/suiteb/21.4.2/dut.conf
+++ b/src/conftest/suiteb/21.4.2/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-ca3 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls-ca3.strongswan.org
-               child-ca3 {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/21.4.2/test.conf b/src/conftest/suiteb/21.4.2/test.conf
index 951dd8aa1d9c47d64046b2bfd422451dece5302e..d5839bd29be766e567273f68a6785b5b8cd20ee2 100644 (file)
--- a/src/conftest/suiteb/21.4.2/test.conf
+++ b/src/conftest/suiteb/21.4.2/test.conf
@@ -8,21 +8,13 @@ certs {
 }
 
 configs {
-       ike-ca3 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls-ca3.strongswan.org
-               rid = dut.strongswan.org
-               child-ca3 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-ca3
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/21.5.1/dut.conf b/src/conftest/suiteb/21.5.1/dut.conf
index 7fd08601cd7f739175003d89e60ed471c5489275..d7de7a5b358baf3a370706f0dd5cd8e5f96f0935 100644 (file)
--- a/src/conftest/suiteb/21.5.1/dut.conf
+++ b/src/conftest/suiteb/21.5.1/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-ca2 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls-ca2.strongswan.org
-               child-ca2 {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/21.5.1/test.conf b/src/conftest/suiteb/21.5.1/test.conf
index 0f71f5ff0c75345bcea43184d011d33ab8984861..73ff328e57d8b7538318cc53c1fca2bfaebc73da 100644 (file)
--- a/src/conftest/suiteb/21.5.1/test.conf
+++ b/src/conftest/suiteb/21.5.1/test.conf
@@ -7,21 +7,13 @@ certs {
 }
 
 configs {
-       ike-ca2 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls-ca2.strongswan.org
-               rid = dut.strongswan.org
-               child-ca2 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-ca2
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/21.5.2/dut.conf b/src/conftest/suiteb/21.5.2/dut.conf
index ad3e4a2c571c2856f51f4ff26338be9b0db3aea3..480ab2095a26715c8f2163f7bc1f986a974cb900 100644 (file)
--- a/src/conftest/suiteb/21.5.2/dut.conf
+++ b/src/conftest/suiteb/21.5.2/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-ca3 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls-ca3.strongswan.org
-               child-ca3 {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/21.5.2/test.conf b/src/conftest/suiteb/21.5.2/test.conf
index a05d670c3f9a9fae873040d0eaecfab00b9b5b02..379ff57259b38926da45a8a55779bdc7ae257751 100644 (file)
--- a/src/conftest/suiteb/21.5.2/test.conf
+++ b/src/conftest/suiteb/21.5.2/test.conf
@@ -8,21 +8,13 @@ certs {
 }
 
 configs {
-       ike-ca3 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls-ca3.strongswan.org
-               rid = dut.strongswan.org
-               child-ca3 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-ca3
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/22.2.1/dut.conf b/src/conftest/suiteb/22.2.1/dut.conf
index 72a9d9342387bd70bf884ba5486ccf667e0b7ed4..12a46271fd2a6603aee6d1f7822bb2b3727f1d75 100644 (file)
--- a/src/conftest/suiteb/22.2.1/dut.conf
+++ b/src/conftest/suiteb/22.2.1/dut.conf
@@ -6,16 +6,8 @@ certs {
 }
 
 configs {
-       ike-pol {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls-pol.strongswan.org
                cert_policy = 1.2.34.567
-               child-pol {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/22.2.1/test.conf b/src/conftest/suiteb/22.2.1/test.conf
index daee2c389c202d1db481b446c5342f5b8218fdef..fb99c6ba5516541e1ba0c03ec2b34fd9a33e893b 100644 (file)
--- a/src/conftest/suiteb/22.2.1/test.conf
+++ b/src/conftest/suiteb/22.2.1/test.conf
@@ -9,21 +9,13 @@ certs {
 }
 
 configs {
-       ike-pol {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls-pol.strongswan.org
-               rid = dut.strongswan.org
-               child-pol {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-pol
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/22.2.2/dut.conf b/src/conftest/suiteb/22.2.2/dut.conf
index 568377b0dbbe77f2e045e137a9e4e5654c79c8ab..e67bc713696c65e6d0399f66cebfbaf80f2be348 100644 (file)
--- a/src/conftest/suiteb/22.2.2/dut.conf
+++ b/src/conftest/suiteb/22.2.2/dut.conf
@@ -6,16 +6,8 @@ certs {
 }
 
 configs {
-       ike-pol {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls-pol.strongswan.org
                cert_policy = 1.2.34.567
-               child-pol {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/22.2.2/test.conf b/src/conftest/suiteb/22.2.2/test.conf
index daee2c389c202d1db481b446c5342f5b8218fdef..fb99c6ba5516541e1ba0c03ec2b34fd9a33e893b 100644 (file)
--- a/src/conftest/suiteb/22.2.2/test.conf
+++ b/src/conftest/suiteb/22.2.2/test.conf
@@ -9,21 +9,13 @@ certs {
 }
 
 configs {
-       ike-pol {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls-pol.strongswan.org
-               rid = dut.strongswan.org
-               child-pol {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-pol
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/22.2.3/dut.conf b/src/conftest/suiteb/22.2.3/dut.conf
index 043e48664f60829780d5eb031dd12d8867003bed..ab71b8b2b1bc77d00a889e3eb1e382dfddb47596 100644 (file)
--- a/src/conftest/suiteb/22.2.3/dut.conf
+++ b/src/conftest/suiteb/22.2.3/dut.conf
@@ -6,16 +6,8 @@ certs {
 }
 
 configs {
-       ike-pol {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls-pol.strongswan.org
                cert_policy = 1.2.34.568
-               child-pol {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/22.2.3/test.conf b/src/conftest/suiteb/22.2.3/test.conf
index fba9b0ce90986f4a9b36b5aee56182bde22048eb..447fae54800728fef90f9640cab70b5f48b34d83 100644 (file)
--- a/src/conftest/suiteb/22.2.3/test.conf
+++ b/src/conftest/suiteb/22.2.3/test.conf
@@ -9,21 +9,13 @@ certs {
 }
 
 configs {
-       ike-pol {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls-pol.strongswan.org
-               rid = dut.strongswan.org
-               child-pol {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-pol
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/22.3.1/dut.conf b/src/conftest/suiteb/22.3.1/dut.conf
index 7057992208ef9de9cb623b9aa1e55c1aff7fc32d..0d05df81abadc1eec98a1f2ca3cdbe70da8432a9 100644 (file)
--- a/src/conftest/suiteb/22.3.1/dut.conf
+++ b/src/conftest/suiteb/22.3.1/dut.conf
@@ -6,16 +6,8 @@ certs {
 }
 
 configs {
-       ike-pol {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls-pol.strongswan.org
                cert_policy = 1.2.34.5.2
-               child-pol {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/22.3.1/test.conf b/src/conftest/suiteb/22.3.1/test.conf
index 03433e7b4332c265b97ed15c3590de71c358e276..3f2000f1b081e5700225c677ec71b29c6b74088d 100644 (file)
--- a/src/conftest/suiteb/22.3.1/test.conf
+++ b/src/conftest/suiteb/22.3.1/test.conf
@@ -10,21 +10,13 @@ certs {
 }
 
 configs {
-       ike-pol {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls-pol.strongswan.org
-               rid = dut.strongswan.org
-               child-pol {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-pol
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/22.3.2/dut.conf b/src/conftest/suiteb/22.3.2/dut.conf
index f3a4661e7124c3ffa9e89dd61b0f8ca16aeb27e3..0b9b9de2c6d61c295915e4735b85a54f5458b1c4 100644 (file)
--- a/src/conftest/suiteb/22.3.2/dut.conf
+++ b/src/conftest/suiteb/22.3.2/dut.conf
@@ -6,16 +6,8 @@ certs {
 }
 
 configs {
-       ike-pol {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls-pol.strongswan.org
                cert_policy = 1.2.34.5.2
-               child-pol {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/22.3.2/test.conf b/src/conftest/suiteb/22.3.2/test.conf
index 3c52dcd5d2227a817bc5bc891dad10002ff8a757..6455e289ab37b049793fff1f38ef311cca587ec7 100644 (file)
--- a/src/conftest/suiteb/22.3.2/test.conf
+++ b/src/conftest/suiteb/22.3.2/test.conf
@@ -10,21 +10,13 @@ certs {
 }
 
 configs {
-       ike-pol {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls-pol.strongswan.org
-               rid = dut.strongswan.org
-               child-pol {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-pol
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.10.1/dut.conf b/src/conftest/suiteb/3.10.1/dut.conf
index ecdabfab5e4f82cdaf999fc54330e9dff403cdba..d659b1fe5dc848e4abca10517a4080190ef6f348 100644 (file)
--- a/src/conftest/suiteb/3.10.1/dut.conf
+++ b/src/conftest/suiteb/3.10.1/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-untrusted {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.untrusted.strongswan.org
-               child-untrusted {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/3.10.1/test.conf b/src/conftest/suiteb/3.10.1/test.conf
index acee0e01acd2bbbb6d0cc3e9edbd903044f4849e..5c88ca20273e63bb32123b8c3208fa09234f0486 100644 (file)
--- a/src/conftest/suiteb/3.10.1/test.conf
+++ b/src/conftest/suiteb/3.10.1/test.conf
@@ -6,21 +6,13 @@ certs {
 }
 
 configs {
-       ike-untrusted {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.untrusted.strongswan.org
-               rid = dut.strongswan.org
-               child-untrusted {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-untrusted
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.10.2/dut.conf b/src/conftest/suiteb/3.10.2/dut.conf
index 44f94f7b784f452685d8530ab345bdbd511fcfc3..5aff71ecb3f74da3c6d33a3700fa11e8ead76f66 100644 (file)
--- a/src/conftest/suiteb/3.10.2/dut.conf
+++ b/src/conftest/suiteb/3.10.2/dut.conf
@@ -1,14 +1,6 @@
 
 configs {
-       ike-untrusted {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.expired.strongswan.org
-               child-untrusted {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/3.10.2/test.conf b/src/conftest/suiteb/3.10.2/test.conf
index 8a739af38f41e7b6afa5523d9053fbd4882f9a49..05570f4c4d9a4ba849e484c0816a6eabbe519dd0 100644 (file)
--- a/src/conftest/suiteb/3.10.2/test.conf
+++ b/src/conftest/suiteb/3.10.2/test.conf
@@ -6,21 +6,13 @@ certs {
 }
 
 configs {
-       ike-expired {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.expired.strongswan.org
-               rid = dut.strongswan.org
-               child-expired {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-expired
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.10.3/dut.conf b/src/conftest/suiteb/3.10.3/dut.conf
index 0f3104e7610bc98581c6e15752b25b4b41652f2f..f6a65d0af6a11a5c12fed4216a01fe803799e4b6 100644 (file)
--- a/src/conftest/suiteb/3.10.3/dut.conf
+++ b/src/conftest/suiteb/3.10.3/dut.conf
@@ -6,15 +6,7 @@ certs {
 }
 
 configs {
-       ike-revoked {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.revoked.strongswan.org
-               child-revoked {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/3.10.3/test.conf b/src/conftest/suiteb/3.10.3/test.conf
index da4e894b5c25d21eaf96542e5f0f5b3b48688b30..f453501a52b297e3fc7bd35a97cd3d0e5c417375 100644 (file)
--- a/src/conftest/suiteb/3.10.3/test.conf
+++ b/src/conftest/suiteb/3.10.3/test.conf
@@ -6,21 +6,13 @@ certs {
 }
 
 configs {
-       ike-revoked {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.revoked.strongswan.org
-               rid = dut.strongswan.org
-               child-revoked {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-revoked
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.12.1/test.conf b/src/conftest/suiteb/3.12.1/test.conf
index 7f1e44cf19ca67d7da38f3abc5618cad91728724..248dbafde42b7045609537bd186117ff4ca11523 100644 (file)
--- a/src/conftest/suiteb/3.12.1/test.conf
+++ b/src/conftest/suiteb/3.12.1/test.conf
@@ -1,21 +1,14 @@
 
 configs {
-       ike-weak {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-weak {
+       ike-v4 {
+               child-v4 {
                        proposal = des-md5
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }
 
 actions {
        initiate {
-               config = child-weak
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.12.2/test.conf b/src/conftest/suiteb/3.12.2/test.conf
index 62ed6db865f8cd8ad8ed5239ff6f67f6bd4b3902..9cc2991a93fe4402aea96348d4ffbccee328205e 100644 (file)
--- a/src/conftest/suiteb/3.12.2/test.conf
+++ b/src/conftest/suiteb/3.12.2/test.conf
@@ -1,22 +1,15 @@
 
 configs {
-       ike-weak {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-weak {
+       ike-v4 {
+               child-v4 {
                        proposal = des-md5
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }
 
 actions {
        liveness {
-               config = ike-weak
+               config = ike-v4
                delay = 10
        }
 }

diff --git a/src/conftest/suiteb/3.20.1/dut.conf b/src/conftest/suiteb/3.20.1/dut.conf
index 3cd2d6e49b90bd757f2789f21cea555c4316aa01..04799b6aceb52d73ff34a472dea1616a51b624a2 100644 (file)
--- a/src/conftest/suiteb/3.20.1/dut.conf
+++ b/src/conftest/suiteb/3.20.1/dut.conf
@@ -1,20 +1,13 @@
 
 configs {
-       ike-rfc822 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
+       ike-v4 {
                lid = dut@strongswan.org
                rid = ls@strongswan.org
-               child-rfc822 {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-rfc822
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/3.20.1/test.conf b/src/conftest/suiteb/3.20.1/test.conf
index 4d8a52db85e2d95483f9dd62ff0cda09bcec55d8..f20658c9df767bf49377fa897e01489fca699659 100644 (file)
--- a/src/conftest/suiteb/3.20.1/test.conf
+++ b/src/conftest/suiteb/3.20.1/test.conf
@@ -5,15 +5,8 @@ hooks {
 }
 
 configs {
-       ike-rfc822 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls@strongswan.org
                rid = dut@strongswan.org
-               child-rfc822 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/3.21.1/dut.conf b/src/conftest/suiteb/3.21.1/dut.conf
index beb32ec61e5c09396f60f08994c2e204ec116d48..ff9c90bd698a1c4570e8294dd8fdda88686566a4 100644 (file)
--- a/src/conftest/suiteb/3.21.1/dut.conf
+++ b/src/conftest/suiteb/3.21.1/dut.conf
@@ -1,20 +1,13 @@
 
 configs {
-       ike-ipv6 {
-               proposal = aes128-sha1-modp1024
-               lhost = 2001:0db8:aaaa:bbbb::0010
-               rhost = 2001:0db8:aaaa:bbbb::0020
+       ike-v6 {
                lid = 2001:0db8:aaaa:bbbb::0010
                rid = 2001:0db8:aaaa:bbbb::0020
-               child-ipv6 {
-                       lts = 2001:0db8:face:0010::/64
-                       rts = 2001:0db8:face:0020::/64
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-ipv6
+               config = child-v6
        }
 }

diff --git a/src/conftest/suiteb/3.21.1/test.conf b/src/conftest/suiteb/3.21.1/test.conf
index 9a30afb67eecc0ebc8e6e4e94f50b2e323ccfda5..b6408a5be2057091175995aafb8d562144f5300d 100644 (file)
--- a/src/conftest/suiteb/3.21.1/test.conf
+++ b/src/conftest/suiteb/3.21.1/test.conf
@@ -1,14 +1,7 @@
 
 configs {
-       ike-ipv6 {
-               proposal = aes128-sha1-modp1024
-               lhost = 2001:0db8:aaaa:bbbb::0020
-               rhost = 2001:0db8:aaaa:bbbb::0010
+       ike-v6 {
                lid = 2001:0db8:aaaa:bbbb::0020
                rid = 2001:0db8:aaaa:bbbb::0010
-               child-ipv6 {
-                       lts = 2001:0db8:face:0020::/64
-                       rts = 2001:0db8:face:0010::/64
-               }
        }
 }

diff --git a/src/conftest/suiteb/3.6.1/dut.conf b/src/conftest/suiteb/3.6.1/dut.conf
index 91d63e0bd1fc531fae5aa7e222c01e4f85e30622..fe77aa8861452a1975ade4e20bffcc579bef82ee 100644 (file)
--- a/src/conftest/suiteb/3.6.1/dut.conf
+++ b/src/conftest/suiteb/3.6.1/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-gcm128
+               config = child-v4
        }
 }
 
 configs {
-       ike-gcm128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-gcm128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/3.6.1/test.conf b/src/conftest/suiteb/3.6.1/test.conf
index 93ce23db8aaee851a717c85905e08b889e2c7f01..e4e3b1ab1996f59b74001968df1e0a7b07127d3f 100644 (file)
--- a/src/conftest/suiteb/3.6.1/test.conf
+++ b/src/conftest/suiteb/3.6.1/test.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-gcm128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-gcm128 {
+               child-v4 {
                        proposal = aes128gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/3.6.2/dut.conf b/src/conftest/suiteb/3.6.2/dut.conf
index c688bdb93f29db68b5e0e2697a287d100fe65a0d..7e65772cdf35cccd20bbe01c4139374d898dcdc1 100644 (file)
--- a/src/conftest/suiteb/3.6.2/dut.conf
+++ b/src/conftest/suiteb/3.6.2/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-gmac128
+               config = child-v4
        }
 }
 
 configs {
-       ike-gmac128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-gmac128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/3.6.2/test.conf b/src/conftest/suiteb/3.6.2/test.conf
index 93c0c76dacac3c65de4b986d3d40d8dbf5a47dd2..793a57d5b93fa376141df87f04015821c027350d 100644 (file)
--- a/src/conftest/suiteb/3.6.2/test.conf
+++ b/src/conftest/suiteb/3.6.2/test.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-gmac128 {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-gmac128 {
+               child-v4 {
                        proposal = aes128gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/3.6.3/dut.conf b/src/conftest/suiteb/3.6.3/dut.conf
index abb747ebcdc5636512d45ec7a02b35be242132b5..f28093255a86ab9c802fb6c9dc3a82adca4d18c1 100644 (file)
--- a/src/conftest/suiteb/3.6.3/dut.conf
+++ b/src/conftest/suiteb/3.6.3/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-gcm256
+               config = child-v4
        }
 }
 
 configs {
-       ike-gcm256 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-gcm256 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/3.6.3/test.conf b/src/conftest/suiteb/3.6.3/test.conf
index 89cc6cb3df12a7358a108553e37ca3e4c3c73adf..d6995a1205a12ffd8ed0c4a039063b54df2e7939 100644 (file)
--- a/src/conftest/suiteb/3.6.3/test.conf
+++ b/src/conftest/suiteb/3.6.3/test.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-gcm256 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-gcm256 {
+               child-v4 {
                        proposal = aes256gcm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/3.6.4/dut.conf b/src/conftest/suiteb/3.6.4/dut.conf
index 5bcf2410a2f77ee543a09f5e459a8d7ebffcc3bd..8634f966388750e099fa34bcd22a496af0ed2ee8 100644 (file)
--- a/src/conftest/suiteb/3.6.4/dut.conf
+++ b/src/conftest/suiteb/3.6.4/dut.conf
@@ -1,21 +1,15 @@
 
 actions {
        initiate {
-               config = child-gmac256
+               config = child-v4
        }
 }
 
 configs {
-       ike-gmac256 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-gmac256 {
+               child-v4 {
                        proposal = aes256gmac
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/3.6.4/test.conf b/src/conftest/suiteb/3.6.4/test.conf
index e35e14877f494937b081a7f07a64c23d9cfc1bd7..40869adfcb23a142a5dce5812b8d04911673c75d 100644 (file)
--- a/src/conftest/suiteb/3.6.4/test.conf
+++ b/src/conftest/suiteb/3.6.4/test.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-gmac256 {
+       ike-v4 {
                proposal = aes256-sha384-ecp384
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-gmac256 {
+               child-v4 {
                        proposal = aes256gmac
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/5.1.1/test.conf b/src/conftest/suiteb/5.1.1/test.conf
index 094ca2500897a4cde58586b441d51715d57eac4d..0645ea2d8bc767a8c0aa8ce231e7674e31ec7a86 100644 (file)
--- a/src/conftest/suiteb/5.1.1/test.conf
+++ b/src/conftest/suiteb/5.1.1/test.conf
@@ -7,23 +7,14 @@ preload = socket-dynamic
 
 actions {
        initiate {
-               config = child-nat
+               config = child-v4
        }
 }
 
 configs {
-       ike-nat {
+       ike-v4 {
                fake_nat = yes
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
                lport = 1234
-               rhost = 172.16.1.10
                rport = 4500
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-nat {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/5.10.1/dut.conf b/src/conftest/suiteb/5.10.1/dut.conf
index f4e1a86a7b50d9c5c884ed32fd5e66c92589a0b7..d6e1799f3ee21bc33e82cbc44cae3d7c83e166c3 100644 (file)
--- a/src/conftest/suiteb/5.10.1/dut.conf
+++ b/src/conftest/suiteb/5.10.1/dut.conf
@@ -1,22 +1,16 @@
 
 configs {
-       ike-nat {
+       ike-v4 {
                fake_nat = yes
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
                child-nat {
                        transport = yes
                        lts = 172.16.1.10/32
-                       rts = 10.20.20.0/24
                }
        }
 }
 
 actions {
        initiate {
-               config = child-nat
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/5.10.1/test.conf b/src/conftest/suiteb/5.10.1/test.conf
index c43d1023b6a13d27e10cc3ad0d012dbb087a9664..998b36837193627b9fb67b11dc43abda2b7459a2 100644 (file)
--- a/src/conftest/suiteb/5.10.1/test.conf
+++ b/src/conftest/suiteb/5.10.1/test.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-nat {
+       ike-v4 {
                fake_nat = yes
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-nat {
+               child-v4 {
                        transport = yes
-                       lts = 10.20.20.0/24
                        rts = 172.16.1.10/32
                }
        }

diff --git a/src/conftest/suiteb/5.11.1/test.conf b/src/conftest/suiteb/5.11.1/test.conf
index bc00ed9cc0135352aa016f0b1fd7b7e62070d03d..99b4c844bf910f6fa8cd6cdffc2e6a033323dfcb 100644 (file)
--- a/src/conftest/suiteb/5.11.1/test.conf
+++ b/src/conftest/suiteb/5.11.1/test.conf
@@ -1,22 +1,13 @@
 
 configs {
-       ike-nat {
+       ike-v4 {
                # require real NAT for port mapping changes
                # fake_nat = yes
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-nat {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-nat
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/5.12.2/test.conf b/src/conftest/suiteb/5.12.2/test.conf
index 43008227e73b7037a6433ada6df205e7f2d68e7d..833447c4c954b94dff8dcd7b842516c77885e2e5 100644 (file)
--- a/src/conftest/suiteb/5.12.2/test.conf
+++ b/src/conftest/suiteb/5.12.2/test.conf
@@ -1,16 +1,7 @@
 
 configs {
-       ike-nat {
+       ike-v4 {
                fake_nat = yes
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-nat {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
@@ -29,10 +20,10 @@ hooks {
 
 actions {
        initiate {
-               config = child-nat
+               config = child-v4
        }
        liveness {
-               config = ike-nat
+               config = ike-v4
                delay = 5
        }
 }

diff --git a/src/conftest/suiteb/5.13.1/dut.conf b/src/conftest/suiteb/5.13.1/dut.conf
index 4d2ccd9b6644eea55172136447ae47f0a3cf6bed..850d72443925703de32f78afc1cdb986f858214f 100644 (file)
--- a/src/conftest/suiteb/5.13.1/dut.conf
+++ b/src/conftest/suiteb/5.13.1/dut.conf
@@ -1,21 +1,12 @@
 
 configs {
-       ike-nat {
+       ike-v4 {
                fake_nat = yes
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-nat {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-nat
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/5.13.2/test.conf b/src/conftest/suiteb/5.13.2/test.conf
index 911c2d840019be28921b01e3c2dbcb05122379e2..850d72443925703de32f78afc1cdb986f858214f 100644 (file)
--- a/src/conftest/suiteb/5.13.2/test.conf
+++ b/src/conftest/suiteb/5.13.2/test.conf
@@ -1,21 +1,12 @@
 
 configs {
-       ike-nat {
+       ike-v4 {
                fake_nat = yes
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-nat {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-nat
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/5.2.1/dut.conf b/src/conftest/suiteb/5.2.1/dut.conf
index 4d2ccd9b6644eea55172136447ae47f0a3cf6bed..850d72443925703de32f78afc1cdb986f858214f 100644 (file)
--- a/src/conftest/suiteb/5.2.1/dut.conf
+++ b/src/conftest/suiteb/5.2.1/dut.conf
@@ -1,21 +1,12 @@
 
 configs {
-       ike-nat {
+       ike-v4 {
                fake_nat = yes
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-nat {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-nat
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/5.2.2/test.conf b/src/conftest/suiteb/5.2.2/test.conf
index 911c2d840019be28921b01e3c2dbcb05122379e2..850d72443925703de32f78afc1cdb986f858214f 100644 (file)
--- a/src/conftest/suiteb/5.2.2/test.conf
+++ b/src/conftest/suiteb/5.2.2/test.conf
@@ -1,21 +1,12 @@
 
 configs {
-       ike-nat {
+       ike-v4 {
                fake_nat = yes
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-nat {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-nat
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/5.3.1/test.conf b/src/conftest/suiteb/5.3.1/test.conf
index f0ffee14986d175c858e7f4a5c82d3bdf66f6e1b..bfb2e3afab7805fe95c4dccd43a892d894ec7cbf 100644 (file)
--- a/src/conftest/suiteb/5.3.1/test.conf
+++ b/src/conftest/suiteb/5.3.1/test.conf
@@ -3,22 +3,13 @@ preload = socket-dynamic
 
 actions {
        initiate {
-               config = child-4500
+               config = child-v4
        }
 }
 
 configs {
-       ike-4500 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
+       ike-v4 {
                lport = 4500
-               rhost = 172.16.1.10
                rport = 4500
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-4500 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/5.4.1/dut.conf b/src/conftest/suiteb/5.4.1/dut.conf
index 3d99bcab55f17fa130c7454590cfda5144b5fae3..6e245a4e706cb5048582d2a9e523ea4bf3c07d0a 100644 (file)
--- a/src/conftest/suiteb/5.4.1/dut.conf
+++ b/src/conftest/suiteb/5.4.1/dut.conf
@@ -2,24 +2,15 @@
 preload = socket-dynamic
 
 configs {
-       ike-nat {
+       ike-v4 {
                fake_nat = yes
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
                lport = 1234
-               rhost = 172.16.1.20
                rport = 4500
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-nat {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-nat
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/5.7.1/test.conf b/src/conftest/suiteb/5.7.1/test.conf
index c19db84aee9b73c0c5f404c34e2249a1ef7d910d..1b715472fc308f5ef2e93f04a64e385e23643135 100644 (file)
--- a/src/conftest/suiteb/5.7.1/test.conf
+++ b/src/conftest/suiteb/5.7.1/test.conf
@@ -1,22 +1,13 @@
 
 actions {
        initiate {
-               config = child-nat
+               config = child-v4
        }
 }
 
 configs {
-       ike-nat {
+       ike-v4 {
                # can be disabled if behind real NAT
                fake_nat = yes
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-nat {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/5.9.1/dut.conf b/src/conftest/suiteb/5.9.1/dut.conf
index 4d2ccd9b6644eea55172136447ae47f0a3cf6bed..850d72443925703de32f78afc1cdb986f858214f 100644 (file)
--- a/src/conftest/suiteb/5.9.1/dut.conf
+++ b/src/conftest/suiteb/5.9.1/dut.conf
@@ -1,21 +1,12 @@
 
 configs {
-       ike-nat {
+       ike-v4 {
                fake_nat = yes
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-nat {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }
 
 actions {
        initiate {
-               config = child-nat
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/6.1.1/dut.conf b/src/conftest/suiteb/6.1.1/dut.conf
index 3ae8e0a94aa9e07c028d9fe9e91e49a41c395f61..0c1113ef64af8ef87f4c5752abe1bae8a56ef8e6 100644 (file)
--- a/src/conftest/suiteb/6.1.1/dut.conf
+++ b/src/conftest/suiteb/6.1.1/dut.conf
@@ -1,15 +1,9 @@
 
 configs {
-       ike-suiteb {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-suiteb {
+               child-v4 {
                        proposal = aes128gcm16-aes128ccm16
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
                }
        }
 }

diff --git a/src/conftest/suiteb/6.1.1/test.conf b/src/conftest/suiteb/6.1.1/test.conf
index 69bc769be9cb4ebdbccc803e41fa915be513765d..493c822dfce2ee7206030850379dd0d8a594c081 100644 (file)
--- a/src/conftest/suiteb/6.1.1/test.conf
+++ b/src/conftest/suiteb/6.1.1/test.conf
@@ -1,21 +1,15 @@
 
 configs {
-       ike-suiteb {
+       ike-v4 {
                proposal = aes128-sha256-ecp256
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-suiteb {
+               child-v4 {
                        proposal = aes128gcm16-aes128ccm16
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
                }
        }
 }
 
 actions {
        initiate {
-               config = child-suiteb
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/8.1.2/dut.conf b/src/conftest/suiteb/8.1.2/dut.conf
index 222a499f4dad1f6e1b296713ad9608c683ecd44c..c18401957d487d5691fb34143fd0a9253a5a576b 100644 (file)
--- a/src/conftest/suiteb/8.1.2/dut.conf
+++ b/src/conftest/suiteb/8.1.2/dut.conf
@@ -1,20 +1,6 @@
 
-configs {
-       ike-ipv6 {
-               proposal = aes128-sha1-modp1024
-               lhost = 2001:0db8:aaaa:bbbb::0010
-               rhost = 2001:0db8:aaaa:bbbb::0020
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child-ipv6 {
-                       lts = 2001:0db8:face:0010::/64
-                       rts = 2001:0db8:face:0020::/64
-               }
-       }
-}
-
 actions {
        initiate {
-               config = child-ipv6
+               config = child-v6
        }
 }

diff --git a/src/conftest/suiteb/8.1.2/test.conf b/src/conftest/suiteb/8.1.2/test.conf
index 092ab9185465bfea48e881cab8687a149693c699..9a25490f98567abea9e2c1bb6d93712a95eaefaa 100644 (file)
--- a/src/conftest/suiteb/8.1.2/test.conf
+++ b/src/conftest/suiteb/8.1.2/test.conf
@@ -1,18 +1,4 @@
 
-configs {
-       ike-ipv6 {
-               proposal = aes128-sha1-modp1024
-               lhost = 2001:0db8:aaaa:bbbb::0020
-               rhost = 2001:0db8:aaaa:bbbb::0010
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-ipv6 {
-                       lts = 2001:0db8:face:0020::/64
-                       rts = 2001:0db8:face:0010::/64
-               }
-       }
-}
-
 hooks {
        log_ts {
        }

diff --git a/src/conftest/suiteb/8.2.1/test.conf b/src/conftest/suiteb/8.2.1/test.conf
index c147f0a155098e7a8f4424d74fa85396ec83eddf..a17397b704c4dbaa60865666cce55102cf444b86 100644 (file)
--- a/src/conftest/suiteb/8.2.1/test.conf
+++ b/src/conftest/suiteb/8.2.1/test.conf
@@ -1,12 +1,7 @@
 
 configs {
-       ike-nomatch {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-nomatch {
+       ike-v4 {
+               child-v4 {
                        lts = 1.2.3.4/32
                        rts = 2.3.4.5/32
                }
@@ -15,6 +10,6 @@ configs {
 
 actions {
        initiate {
-               config = child-nomatch
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/8.3.1/test.conf b/src/conftest/suiteb/8.3.1/test.conf
index d6c578baac40520c586e330d8c081a9d6dec882c..393f1be4fb0c9ff8e675428121864996aea560ca 100644 (file)
--- a/src/conftest/suiteb/8.3.1/test.conf
+++ b/src/conftest/suiteb/8.3.1/test.conf
@@ -1,12 +1,7 @@
 
 configs {
-       ike-multits {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-multits {
+       ike-v4 {
+               child-v4 {
                        lts = 10.20.20.0/26,1.2.3.4/32
                        rts = 10.10.10.0/26,2.3.4.5/32
                }
@@ -15,6 +10,6 @@ configs {
 
 actions {
        initiate {
-               config = child-multits
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/8.4.1/test.conf b/src/conftest/suiteb/8.4.1/test.conf
index dacb594842d8fa8d7df08a386ff61bbad1727978..3e964fd7c07a3103e18f37542388585a3cc6e903 100644 (file)
--- a/src/conftest/suiteb/8.4.1/test.conf
+++ b/src/conftest/suiteb/8.4.1/test.conf
@@ -1,12 +1,7 @@
 
 configs {
-       ike-multits {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-multits {
+       ike-v4 {
+               child-v4 {
                        lts = 1.2.3.4/32,10.20.20.0/26
                        rts = 2.3.4.5/32,10.10.10.0/26
                }
@@ -15,6 +10,6 @@ configs {
 
 actions {
        initiate {
-               config = child-multits
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/9.4.1/dut.conf b/src/conftest/suiteb/9.4.1/dut.conf
index c1763c7621b174310c01e91de56cbd98abca86af..9a80ee07cd30dc9d03cd34d11e27912d546086cb 100644 (file)
--- a/src/conftest/suiteb/9.4.1/dut.conf
+++ b/src/conftest/suiteb/9.4.1/dut.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-rsa {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.rsa.strongswan.org
                ecdsa_strength = 256
-               child-rsa {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/9.4.1/test.conf b/src/conftest/suiteb/9.4.1/test.conf
index 9821979631e958e73fcda9147af577507047c453..20912d4eec6d89484ac70219490a42add09f9630 100644 (file)
--- a/src/conftest/suiteb/9.4.1/test.conf
+++ b/src/conftest/suiteb/9.4.1/test.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-rsa {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.rsa.strongswan.org
-               rid = dut.strongswan.org
-               child-rsa {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
@@ -26,6 +18,6 @@ keys {
 
 actions {
        initiate {
-               config = child-rsa
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/9.4.2/dut.conf b/src/conftest/suiteb/9.4.2/dut.conf
index c4cf07cdc4ca5859fbb23c781fee1542a95bcefb..d417c84455552a699e0a3b27011c206968e386f9 100644 (file)
--- a/src/conftest/suiteb/9.4.2/dut.conf
+++ b/src/conftest/suiteb/9.4.2/dut.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-256 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.256-256.strongswan.org
                ecdsa_strength = 256
-               child-256 {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/9.4.2/test.conf b/src/conftest/suiteb/9.4.2/test.conf
index e28455757fd06c0a291138057278b11fcd1d39c5..84f2f95b52519c17f10fa5a5c231ef717c8bdd68 100644 (file)
--- a/src/conftest/suiteb/9.4.2/test.conf
+++ b/src/conftest/suiteb/9.4.2/test.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-256 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.256-256.strongswan.org
-               rid = dut.strongswan.org
-               child-256 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
@@ -26,6 +18,6 @@ keys {
 
 actions {
        initiate {
-               config = child-256
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/9.4.3/dut.conf b/src/conftest/suiteb/9.4.3/dut.conf
index d044f7877fef19ee5543329570b212d363ad97cf..d25379ccc953f372c982bbd92d0c7895fbea4ba9 100644 (file)
--- a/src/conftest/suiteb/9.4.3/dut.conf
+++ b/src/conftest/suiteb/9.4.3/dut.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-256 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.256-384.strongswan.org
                ecdsa_strength = 256
-               child-256 {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/9.4.3/test.conf b/src/conftest/suiteb/9.4.3/test.conf
index ba27767228b1dbcdf279572c92cb306dbe1d0b9e..9a0f03c38945c178d8e6fc56b6e4bd61e3f0ff37 100644 (file)
--- a/src/conftest/suiteb/9.4.3/test.conf
+++ b/src/conftest/suiteb/9.4.3/test.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-256 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.256-384.strongswan.org
-               rid = dut.strongswan.org
-               child-256 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
@@ -26,6 +18,6 @@ keys {
 
 actions {
        initiate {
-               config = child-256
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/9.6.1/dut.conf b/src/conftest/suiteb/9.6.1/dut.conf
index 8a8cf76d7b1514fda19f33967f4cec88e135e506..f59ea24f122cac806f946a925741d581b8bc96bc 100644 (file)
--- a/src/conftest/suiteb/9.6.1/dut.conf
+++ b/src/conftest/suiteb/9.6.1/dut.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-rsa {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.rsa.strongswan.org
                ecdsa_strength = 384
-               child-rsa {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/9.6.1/test.conf b/src/conftest/suiteb/9.6.1/test.conf
index 9821979631e958e73fcda9147af577507047c453..a01cb0d142193f23dde38d22da166f25fe59d8f2 100644 (file)
--- a/src/conftest/suiteb/9.6.1/test.conf
+++ b/src/conftest/suiteb/9.6.1/test.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-rsa {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.rsa.strongswan.org
-               rid = dut.strongswan.org
-               child-rsa {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
@@ -23,9 +15,8 @@ keys {
        rsa-ls-rsa = ls-rsa.key
 }
 
-
 actions {
        initiate {
-               config = child-rsa
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/9.6.2/dut.conf b/src/conftest/suiteb/9.6.2/dut.conf
index 3da331829cb5876401351afc58effbcb8f77a9c2..7d9079f2e86b0a79b7803f8f0ac86d29210f499c 100644 (file)
--- a/src/conftest/suiteb/9.6.2/dut.conf
+++ b/src/conftest/suiteb/9.6.2/dut.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-256 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
+       ike-v4 {
                rid = ls.256-256.strongswan.org
                ecdsa_strength = 384
-               child-256 {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/9.6.2/test.conf b/src/conftest/suiteb/9.6.2/test.conf
index e28455757fd06c0a291138057278b11fcd1d39c5..84f2f95b52519c17f10fa5a5c231ef717c8bdd68 100644 (file)
--- a/src/conftest/suiteb/9.6.2/test.conf
+++ b/src/conftest/suiteb/9.6.2/test.conf
@@ -1,15 +1,7 @@
 
 configs {
-       ike-256 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
+       ike-v4 {
                lid = ls.256-256.strongswan.org
-               rid = dut.strongswan.org
-               child-256 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
        }
 }
 
@@ -26,6 +18,6 @@ keys {
 
 actions {
        initiate {
-               config = child-256
+               config = child-v4
        }
 }

diff --git a/src/conftest/suiteb/9.6.3/dut.conf b/src/conftest/suiteb/9.6.3/dut.conf
index 53f4b289e49a9afde001e42902f32d770a0cb48d..46175fc7acd9383d2bed8eb96023fc70638dad23 100644 (file)
--- a/src/conftest/suiteb/9.6.3/dut.conf
+++ b/src/conftest/suiteb/9.6.3/dut.conf
@@ -1,15 +1,6 @@
 
 configs {
-       ike-384 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
+       ike-v4 {
                ecdsa_strength = 384
-               child-384 {
-                       lts = 10.10.10.0/24
-                       rts = 10.20.20.0/24
-               }
        }
 }

diff --git a/src/conftest/suiteb/9.6.3/test.conf b/src/conftest/suiteb/9.6.3/test.conf
index 8f71784dd91bb8ed390a894114df3e6942d5178f..3de2ec794f3c14e48d189be041813387a968f30d 100644 (file)
--- a/src/conftest/suiteb/9.6.3/test.conf
+++ b/src/conftest/suiteb/9.6.3/test.conf
@@ -1,20 +1,6 @@
 
-configs {
-       ike-384 {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child-384 {
-                       lts = 10.20.20.0/24
-                       rts = 10.10.10.0/24
-               }
-       }
-}
-
 actions {
        initiate {
-               config = child-384
+               config = child-v4
        }
 }