Use gobal DUT credentials and config, DUT specific suite config

diff --git a/src/conftest/suiteb/1.4.1/dut/dut.conf b/src/conftest/suiteb/1.1.1/dut.conf
similarity index 57%
rename from src/conftest/suiteb/1.4.1/dut/dut.conf
rename to src/conftest/suiteb/1.1.1/dut.conf
index 6d178725806b55bbf4992234847932b886a47ffa..1f7d20a0797e8cdbbfbdde9f4b223c3198cdd8d2 100644 (file)
--- a/src/conftest/suiteb/1.4.1/dut/dut.conf
+++ b/src/conftest/suiteb/1.1.1/dut.conf
@@ -1,22 +1,12 @@
 
-certs {
-       untrusted {
-               dut = dut.crt
-       }
-}
-
-keys {
-       ecdsa = dut.key
-}
-
 configs {
-       test {
-               proposal = aes128-sha1-modp1024
+       ike-ctr {
+               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 {
+               child-ctr {
                        lts = 10.10.10.1/24
                        rts = 10.20.20.1/24
                }

diff --git a/src/conftest/suiteb/1.1.1/dut/dut.conf b/src/conftest/suiteb/1.1.1/dut/dut.conf
deleted file mode 100644 (file)
index d12979a..0000000
--- a/src/conftest/suiteb/1.1.1/dut/dut.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-
-certs {
-       untrusted {
-               dut = dut.crt
-       }
-}
-
-keys {
-       ecdsa = dut.key
-}
-
-configs {
-       test {
-               proposal = aes128ctr-sha1-modp1024,aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child {
-                       lts = 10.10.10.1/24
-                       rts = 10.20.20.1/24
-               }
-       }
-}

diff --git a/src/conftest/suiteb/1.5.1/dut/dut.conf b/src/conftest/suiteb/1.2.1/dut.conf
similarity index 57%
rename from src/conftest/suiteb/1.5.1/dut/dut.conf
rename to src/conftest/suiteb/1.2.1/dut.conf
index 6d178725806b55bbf4992234847932b886a47ffa..1f7d20a0797e8cdbbfbdde9f4b223c3198cdd8d2 100644 (file)
--- a/src/conftest/suiteb/1.5.1/dut/dut.conf
+++ b/src/conftest/suiteb/1.2.1/dut.conf
@@ -1,22 +1,12 @@
 
-certs {
-       untrusted {
-               dut = dut.crt
-       }
-}
-
-keys {
-       ecdsa = dut.key
-}
-
 configs {
-       test {
-               proposal = aes128-sha1-modp1024
+       ike-ctr {
+               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 {
+               child-ctr {
                        lts = 10.10.10.1/24
                        rts = 10.20.20.1/24
                }

diff --git a/src/conftest/suiteb/1.2.1/dut/dut.conf b/src/conftest/suiteb/1.2.1/dut/dut.conf
deleted file mode 100644 (file)
index d12979a..0000000
--- a/src/conftest/suiteb/1.2.1/dut/dut.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-
-certs {
-       untrusted {
-               dut = dut.crt
-       }
-}
-
-keys {
-       ecdsa = dut.key
-}
-
-configs {
-       test {
-               proposal = aes128ctr-sha1-modp1024,aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child {
-                       lts = 10.10.10.1/24
-                       rts = 10.20.20.1/24
-               }
-       }
-}

diff --git a/src/conftest/suiteb/1.2.1/dut/dut.crt b/src/conftest/suiteb/1.2.1/dut/dut.crt
deleted file mode 100644 (file)
index fd0b3de..0000000
--- a/src/conftest/suiteb/1.2.1/dut/dut.crt
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBcTCCARmgAwIBAgIJAJyGbmBb6ArKMAkGByqGSM49BAEwEDEOMAwGA1UEAxMF
-VEEyNTYwHhcNMTAxMDI5MTMxNDQ5WhcNMTMxMDI4MTMxNDQ5WjAOMQwwCgYDVQQD
-EwNkdXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHfNEEltMlHAgaxijhaLa0UGKI
-OS8I+9faQoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvn
-ZmIY7Dvg45np0JOzAI+N4q5m8Va+o2PT4QtOAcCjQjBAMB8GA1UdIwQYMBaAFGN+
-UXyZDNjgewnnhgj4Vq9qwZUwMB0GA1UdEQQWMBSCEmR1dC5zdHJvbmdzd2FuLm9y
-ZzAJBgcqhkjOPQQBA0cAMEQCIC2dlTEaLo+tRu2lQGDpdslCzJ3dSbHZUpem5m9x
-QPZSAiAhkxg3z9mPIz/Tm8EjYa0bNjgeP7Q+tr/PC3G8HCewOg==
------END CERTIFICATE-----

diff --git a/src/conftest/suiteb/1.2.1/dut/dut.key b/src/conftest/suiteb/1.2.1/dut/dut.key
deleted file mode 100644 (file)
index 4fe0d7e..0000000
--- a/src/conftest/suiteb/1.2.1/dut/dut.key
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB4b056WXTlRSo/JvcXlLc+agOedUd6rpIIlRhj/wUw+mATVe41r56L
-cNf0EwqSgQCgBwYFK4EEACKhZANiAARHfNEEltMlHAgaxijhaLa0UGKIOS8I+9fa
-QoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvnZmIY7Dvg
-45np0JOzAI+N4q5m8Va+o2PT4QtOAcA=
------END EC PRIVATE KEY-----

diff --git a/src/conftest/suiteb/1.3.1/dut.conf b/src/conftest/suiteb/1.3.1/dut.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/conftest/suiteb/1.3.1/dut/dut.conf b/src/conftest/suiteb/1.3.1/dut/dut.conf
deleted file mode 100644 (file)
index 6d17872..0000000
--- a/src/conftest/suiteb/1.3.1/dut/dut.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-
-certs {
-       untrusted {
-               dut = dut.crt
-       }
-}
-
-keys {
-       ecdsa = dut.key
-}
-
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child {
-                       lts = 10.10.10.1/24
-                       rts = 10.20.20.1/24
-               }
-       }
-}

diff --git a/src/conftest/suiteb/1.3.1/dut/dut.crt b/src/conftest/suiteb/1.3.1/dut/dut.crt
deleted file mode 100644 (file)
index fd0b3de..0000000
--- a/src/conftest/suiteb/1.3.1/dut/dut.crt
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBcTCCARmgAwIBAgIJAJyGbmBb6ArKMAkGByqGSM49BAEwEDEOMAwGA1UEAxMF
-VEEyNTYwHhcNMTAxMDI5MTMxNDQ5WhcNMTMxMDI4MTMxNDQ5WjAOMQwwCgYDVQQD
-EwNkdXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHfNEEltMlHAgaxijhaLa0UGKI
-OS8I+9faQoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvn
-ZmIY7Dvg45np0JOzAI+N4q5m8Va+o2PT4QtOAcCjQjBAMB8GA1UdIwQYMBaAFGN+
-UXyZDNjgewnnhgj4Vq9qwZUwMB0GA1UdEQQWMBSCEmR1dC5zdHJvbmdzd2FuLm9y
-ZzAJBgcqhkjOPQQBA0cAMEQCIC2dlTEaLo+tRu2lQGDpdslCzJ3dSbHZUpem5m9x
-QPZSAiAhkxg3z9mPIz/Tm8EjYa0bNjgeP7Q+tr/PC3G8HCewOg==
------END CERTIFICATE-----

diff --git a/src/conftest/suiteb/1.3.1/dut/dut.key b/src/conftest/suiteb/1.3.1/dut/dut.key
deleted file mode 100644 (file)
index 4fe0d7e..0000000
--- a/src/conftest/suiteb/1.3.1/dut/dut.key
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB4b056WXTlRSo/JvcXlLc+agOedUd6rpIIlRhj/wUw+mATVe41r56L
-cNf0EwqSgQCgBwYFK4EEACKhZANiAARHfNEEltMlHAgaxijhaLa0UGKIOS8I+9fa
-QoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvnZmIY7Dvg
-45np0JOzAI+N4q5m8Va+o2PT4QtOAcA=
------END EC PRIVATE KEY-----

diff --git a/src/conftest/suiteb/1.3.2/dut.conf b/src/conftest/suiteb/1.3.2/dut.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/conftest/suiteb/1.3.2/dut/dut.conf b/src/conftest/suiteb/1.3.2/dut/dut.conf
deleted file mode 100644 (file)
index 6d17872..0000000
--- a/src/conftest/suiteb/1.3.2/dut/dut.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-
-certs {
-       untrusted {
-               dut = dut.crt
-       }
-}
-
-keys {
-       ecdsa = dut.key
-}
-
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child {
-                       lts = 10.10.10.1/24
-                       rts = 10.20.20.1/24
-               }
-       }
-}

diff --git a/src/conftest/suiteb/1.3.2/dut/dut.crt b/src/conftest/suiteb/1.3.2/dut/dut.crt
deleted file mode 100644 (file)
index fd0b3de..0000000
--- a/src/conftest/suiteb/1.3.2/dut/dut.crt
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBcTCCARmgAwIBAgIJAJyGbmBb6ArKMAkGByqGSM49BAEwEDEOMAwGA1UEAxMF
-VEEyNTYwHhcNMTAxMDI5MTMxNDQ5WhcNMTMxMDI4MTMxNDQ5WjAOMQwwCgYDVQQD
-EwNkdXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHfNEEltMlHAgaxijhaLa0UGKI
-OS8I+9faQoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvn
-ZmIY7Dvg45np0JOzAI+N4q5m8Va+o2PT4QtOAcCjQjBAMB8GA1UdIwQYMBaAFGN+
-UXyZDNjgewnnhgj4Vq9qwZUwMB0GA1UdEQQWMBSCEmR1dC5zdHJvbmdzd2FuLm9y
-ZzAJBgcqhkjOPQQBA0cAMEQCIC2dlTEaLo+tRu2lQGDpdslCzJ3dSbHZUpem5m9x
-QPZSAiAhkxg3z9mPIz/Tm8EjYa0bNjgeP7Q+tr/PC3G8HCewOg==
------END CERTIFICATE-----

diff --git a/src/conftest/suiteb/1.3.2/dut/dut.key b/src/conftest/suiteb/1.3.2/dut/dut.key
deleted file mode 100644 (file)
index 4fe0d7e..0000000
--- a/src/conftest/suiteb/1.3.2/dut/dut.key
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB4b056WXTlRSo/JvcXlLc+agOedUd6rpIIlRhj/wUw+mATVe41r56L
-cNf0EwqSgQCgBwYFK4EEACKhZANiAARHfNEEltMlHAgaxijhaLa0UGKIOS8I+9fa
-QoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvnZmIY7Dvg
-45np0JOzAI+N4q5m8Va+o2PT4QtOAcA=
------END EC PRIVATE KEY-----

diff --git a/src/conftest/suiteb/1.4.1/dut.conf b/src/conftest/suiteb/1.4.1/dut.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/conftest/suiteb/1.4.1/dut/dut.crt b/src/conftest/suiteb/1.4.1/dut/dut.crt
deleted file mode 100644 (file)
index fd0b3de..0000000
--- a/src/conftest/suiteb/1.4.1/dut/dut.crt
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBcTCCARmgAwIBAgIJAJyGbmBb6ArKMAkGByqGSM49BAEwEDEOMAwGA1UEAxMF
-VEEyNTYwHhcNMTAxMDI5MTMxNDQ5WhcNMTMxMDI4MTMxNDQ5WjAOMQwwCgYDVQQD
-EwNkdXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHfNEEltMlHAgaxijhaLa0UGKI
-OS8I+9faQoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvn
-ZmIY7Dvg45np0JOzAI+N4q5m8Va+o2PT4QtOAcCjQjBAMB8GA1UdIwQYMBaAFGN+
-UXyZDNjgewnnhgj4Vq9qwZUwMB0GA1UdEQQWMBSCEmR1dC5zdHJvbmdzd2FuLm9y
-ZzAJBgcqhkjOPQQBA0cAMEQCIC2dlTEaLo+tRu2lQGDpdslCzJ3dSbHZUpem5m9x
-QPZSAiAhkxg3z9mPIz/Tm8EjYa0bNjgeP7Q+tr/PC3G8HCewOg==
------END CERTIFICATE-----

diff --git a/src/conftest/suiteb/1.4.1/dut/dut.key b/src/conftest/suiteb/1.4.1/dut/dut.key
deleted file mode 100644 (file)
index 4fe0d7e..0000000
--- a/src/conftest/suiteb/1.4.1/dut/dut.key
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB4b056WXTlRSo/JvcXlLc+agOedUd6rpIIlRhj/wUw+mATVe41r56L
-cNf0EwqSgQCgBwYFK4EEACKhZANiAARHfNEEltMlHAgaxijhaLa0UGKIOS8I+9fa
-QoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvnZmIY7Dvg
-45np0JOzAI+N4q5m8Va+o2PT4QtOAcA=
------END EC PRIVATE KEY-----

diff --git a/src/conftest/suiteb/1.5.1/dut.conf b/src/conftest/suiteb/1.5.1/dut.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/conftest/suiteb/1.5.1/dut/dut.crt b/src/conftest/suiteb/1.5.1/dut/dut.crt
deleted file mode 100644 (file)
index fd0b3de..0000000
--- a/src/conftest/suiteb/1.5.1/dut/dut.crt
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBcTCCARmgAwIBAgIJAJyGbmBb6ArKMAkGByqGSM49BAEwEDEOMAwGA1UEAxMF
-VEEyNTYwHhcNMTAxMDI5MTMxNDQ5WhcNMTMxMDI4MTMxNDQ5WjAOMQwwCgYDVQQD
-EwNkdXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHfNEEltMlHAgaxijhaLa0UGKI
-OS8I+9faQoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvn
-ZmIY7Dvg45np0JOzAI+N4q5m8Va+o2PT4QtOAcCjQjBAMB8GA1UdIwQYMBaAFGN+
-UXyZDNjgewnnhgj4Vq9qwZUwMB0GA1UdEQQWMBSCEmR1dC5zdHJvbmdzd2FuLm9y
-ZzAJBgcqhkjOPQQBA0cAMEQCIC2dlTEaLo+tRu2lQGDpdslCzJ3dSbHZUpem5m9x
-QPZSAiAhkxg3z9mPIz/Tm8EjYa0bNjgeP7Q+tr/PC3G8HCewOg==
------END CERTIFICATE-----

diff --git a/src/conftest/suiteb/1.5.1/dut/dut.key b/src/conftest/suiteb/1.5.1/dut/dut.key
deleted file mode 100644 (file)
index 4fe0d7e..0000000
--- a/src/conftest/suiteb/1.5.1/dut/dut.key
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB4b056WXTlRSo/JvcXlLc+agOedUd6rpIIlRhj/wUw+mATVe41r56L
-cNf0EwqSgQCgBwYFK4EEACKhZANiAARHfNEEltMlHAgaxijhaLa0UGKIOS8I+9fa
-QoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvnZmIY7Dvg
-45np0JOzAI+N4q5m8Va+o2PT4QtOAcA=
------END EC PRIVATE KEY-----

diff --git a/src/conftest/suiteb/1.6.1/dut.conf b/src/conftest/suiteb/1.6.1/dut.conf
new file mode 100644 (file)
index 0000000..3fe9ce2
--- /dev/null
+++ b/src/conftest/suiteb/1.6.1/dut.conf
@@ -0,0 +1,7 @@
+
+actions {
+       rekey_child {
+               config = child-default
+               delay = 10
+       }
+}

diff --git a/src/conftest/suiteb/1.6.1/dut/dut.crt b/src/conftest/suiteb/1.6.1/dut/dut.crt
deleted file mode 100644 (file)
index fd0b3de..0000000
--- a/src/conftest/suiteb/1.6.1/dut/dut.crt
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBcTCCARmgAwIBAgIJAJyGbmBb6ArKMAkGByqGSM49BAEwEDEOMAwGA1UEAxMF
-VEEyNTYwHhcNMTAxMDI5MTMxNDQ5WhcNMTMxMDI4MTMxNDQ5WjAOMQwwCgYDVQQD
-EwNkdXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHfNEEltMlHAgaxijhaLa0UGKI
-OS8I+9faQoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvn
-ZmIY7Dvg45np0JOzAI+N4q5m8Va+o2PT4QtOAcCjQjBAMB8GA1UdIwQYMBaAFGN+
-UXyZDNjgewnnhgj4Vq9qwZUwMB0GA1UdEQQWMBSCEmR1dC5zdHJvbmdzd2FuLm9y
-ZzAJBgcqhkjOPQQBA0cAMEQCIC2dlTEaLo+tRu2lQGDpdslCzJ3dSbHZUpem5m9x
-QPZSAiAhkxg3z9mPIz/Tm8EjYa0bNjgeP7Q+tr/PC3G8HCewOg==
------END CERTIFICATE-----

diff --git a/src/conftest/suiteb/1.6.1/dut/dut.key b/src/conftest/suiteb/1.6.1/dut/dut.key
deleted file mode 100644 (file)
index 4fe0d7e..0000000
--- a/src/conftest/suiteb/1.6.1/dut/dut.key
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB4b056WXTlRSo/JvcXlLc+agOedUd6rpIIlRhj/wUw+mATVe41r56L
-cNf0EwqSgQCgBwYFK4EEACKhZANiAARHfNEEltMlHAgaxijhaLa0UGKIOS8I+9fa
-QoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvnZmIY7Dvg
-45np0JOzAI+N4q5m8Va+o2PT4QtOAcA=
------END EC PRIVATE KEY-----

diff --git a/src/conftest/suiteb/1.7.1/dut.conf b/src/conftest/suiteb/1.7.1/dut.conf
new file mode 100644 (file)
index 0000000..9534c1d
--- /dev/null
+++ b/src/conftest/suiteb/1.7.1/dut.conf
@@ -0,0 +1,6 @@
+
+actions {
+       initiate {
+               config = child-default
+       }
+}

diff --git a/src/conftest/suiteb/1.7.1/dut/dut.conf b/src/conftest/suiteb/1.7.1/dut/dut.conf
deleted file mode 100644 (file)
index eccb2fc..0000000
--- a/src/conftest/suiteb/1.7.1/dut/dut.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-
-certs {
-       untrusted {
-               dut = dut.crt
-       }
-}
-
-keys {
-       ecdsa = dut.key
-}
-
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child {
-                       lts = 10.10.10.1/24
-                       rts = 10.20.20.1/24
-               }
-       }
-}
-
-actions {
-       initiate {
-               config = child
-               delay = 0
-       }
-}

diff --git a/src/conftest/suiteb/1.7.1/dut/dut.crt b/src/conftest/suiteb/1.7.1/dut/dut.crt
deleted file mode 100644 (file)
index fd0b3de..0000000
--- a/src/conftest/suiteb/1.7.1/dut/dut.crt
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBcTCCARmgAwIBAgIJAJyGbmBb6ArKMAkGByqGSM49BAEwEDEOMAwGA1UEAxMF
-VEEyNTYwHhcNMTAxMDI5MTMxNDQ5WhcNMTMxMDI4MTMxNDQ5WjAOMQwwCgYDVQQD
-EwNkdXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHfNEEltMlHAgaxijhaLa0UGKI
-OS8I+9faQoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvn
-ZmIY7Dvg45np0JOzAI+N4q5m8Va+o2PT4QtOAcCjQjBAMB8GA1UdIwQYMBaAFGN+
-UXyZDNjgewnnhgj4Vq9qwZUwMB0GA1UdEQQWMBSCEmR1dC5zdHJvbmdzd2FuLm9y
-ZzAJBgcqhkjOPQQBA0cAMEQCIC2dlTEaLo+tRu2lQGDpdslCzJ3dSbHZUpem5m9x
-QPZSAiAhkxg3z9mPIz/Tm8EjYa0bNjgeP7Q+tr/PC3G8HCewOg==
------END CERTIFICATE-----

diff --git a/src/conftest/suiteb/1.7.1/dut/dut.key b/src/conftest/suiteb/1.7.1/dut/dut.key
deleted file mode 100644 (file)
index 4fe0d7e..0000000
--- a/src/conftest/suiteb/1.7.1/dut/dut.key
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB4b056WXTlRSo/JvcXlLc+agOedUd6rpIIlRhj/wUw+mATVe41r56L
-cNf0EwqSgQCgBwYFK4EEACKhZANiAARHfNEEltMlHAgaxijhaLa0UGKIOS8I+9fa
-QoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvnZmIY7Dvg
-45np0JOzAI+N4q5m8Va+o2PT4QtOAcA=
------END EC PRIVATE KEY-----

diff --git a/src/conftest/suiteb/1.7.2/dut.conf b/src/conftest/suiteb/1.7.2/dut.conf
new file mode 100644 (file)
index 0000000..9534c1d
--- /dev/null
+++ b/src/conftest/suiteb/1.7.2/dut.conf
@@ -0,0 +1,6 @@
+
+actions {
+       initiate {
+               config = child-default
+       }
+}

diff --git a/src/conftest/suiteb/1.7.2/dut/dut.conf b/src/conftest/suiteb/1.7.2/dut/dut.conf
deleted file mode 100644 (file)
index eccb2fc..0000000
--- a/src/conftest/suiteb/1.7.2/dut/dut.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-
-certs {
-       untrusted {
-               dut = dut.crt
-       }
-}
-
-keys {
-       ecdsa = dut.key
-}
-
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child {
-                       lts = 10.10.10.1/24
-                       rts = 10.20.20.1/24
-               }
-       }
-}
-
-actions {
-       initiate {
-               config = child
-               delay = 0
-       }
-}

diff --git a/src/conftest/suiteb/1.7.2/dut/dut.crt b/src/conftest/suiteb/1.7.2/dut/dut.crt
deleted file mode 100644 (file)
index fd0b3de..0000000
--- a/src/conftest/suiteb/1.7.2/dut/dut.crt
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBcTCCARmgAwIBAgIJAJyGbmBb6ArKMAkGByqGSM49BAEwEDEOMAwGA1UEAxMF
-VEEyNTYwHhcNMTAxMDI5MTMxNDQ5WhcNMTMxMDI4MTMxNDQ5WjAOMQwwCgYDVQQD
-EwNkdXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHfNEEltMlHAgaxijhaLa0UGKI
-OS8I+9faQoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvn
-ZmIY7Dvg45np0JOzAI+N4q5m8Va+o2PT4QtOAcCjQjBAMB8GA1UdIwQYMBaAFGN+
-UXyZDNjgewnnhgj4Vq9qwZUwMB0GA1UdEQQWMBSCEmR1dC5zdHJvbmdzd2FuLm9y
-ZzAJBgcqhkjOPQQBA0cAMEQCIC2dlTEaLo+tRu2lQGDpdslCzJ3dSbHZUpem5m9x
-QPZSAiAhkxg3z9mPIz/Tm8EjYa0bNjgeP7Q+tr/PC3G8HCewOg==
------END CERTIFICATE-----

diff --git a/src/conftest/suiteb/1.7.2/dut/dut.key b/src/conftest/suiteb/1.7.2/dut/dut.key
deleted file mode 100644 (file)
index 4fe0d7e..0000000
--- a/src/conftest/suiteb/1.7.2/dut/dut.key
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB4b056WXTlRSo/JvcXlLc+agOedUd6rpIIlRhj/wUw+mATVe41r56L
-cNf0EwqSgQCgBwYFK4EEACKhZANiAARHfNEEltMlHAgaxijhaLa0UGKIOS8I+9fa
-QoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvnZmIY7Dvg
-45np0JOzAI+N4q5m8Va+o2PT4QtOAcA=
------END EC PRIVATE KEY-----

diff --git a/src/conftest/suiteb/1.8.1/dut.conf b/src/conftest/suiteb/1.8.1/dut.conf
new file mode 100644 (file)
index 0000000..9534c1d
--- /dev/null
+++ b/src/conftest/suiteb/1.8.1/dut.conf
@@ -0,0 +1,6 @@
+
+actions {
+       initiate {
+               config = child-default
+       }
+}

diff --git a/src/conftest/suiteb/1.8.1/dut/dut.conf b/src/conftest/suiteb/1.8.1/dut/dut.conf
deleted file mode 100644 (file)
index eccb2fc..0000000
--- a/src/conftest/suiteb/1.8.1/dut/dut.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-
-certs {
-       untrusted {
-               dut = dut.crt
-       }
-}
-
-keys {
-       ecdsa = dut.key
-}
-
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child {
-                       lts = 10.10.10.1/24
-                       rts = 10.20.20.1/24
-               }
-       }
-}
-
-actions {
-       initiate {
-               config = child
-               delay = 0
-       }
-}

diff --git a/src/conftest/suiteb/1.8.1/dut/dut.crt b/src/conftest/suiteb/1.8.1/dut/dut.crt
deleted file mode 100644 (file)
index fd0b3de..0000000
--- a/src/conftest/suiteb/1.8.1/dut/dut.crt
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBcTCCARmgAwIBAgIJAJyGbmBb6ArKMAkGByqGSM49BAEwEDEOMAwGA1UEAxMF
-VEEyNTYwHhcNMTAxMDI5MTMxNDQ5WhcNMTMxMDI4MTMxNDQ5WjAOMQwwCgYDVQQD
-EwNkdXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHfNEEltMlHAgaxijhaLa0UGKI
-OS8I+9faQoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvn
-ZmIY7Dvg45np0JOzAI+N4q5m8Va+o2PT4QtOAcCjQjBAMB8GA1UdIwQYMBaAFGN+
-UXyZDNjgewnnhgj4Vq9qwZUwMB0GA1UdEQQWMBSCEmR1dC5zdHJvbmdzd2FuLm9y
-ZzAJBgcqhkjOPQQBA0cAMEQCIC2dlTEaLo+tRu2lQGDpdslCzJ3dSbHZUpem5m9x
-QPZSAiAhkxg3z9mPIz/Tm8EjYa0bNjgeP7Q+tr/PC3G8HCewOg==
------END CERTIFICATE-----

diff --git a/src/conftest/suiteb/1.8.1/dut/dut.key b/src/conftest/suiteb/1.8.1/dut/dut.key
deleted file mode 100644 (file)
index 4fe0d7e..0000000
--- a/src/conftest/suiteb/1.8.1/dut/dut.key
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB4b056WXTlRSo/JvcXlLc+agOedUd6rpIIlRhj/wUw+mATVe41r56L
-cNf0EwqSgQCgBwYFK4EEACKhZANiAARHfNEEltMlHAgaxijhaLa0UGKIOS8I+9fa
-QoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvnZmIY7Dvg
-45np0JOzAI+N4q5m8Va+o2PT4QtOAcA=
------END EC PRIVATE KEY-----

diff --git a/src/conftest/suiteb/1.9.1/dut.conf b/src/conftest/suiteb/1.9.1/dut.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/conftest/suiteb/1.9.1/dut/dut.conf b/src/conftest/suiteb/1.9.1/dut/dut.conf
deleted file mode 100644 (file)
index 6d17872..0000000
--- a/src/conftest/suiteb/1.9.1/dut/dut.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-
-certs {
-       untrusted {
-               dut = dut.crt
-       }
-}
-
-keys {
-       ecdsa = dut.key
-}
-
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child {
-                       lts = 10.10.10.1/24
-                       rts = 10.20.20.1/24
-               }
-       }
-}

diff --git a/src/conftest/suiteb/1.9.1/dut/dut.crt b/src/conftest/suiteb/1.9.1/dut/dut.crt
deleted file mode 100644 (file)
index fd0b3de..0000000
--- a/src/conftest/suiteb/1.9.1/dut/dut.crt
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBcTCCARmgAwIBAgIJAJyGbmBb6ArKMAkGByqGSM49BAEwEDEOMAwGA1UEAxMF
-VEEyNTYwHhcNMTAxMDI5MTMxNDQ5WhcNMTMxMDI4MTMxNDQ5WjAOMQwwCgYDVQQD
-EwNkdXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHfNEEltMlHAgaxijhaLa0UGKI
-OS8I+9faQoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvn
-ZmIY7Dvg45np0JOzAI+N4q5m8Va+o2PT4QtOAcCjQjBAMB8GA1UdIwQYMBaAFGN+
-UXyZDNjgewnnhgj4Vq9qwZUwMB0GA1UdEQQWMBSCEmR1dC5zdHJvbmdzd2FuLm9y
-ZzAJBgcqhkjOPQQBA0cAMEQCIC2dlTEaLo+tRu2lQGDpdslCzJ3dSbHZUpem5m9x
-QPZSAiAhkxg3z9mPIz/Tm8EjYa0bNjgeP7Q+tr/PC3G8HCewOg==
------END CERTIFICATE-----

diff --git a/src/conftest/suiteb/1.9.1/dut/dut.key b/src/conftest/suiteb/1.9.1/dut/dut.key
deleted file mode 100644 (file)
index 4fe0d7e..0000000
--- a/src/conftest/suiteb/1.9.1/dut/dut.key
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB4b056WXTlRSo/JvcXlLc+agOedUd6rpIIlRhj/wUw+mATVe41r56L
-cNf0EwqSgQCgBwYFK4EEACKhZANiAARHfNEEltMlHAgaxijhaLa0UGKIOS8I+9fa
-QoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvnZmIY7Dvg
-45np0JOzAI+N4q5m8Va+o2PT4QtOAcA=
------END EC PRIVATE KEY-----

diff --git a/src/conftest/suiteb/1.9.2/dut.conf b/src/conftest/suiteb/1.9.2/dut.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/conftest/suiteb/1.9.2/dut/dut.conf b/src/conftest/suiteb/1.9.2/dut/dut.conf
deleted file mode 100644 (file)
index 6d17872..0000000
--- a/src/conftest/suiteb/1.9.2/dut/dut.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-
-certs {
-       untrusted {
-               dut = dut.crt
-       }
-}
-
-keys {
-       ecdsa = dut.key
-}
-
-configs {
-       test {
-               proposal = aes128-sha1-modp1024
-               lhost = 172.16.1.10
-               rhost = 172.16.1.20
-               lid = dut.strongswan.org
-               rid = ls.strongswan.org
-               child {
-                       lts = 10.10.10.1/24
-                       rts = 10.20.20.1/24
-               }
-       }
-}

diff --git a/src/conftest/suiteb/1.9.2/dut/dut.crt b/src/conftest/suiteb/1.9.2/dut/dut.crt
deleted file mode 100644 (file)
index fd0b3de..0000000
--- a/src/conftest/suiteb/1.9.2/dut/dut.crt
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBcTCCARmgAwIBAgIJAJyGbmBb6ArKMAkGByqGSM49BAEwEDEOMAwGA1UEAxMF
-VEEyNTYwHhcNMTAxMDI5MTMxNDQ5WhcNMTMxMDI4MTMxNDQ5WjAOMQwwCgYDVQQD
-EwNkdXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHfNEEltMlHAgaxijhaLa0UGKI
-OS8I+9faQoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvn
-ZmIY7Dvg45np0JOzAI+N4q5m8Va+o2PT4QtOAcCjQjBAMB8GA1UdIwQYMBaAFGN+
-UXyZDNjgewnnhgj4Vq9qwZUwMB0GA1UdEQQWMBSCEmR1dC5zdHJvbmdzd2FuLm9y
-ZzAJBgcqhkjOPQQBA0cAMEQCIC2dlTEaLo+tRu2lQGDpdslCzJ3dSbHZUpem5m9x
-QPZSAiAhkxg3z9mPIz/Tm8EjYa0bNjgeP7Q+tr/PC3G8HCewOg==
------END CERTIFICATE-----

diff --git a/src/conftest/suiteb/1.9.2/dut/dut.key b/src/conftest/suiteb/1.9.2/dut/dut.key
deleted file mode 100644 (file)
index 4fe0d7e..0000000
--- a/src/conftest/suiteb/1.9.2/dut/dut.key
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB4b056WXTlRSo/JvcXlLc+agOedUd6rpIIlRhj/wUw+mATVe41r56L
-cNf0EwqSgQCgBwYFK4EEACKhZANiAARHfNEEltMlHAgaxijhaLa0UGKIOS8I+9fa
-QoQ1oZJ5pupiTSYwJLO+FDJYKEITwy3bA0Ss0S0mijpdgF5HTXRqByvnZmIY7Dvg
-45np0JOzAI+N4q5m8Va+o2PT4QtOAcA=
------END EC PRIVATE KEY-----

diff --git a/src/conftest/suiteb/1.6.1/dut/dut.conf b/src/conftest/suiteb/dut.conf
similarity index 60%
rename from src/conftest/suiteb/1.6.1/dut/dut.conf
rename to src/conftest/suiteb/dut.conf
index 3afe10f62b8ae55daa10b891b972c720284aee82..9b167615408f969b62f219ed4530dc2d86313f10 100644 (file)
--- a/src/conftest/suiteb/1.6.1/dut/dut.conf
+++ b/src/conftest/suiteb/dut.conf
@@ -1,6 +1,14 @@
 
 certs {
+       trusted {
+               TA256 = TA256.crt
+               TA384 = TA384.crt
+       }
        untrusted {
+               ICA256 = ICA256.crt
+               ICA384 = ICA384.crt
+               ICAlowhigh = ICAlowhigh.crt
+               ICARSA = ICARSA.crt
                dut = dut.crt
        }
 }
@@ -10,22 +18,15 @@ keys {
 }
 
 configs {
-       test {
+       ike-default {
                proposal = aes128-sha1-modp1024
                lhost = 172.16.1.10
                rhost = 172.16.1.20
                lid = dut.strongswan.org
                rid = ls.strongswan.org
-               child {
+               child-default {
                        lts = 10.10.10.1/24
                        rts = 10.20.20.1/24
                }
        }
 }
-
-actions {
-       rekey_child {
-               config = child
-               delay = 10
-       }
-}

diff --git a/src/conftest/suiteb/1.1.1/dut/dut.crt b/src/conftest/suiteb/dut.crt
similarity index 100%
rename from src/conftest/suiteb/1.1.1/dut/dut.crt
rename to src/conftest/suiteb/dut.crt

diff --git a/src/conftest/suiteb/1.1.1/dut/dut.key b/src/conftest/suiteb/dut.key
similarity index 100%
rename from src/conftest/suiteb/1.1.1/dut/dut.key
rename to src/conftest/suiteb/dut.key