Use a default config defined in suite.conf

diff --git a/src/conftest/suiteb/1.1.1/test.conf b/src/conftest/suiteb/1.1.1/test.conf
index 96a23ec56d914d629814fa38e7d0f6e63cd78bb0..86e03267d135897df1bbf0532acc5205f4231cff 100644 (file)
--- a/src/conftest/suiteb/1.1.1/test.conf
+++ b/src/conftest/suiteb/1.1.1/test.conf
@@ -8,13 +8,13 @@ hooks {
 }
 
 configs {
-       test {
-               proposal = aes128ctr-sha1-modp1024,aes128-sha1-modp1024
+       ike-ctr {
+               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 {
+               child-ctr {
                        lts = 10.20.20.1/24
                        rts = 10.10.10.1/24
                }
@@ -23,11 +23,10 @@ configs {
 
 actions {
        initiate {
-               config = child
-               delay = 0
+               config = child-ctr
        }
        close_ike {
-               config = test
+               config = ike-ctr
                delay = 1
        }
 }

diff --git a/src/conftest/suiteb/1.2.1/test.conf b/src/conftest/suiteb/1.2.1/test.conf
index 89222cdc8ea90555ebd92c23188f7f13bbeb7397..97c0a6a21722897f10c058988e03b696bc2a9212 100644 (file)
--- a/src/conftest/suiteb/1.2.1/test.conf
+++ b/src/conftest/suiteb/1.2.1/test.conf
@@ -8,13 +8,13 @@ hooks {
 }
 
 configs {
-       test {
-               proposal = aes128ctr-sha1-modp1024,aes128-sha1-modp1024
+       ike-ctr {
+               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 {
+               child-ctr {
                        lts = 10.20.20.1/24
                        rts = 10.10.10.1/24
                }
@@ -23,11 +23,10 @@ configs {
 
 actions {
        initiate {
-               config = child
-               delay = 0
+               config = child-ctr
        }
        close_ike {
-               config = test
+               config = ike-ctr
                delay = 1
        }
 }

diff --git a/src/conftest/suiteb/1.3.1/test.conf b/src/conftest/suiteb/1.3.1/test.conf
index 3dd4bdb7794305e70e8bf18bf0ad0bbc1559c3a5..ba564ed28000d39846655d3e1160caa2c06c847e 100644 (file)
--- a/src/conftest/suiteb/1.3.1/test.conf
+++ b/src/conftest/suiteb/1.3.1/test.conf
@@ -7,23 +7,8 @@ hooks {
        }
 }
 
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child {
-                       lts = 10.20.20.1/24
-                       rts = 10.10.10.1/24
-               }
-       }
-}
-
 actions {
        initiate {
-               config = child
-               delay = 0
+               config = child-default
        }
 }

diff --git a/src/conftest/suiteb/1.3.2/test.conf b/src/conftest/suiteb/1.3.2/test.conf
index d6d8ca24b92a2075a934285c94298f997aa8bf35..61ef326c7df33d747add2aac05747abfa486e3a8 100644 (file)
--- a/src/conftest/suiteb/1.3.2/test.conf
+++ b/src/conftest/suiteb/1.3.2/test.conf
@@ -7,27 +7,12 @@ hooks {
        }
 }
 
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child {
-                       lts = 10.20.20.1/24
-                       rts = 10.10.10.1/24
-               }
-       }
-}
-
 actions {
        initiate {
-               config = child
-               delay = 0
+               config = child-default
        }
        rekey_child {
-               config = child
+               config = child-default
                delay = 1
        }
 }

diff --git a/src/conftest/suiteb/1.4.1/test.conf b/src/conftest/suiteb/1.4.1/test.conf
index 6a94018b5e882c0a3b5a627c4730332861c23bf3..cae3563a6c04ecc7dbe8ed74a37caa85c4695e80 100644 (file)
--- a/src/conftest/suiteb/1.4.1/test.conf
+++ b/src/conftest/suiteb/1.4.1/test.conf
@@ -24,11 +24,10 @@ configs {
 
 actions {
        initiate {
-               config = child
-               delay = 0
+               config = child-default
        }
        liveness {
-               config = test
+               config = ike-default
                delay = 1
        }
 }

diff --git a/src/conftest/suiteb/1.5.1/test.conf b/src/conftest/suiteb/1.5.1/test.conf
index a63ed9e418d89248cfeff881480b0f97b658b4b8..ad929375b12a387a2dcd98307e7c40d52aebca79 100644 (file)
--- a/src/conftest/suiteb/1.5.1/test.conf
+++ b/src/conftest/suiteb/1.5.1/test.conf
@@ -6,23 +6,8 @@ hooks {
        }
 }
 
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child {
-                       lts = 10.20.20.1/24
-                       rts = 10.10.10.1/24
-               }
-       }
-}
-
 actions {
        initiate {
-               config = child
-               delay = 0
+               config = child-default
        }
 }

diff --git a/src/conftest/suiteb/1.6.1/test.conf b/src/conftest/suiteb/1.6.1/test.conf
index 00fa97d7fb9526b49b070dad84138eb9ab45e80a..05a2b40c4edda26408b8d5808bb640f1897fc573 100644 (file)
--- a/src/conftest/suiteb/1.6.1/test.conf
+++ b/src/conftest/suiteb/1.6.1/test.conf
@@ -7,23 +7,8 @@ hooks {
        }
 }
 
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child {
-                       lts = 10.20.20.1/24
-                       rts = 10.10.10.1/24
-               }
-       }
-}
-
 actions {
        initiate {
-               config = child
-               delay = 0
+               config = child-default
        }
 }

diff --git a/src/conftest/suiteb/1.7.1/test.conf b/src/conftest/suiteb/1.7.1/test.conf
index b6ad28fa4e6c95908db7366d82ed986dda0fbc6d..9650f904839b6c7de0b6a1d4fc5cd96ddefddc6c 100644 (file)
--- a/src/conftest/suiteb/1.7.1/test.conf
+++ b/src/conftest/suiteb/1.7.1/test.conf
@@ -7,23 +7,9 @@ hooks {
        }
 }
 
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child {
-                       lts = 10.20.20.1/24
-                       rts = 10.10.10.1/24
-               }
-       }
-}
-
 actions {
        liveness {
-               config = test
+               config = ike-default
                delay = 5
        }
 }

diff --git a/src/conftest/suiteb/1.7.2/test.conf b/src/conftest/suiteb/1.7.2/test.conf
index 335773868c242900aacb7b07b06d1ac70f656621..93c605fb17a94b3eeed7fefaf5bd9fc948be67ee 100644 (file)
--- a/src/conftest/suiteb/1.7.2/test.conf
+++ b/src/conftest/suiteb/1.7.2/test.conf
@@ -7,23 +7,9 @@ hooks {
        }
 }
 
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child {
-                       lts = 10.20.20.1/24
-                       rts = 10.10.10.1/24
-               }
-       }
-}
-
 actions {
        liveness {
-               config = test
+               config = ike-default
                delay = 5
        }
 }

diff --git a/src/conftest/suiteb/1.8.1/test.conf b/src/conftest/suiteb/1.8.1/test.conf
index 0802cb83cb9c66e0dd4a161de5e682535ad1fd50..b0a02aff9ef8466785a8497be855b66120820b69 100644 (file)
--- a/src/conftest/suiteb/1.8.1/test.conf
+++ b/src/conftest/suiteb/1.8.1/test.conf
@@ -11,17 +11,3 @@ hooks {
                type = 40001
        }
 }
-
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child {
-                       lts = 10.20.20.1/24
-                       rts = 10.10.10.1/24
-               }
-       }
-}

diff --git a/src/conftest/suiteb/1.9.1/test.conf b/src/conftest/suiteb/1.9.1/test.conf
index 7b102947b6b7d10d67df196067a9cbf0f234011a..c6c29e07b641fe0855b00eb52f84b1e1b15185f9 100644 (file)
--- a/src/conftest/suiteb/1.9.1/test.conf
+++ b/src/conftest/suiteb/1.9.1/test.conf
@@ -7,23 +7,8 @@ hooks {
        }
 }
 
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child {
-                       lts = 10.20.20.1/24
-                       rts = 10.10.10.1/24
-               }
-       }
-}
-
 actions {
        initiate {
-               config = child
-               delay = 0
+               config = child-default
        }
 }

diff --git a/src/conftest/suiteb/1.9.2/test.conf b/src/conftest/suiteb/1.9.2/test.conf
index ede850d440a2703b9d41e338a46ad94dd4a831df..45d5c515288b5a95c68c63645b9b4bbac400dd98 100644 (file)
--- a/src/conftest/suiteb/1.9.2/test.conf
+++ b/src/conftest/suiteb/1.9.2/test.conf
@@ -7,23 +7,8 @@ hooks {
        }
 }
 
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.20
-               rhost = 172.16.1.10
-               lid = ls.strongswan.org
-               rid = dut.strongswan.org
-               child {
-                       lts = 10.20.20.1/24
-                       rts = 10.10.10.1/24
-               }
-       }
-}
-
 actions {
        initiate {
-               config = child
-               delay = 0
+               config = child-default
        }
 }

diff --git a/src/conftest/suiteb/suite.conf b/src/conftest/suiteb/suite.conf
index fe04c0edd2b1f233362f5f1d1c111c6bab37aa2e..362505e39ad59213d79536da071c2e878d054f03 100644 (file)
--- a/src/conftest/suiteb/suite.conf
+++ b/src/conftest/suiteb/suite.conf
@@ -16,3 +16,17 @@ certs {
 keys {
        ecdsa = ls.key
 }
+
+configs {
+       ike-default {
+               proposal = aes128-sha1-modp1024
+               lhost = 172.16.1.20
+               rhost = 172.16.1.10
+               lid = ls.strongswan.org
+               rid = dut.strongswan.org
+               child-default {
+                       lts = 10.20.20.1/24
+                       rts = 10.10.10.1/24
+               }
+       }
+}