testing: Migrated libipsec scenarios to new default plugins

diff --git a/testing/tests/libipsec/host2host-cert-raw/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/host2host-cert-raw/hosts/moon/etc/strongswan.conf
index ac1b8556421cd9b6a1899a075b3db321977b7982..9ff1eb85bcee541f9193fe22b616eecfb5c7f9b3 100644 (file)
--- a/testing/tests/libipsec/host2host-cert-raw/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/host2host-cert-raw/hosts/moon/etc/strongswan.conf
@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
 
   multiple_authentication = no
 

diff --git a/testing/tests/libipsec/host2host-cert-raw/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/host2host-cert-raw/hosts/sun/etc/strongswan.conf
index ac1b8556421cd9b6a1899a075b3db321977b7982..9ff1eb85bcee541f9193fe22b616eecfb5c7f9b3 100644 (file)
--- a/testing/tests/libipsec/host2host-cert-raw/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/host2host-cert-raw/hosts/sun/etc/strongswan.conf
@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
 
   multiple_authentication = no
 

diff --git a/testing/tests/libipsec/host2host-cert/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/host2host-cert/hosts/moon/etc/strongswan.conf
index 38bcce263de14f21b998f0d30c73540908ed13a0..9adf2aa998d1c997c4c58f56ba0c6b286744f281 100644 (file)
--- a/testing/tests/libipsec/host2host-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/host2host-cert/hosts/moon/etc/strongswan.conf
@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
 
   multiple_authentication = no
 

diff --git a/testing/tests/libipsec/host2host-cert/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/host2host-cert/hosts/sun/etc/strongswan.conf
index 38bcce263de14f21b998f0d30c73540908ed13a0..9adf2aa998d1c997c4c58f56ba0c6b286744f281 100644 (file)
--- a/testing/tests/libipsec/host2host-cert/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/host2host-cert/hosts/sun/etc/strongswan.conf
@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
 
   multiple_authentication = no
 

diff --git a/testing/tests/libipsec/net2net-3des/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/net2net-3des/hosts/moon/etc/strongswan.conf
index 141a52e18d2e89aa845da10cc32b81863415ec94..c98c6731ea8219dd198883f7e419427a22fd798a 100644 (file)
--- a/testing/tests/libipsec/net2net-3des/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-3des/hosts/moon/etc/strongswan.conf
@@ -1,10 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce des sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac kdf vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
 }

diff --git a/testing/tests/libipsec/net2net-3des/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/net2net-3des/hosts/sun/etc/strongswan.conf
index 141a52e18d2e89aa845da10cc32b81863415ec94..c98c6731ea8219dd198883f7e419427a22fd798a 100644 (file)
--- a/testing/tests/libipsec/net2net-3des/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-3des/hosts/sun/etc/strongswan.conf
@@ -1,10 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce des sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac kdf vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
 }

diff --git a/testing/tests/libipsec/net2net-cert-ip6-in-ip4/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/net2net-cert-ip6-in-ip4/hosts/moon/etc/strongswan.conf
index 6870d32fe621e5faea954b484e33eed465a17277..5304b76e47b4c7a91fb6f4f2a033dd46434905c3 100644 (file)
--- a/testing/tests/libipsec/net2net-cert-ip6-in-ip4/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-cert-ip6-in-ip4/hosts/moon/etc/strongswan.conf
@@ -1,10 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce pem pkcs1 x509 openssl curl revocation vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 openssl curl revocation vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
 }

diff --git a/testing/tests/libipsec/net2net-cert-ip6-in-ip4/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/net2net-cert-ip6-in-ip4/hosts/sun/etc/strongswan.conf
index 6870d32fe621e5faea954b484e33eed465a17277..5304b76e47b4c7a91fb6f4f2a033dd46434905c3 100644 (file)
--- a/testing/tests/libipsec/net2net-cert-ip6-in-ip4/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-cert-ip6-in-ip4/hosts/sun/etc/strongswan.conf
@@ -1,10 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce pem pkcs1 x509 openssl curl revocation vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 openssl curl revocation vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
 }

diff --git a/testing/tests/libipsec/net2net-cert-ip6-in-ip6-raw/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/net2net-cert-ip6-in-ip6-raw/hosts/moon/etc/strongswan.conf
index e2c90b0bfac9a4233b4aa83120a676dc4b5259ec..734f05b5fcad4c78347f28f4bb1d1d27a3037d86 100644 (file)
--- a/testing/tests/libipsec/net2net-cert-ip6-in-ip6-raw/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-cert-ip6-in-ip6-raw/hosts/moon/etc/strongswan.conf
@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 gcm pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
   plugins {
     kernel-libipsec {

diff --git a/testing/tests/libipsec/net2net-cert-ip6-in-ip6-raw/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/net2net-cert-ip6-in-ip6-raw/hosts/sun/etc/strongswan.conf
index fa2a2a49c7de269c1d179831d1072a840647562e..734f05b5fcad4c78347f28f4bb1d1d27a3037d86 100644 (file)
--- a/testing/tests/libipsec/net2net-cert-ip6-in-ip6-raw/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-cert-ip6-in-ip6-raw/hosts/sun/etc/strongswan.conf
@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 gcm pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici ker_nel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
   plugins {
     kernel-libipsec {

diff --git a/testing/tests/libipsec/net2net-cert-ip6-in-ip6-raw/hosts/sun/etc/swanctl/swanctl.conf b/testing/tests/libipsec/net2net-cert-ip6-in-ip6-raw/hosts/sun/etc/swanctl/swanctl.conf
index 6d3bb72260867b6938a4e3ba35e4c02b8a86a15a..4e5ad5a072bf51d4c81fc25c7c8973f3724d3a30 100755 (executable)
--- a/testing/tests/libipsec/net2net-cert-ip6-in-ip6-raw/hosts/sun/etc/swanctl/swanctl.conf
+++ b/testing/tests/libipsec/net2net-cert-ip6-in-ip6-raw/hosts/sun/etc/swanctl/swanctl.conf
@@ -19,7 +19,6 @@ connections {
             remote_ts = fec1::0/16
 
             updown = /etc/updown
-            updown = /usr/local/libexec/ipsec/_updown iptables
             esp_proposals = aes128gcm128-x25519
          }
       }

diff --git a/testing/tests/libipsec/net2net-cert-raw/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/net2net-cert-raw/hosts/moon/etc/strongswan.conf
index e2c90b0bfac9a4233b4aa83120a676dc4b5259ec..734f05b5fcad4c78347f28f4bb1d1d27a3037d86 100644 (file)
--- a/testing/tests/libipsec/net2net-cert-raw/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-cert-raw/hosts/moon/etc/strongswan.conf
@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 gcm pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
   plugins {
     kernel-libipsec {

diff --git a/testing/tests/libipsec/net2net-cert-raw/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/net2net-cert-raw/hosts/sun/etc/strongswan.conf
index fa2a2a49c7de269c1d179831d1072a840647562e..734f05b5fcad4c78347f28f4bb1d1d27a3037d86 100644 (file)
--- a/testing/tests/libipsec/net2net-cert-raw/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-cert-raw/hosts/sun/etc/strongswan.conf
@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 gcm pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici ker_nel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
   plugins {
     kernel-libipsec {

diff --git a/testing/tests/libipsec/net2net-cert-raw/hosts/sun/etc/swanctl/swanctl.conf b/testing/tests/libipsec/net2net-cert-raw/hosts/sun/etc/swanctl/swanctl.conf
index 36229552b5f33faae87ada369cc63787bb90758f..892678746ad605d1ad54f798ae066ae9e2dcee7c 100755 (executable)
--- a/testing/tests/libipsec/net2net-cert-raw/hosts/sun/etc/swanctl/swanctl.conf
+++ b/testing/tests/libipsec/net2net-cert-raw/hosts/sun/etc/swanctl/swanctl.conf
@@ -19,7 +19,6 @@ connections {
             remote_ts = 10.1.0.0/16
 
             updown = /etc/updown
-            updown = /usr/local/libexec/ipsec/_updown iptables
             esp_proposals = aes128gcm128-x25519
          }
       }

diff --git a/testing/tests/libipsec/net2net-cert/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/net2net-cert/hosts/moon/etc/strongswan.conf
index 8ce7c2a783b2408a58d615a92d155b0b7e904c22..c98c6731ea8219dd198883f7e419427a22fd798a 100644 (file)
--- a/testing/tests/libipsec/net2net-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-cert/hosts/moon/etc/strongswan.conf
@@ -1,10 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 gcm pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
 }

diff --git a/testing/tests/libipsec/net2net-cert/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/net2net-cert/hosts/sun/etc/strongswan.conf
index 8ce7c2a783b2408a58d615a92d155b0b7e904c22..c98c6731ea8219dd198883f7e419427a22fd798a 100644 (file)
--- a/testing/tests/libipsec/net2net-cert/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-cert/hosts/sun/etc/strongswan.conf
@@ -1,10 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 gcm pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
 }

diff --git a/testing/tests/libipsec/net2net-null/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/net2net-null/hosts/moon/etc/strongswan.conf
index 9e2091f317e3e4917bd27a4cf473df2745548b79..23cdf9acb49a752d96f595d42a94756368f318ca 100644 (file)
--- a/testing/tests/libipsec/net2net-null/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-null/hosts/moon/etc/strongswan.conf
@@ -1,10 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce pem pkcs1 revocation openssl curl vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 revocation openssl curl vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
 }

diff --git a/testing/tests/libipsec/net2net-null/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/net2net-null/hosts/sun/etc/strongswan.conf
index 9e2091f317e3e4917bd27a4cf473df2745548b79..23cdf9acb49a752d96f595d42a94756368f318ca 100644 (file)
--- a/testing/tests/libipsec/net2net-null/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-null/hosts/sun/etc/strongswan.conf
@@ -1,10 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce pem pkcs1 revocation openssl curl vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 revocation openssl curl vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
 }

diff --git a/testing/tests/libipsec/net2net-trap/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/net2net-trap/hosts/moon/etc/strongswan.conf
index 8ce7c2a783b2408a58d615a92d155b0b7e904c22..c98c6731ea8219dd198883f7e419427a22fd798a 100644 (file)
--- a/testing/tests/libipsec/net2net-trap/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-trap/hosts/moon/etc/strongswan.conf
@@ -1,10 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 gcm pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
 }

diff --git a/testing/tests/libipsec/net2net-trap/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/net2net-trap/hosts/sun/etc/strongswan.conf
index 8ce7c2a783b2408a58d615a92d155b0b7e904c22..c98c6731ea8219dd198883f7e419427a22fd798a 100644 (file)
--- a/testing/tests/libipsec/net2net-trap/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-trap/hosts/sun/etc/strongswan.conf
@@ -1,10 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random
+  load = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 gcm pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-libipsec kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-libipsec kernel-netlink socket-default updown
   multiple_authentication = no
 }