From baad8ee446a3852e37c583d9fbc9ad8f53c42996 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 9 Nov 2010 11:51:49 +0100 Subject: [PATCH] Use a default config defined in suite.conf --- src/conftest/suiteb/1.1.1/test.conf | 11 +++++------ src/conftest/suiteb/1.2.1/test.conf | 11 +++++------ src/conftest/suiteb/1.3.1/test.conf | 17 +---------------- src/conftest/suiteb/1.3.2/test.conf | 19 ++----------------- src/conftest/suiteb/1.4.1/test.conf | 5 ++--- src/conftest/suiteb/1.5.1/test.conf | 17 +---------------- src/conftest/suiteb/1.6.1/test.conf | 17 +---------------- src/conftest/suiteb/1.7.1/test.conf | 16 +--------------- src/conftest/suiteb/1.7.2/test.conf | 16 +--------------- src/conftest/suiteb/1.8.1/test.conf | 14 -------------- src/conftest/suiteb/1.9.1/test.conf | 17 +---------------- src/conftest/suiteb/1.9.2/test.conf | 17 +---------------- src/conftest/suiteb/suite.conf | 14 ++++++++++++++ 13 files changed, 35 insertions(+), 156 deletions(-) diff --git a/src/conftest/suiteb/1.1.1/test.conf b/src/conftest/suiteb/1.1.1/test.conf index 96a23ec56d..86e03267d1 100644 --- 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 89222cdc8e..97c0a6a217 100644 --- 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 3dd4bdb779..ba564ed280 100644 --- 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 d6d8ca24b9..61ef326c7d 100644 --- 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 6a94018b5e..cae3563a6c 100644 --- 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 a63ed9e418..ad929375b1 100644 --- 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 00fa97d7fb..05a2b40c4e 100644 --- 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 b6ad28fa4e..9650f90483 100644 --- 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 335773868c..93c605fb17 100644 --- 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 0802cb83cb..b0a02aff9e 100644 --- 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 7b102947b6..c6c29e07b6 100644 --- 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 ede850d440..45d5c51528 100644 --- 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 fe04c0edd2..362505e39a 100644 --- 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 + } + } +} -- 2.47.3