From b81a72ef5cba1a96db3bc0b4fef062231ef6d6c7 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Thu, 20 Oct 2022 16:51:31 +0200
Subject: [PATCH] testing: Migrated route-based scenarios to new default
 plugins

---
 .../route-based/net2net-gre/hosts/moon/etc/strongswan.conf    | 4 ++--
 .../route-based/net2net-gre/hosts/sun/etc/strongswan.conf     | 4 ++--
 .../route-based/net2net-vti/hosts/moon/etc/strongswan.conf    | 4 ++--
 .../route-based/net2net-vti/hosts/sun/etc/strongswan.conf     | 4 ++--
 .../net2net-xfrmi-ike/hosts/moon/etc/strongswan.conf          | 4 ++--
 .../net2net-xfrmi-ike/hosts/sun/etc/strongswan.conf           | 4 ++--
 .../net2net-xfrmi-netns/hosts/moon/etc/strongswan.conf        | 4 ++--
 .../net2net-xfrmi-netns/hosts/sun/etc/strongswan.conf         | 4 ++--
 .../route-based/net2net-xfrmi/hosts/moon/etc/strongswan.conf  | 4 ++--
 .../route-based/net2net-xfrmi/hosts/sun/etc/strongswan.conf   | 4 ++--
 .../rw-shared-vti-ip6-in-ip4/hosts/carol/etc/strongswan.conf  | 4 ++--
 .../rw-shared-vti-ip6-in-ip4/hosts/dave/etc/strongswan.conf   | 4 ++--
 .../rw-shared-vti-ip6-in-ip4/hosts/moon/etc/strongswan.conf   | 4 ++--
 .../route-based/rw-shared-vti/hosts/carol/etc/strongswan.conf | 4 ++--
 .../route-based/rw-shared-vti/hosts/dave/etc/strongswan.conf  | 4 ++--
 .../route-based/rw-shared-vti/hosts/moon/etc/strongswan.conf  | 4 ++--
 .../rw-shared-xfrmi/hosts/carol/etc/strongswan.conf           | 4 ++--
 .../rw-shared-xfrmi/hosts/dave/etc/strongswan.conf            | 4 ++--
 .../rw-shared-xfrmi/hosts/moon/etc/strongswan.conf            | 4 ++--
 19 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/testing/tests/route-based/net2net-gre/hosts/moon/etc/strongswan.conf b/testing/tests/route-based/net2net-gre/hosts/moon/etc/strongswan.conf
index 55b903f0dc..ecfacd2dd8 100644
--- a/testing/tests/route-based/net2net-gre/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/route-based/net2net-gre/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-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }
 
 charon {
diff --git a/testing/tests/route-based/net2net-gre/hosts/sun/etc/strongswan.conf b/testing/tests/route-based/net2net-gre/hosts/sun/etc/strongswan.conf
index 55b903f0dc..ecfacd2dd8 100644
--- a/testing/tests/route-based/net2net-gre/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/route-based/net2net-gre/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-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }
 
 charon {
diff --git a/testing/tests/route-based/net2net-vti/hosts/moon/etc/strongswan.conf b/testing/tests/route-based/net2net-vti/hosts/moon/etc/strongswan.conf
index 55b903f0dc..ecfacd2dd8 100644
--- a/testing/tests/route-based/net2net-vti/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/route-based/net2net-vti/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-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }
 
 charon {
diff --git a/testing/tests/route-based/net2net-vti/hosts/sun/etc/strongswan.conf b/testing/tests/route-based/net2net-vti/hosts/sun/etc/strongswan.conf
index 55b903f0dc..ecfacd2dd8 100644
--- a/testing/tests/route-based/net2net-vti/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/route-based/net2net-vti/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-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }
 
 charon {
diff --git a/testing/tests/route-based/net2net-xfrmi-ike/hosts/moon/etc/strongswan.conf b/testing/tests/route-based/net2net-xfrmi-ike/hosts/moon/etc/strongswan.conf
index e02353f799..5292ed0711 100644
--- a/testing/tests/route-based/net2net-xfrmi-ike/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/route-based/net2net-xfrmi-ike/hosts/moon/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /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-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }
diff --git a/testing/tests/route-based/net2net-xfrmi-ike/hosts/sun/etc/strongswan.conf b/testing/tests/route-based/net2net-xfrmi-ike/hosts/sun/etc/strongswan.conf
index ce28060096..17d28dd469 100644
--- a/testing/tests/route-based/net2net-xfrmi-ike/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/route-based/net2net-xfrmi-ike/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-netlink socket-default
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default
   start-scripts {
     updown = /usr/bin/python3 /etc/updown.py
   }
diff --git a/testing/tests/route-based/net2net-xfrmi-netns/hosts/moon/etc/strongswan.conf b/testing/tests/route-based/net2net-xfrmi-netns/hosts/moon/etc/strongswan.conf
index e02353f799..5292ed0711 100644
--- a/testing/tests/route-based/net2net-xfrmi-netns/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/route-based/net2net-xfrmi-netns/hosts/moon/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /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-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }
diff --git a/testing/tests/route-based/net2net-xfrmi-netns/hosts/sun/etc/strongswan.conf b/testing/tests/route-based/net2net-xfrmi-netns/hosts/sun/etc/strongswan.conf
index e02353f799..5292ed0711 100644
--- a/testing/tests/route-based/net2net-xfrmi-netns/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/route-based/net2net-xfrmi-netns/hosts/sun/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /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-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }
diff --git a/testing/tests/route-based/net2net-xfrmi/hosts/moon/etc/strongswan.conf b/testing/tests/route-based/net2net-xfrmi/hosts/moon/etc/strongswan.conf
index e02353f799..5292ed0711 100644
--- a/testing/tests/route-based/net2net-xfrmi/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/route-based/net2net-xfrmi/hosts/moon/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /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-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }
diff --git a/testing/tests/route-based/net2net-xfrmi/hosts/sun/etc/strongswan.conf b/testing/tests/route-based/net2net-xfrmi/hosts/sun/etc/strongswan.conf
index e02353f799..5292ed0711 100644
--- a/testing/tests/route-based/net2net-xfrmi/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/route-based/net2net-xfrmi/hosts/sun/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /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-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }
diff --git a/testing/tests/route-based/rw-shared-vti-ip6-in-ip4/hosts/carol/etc/strongswan.conf b/testing/tests/route-based/rw-shared-vti-ip6-in-ip4/hosts/carol/etc/strongswan.conf
index 2177dee8d0..5ac39a3371 100755
--- a/testing/tests/route-based/rw-shared-vti-ip6-in-ip4/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/route-based/rw-shared-vti-ip6-in-ip4/hosts/carol/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /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 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }
diff --git a/testing/tests/route-based/rw-shared-vti-ip6-in-ip4/hosts/dave/etc/strongswan.conf b/testing/tests/route-based/rw-shared-vti-ip6-in-ip4/hosts/dave/etc/strongswan.conf
index 2177dee8d0..5ac39a3371 100755
--- a/testing/tests/route-based/rw-shared-vti-ip6-in-ip4/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/route-based/rw-shared-vti-ip6-in-ip4/hosts/dave/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /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 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }
diff --git a/testing/tests/route-based/rw-shared-vti-ip6-in-ip4/hosts/moon/etc/strongswan.conf b/testing/tests/route-based/rw-shared-vti-ip6-in-ip4/hosts/moon/etc/strongswan.conf
index 55b903f0dc..ecfacd2dd8 100644
--- a/testing/tests/route-based/rw-shared-vti-ip6-in-ip4/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/route-based/rw-shared-vti-ip6-in-ip4/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-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }
 
 charon {
diff --git a/testing/tests/route-based/rw-shared-vti/hosts/carol/etc/strongswan.conf b/testing/tests/route-based/rw-shared-vti/hosts/carol/etc/strongswan.conf
index 2177dee8d0..5ac39a3371 100755
--- a/testing/tests/route-based/rw-shared-vti/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/route-based/rw-shared-vti/hosts/carol/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /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 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }
diff --git a/testing/tests/route-based/rw-shared-vti/hosts/dave/etc/strongswan.conf b/testing/tests/route-based/rw-shared-vti/hosts/dave/etc/strongswan.conf
index 2177dee8d0..5ac39a3371 100755
--- a/testing/tests/route-based/rw-shared-vti/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/route-based/rw-shared-vti/hosts/dave/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /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 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }
diff --git a/testing/tests/route-based/rw-shared-vti/hosts/moon/etc/strongswan.conf b/testing/tests/route-based/rw-shared-vti/hosts/moon/etc/strongswan.conf
index 55b903f0dc..ecfacd2dd8 100644
--- a/testing/tests/route-based/rw-shared-vti/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/route-based/rw-shared-vti/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-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }
 
 charon {
diff --git a/testing/tests/route-based/rw-shared-xfrmi/hosts/carol/etc/strongswan.conf b/testing/tests/route-based/rw-shared-xfrmi/hosts/carol/etc/strongswan.conf
index 2177dee8d0..5ac39a3371 100755
--- a/testing/tests/route-based/rw-shared-xfrmi/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/route-based/rw-shared-xfrmi/hosts/carol/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /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 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }
diff --git a/testing/tests/route-based/rw-shared-xfrmi/hosts/dave/etc/strongswan.conf b/testing/tests/route-based/rw-shared-xfrmi/hosts/dave/etc/strongswan.conf
index 2177dee8d0..5ac39a3371 100755
--- a/testing/tests/route-based/rw-shared-xfrmi/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/route-based/rw-shared-xfrmi/hosts/dave/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /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 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }
diff --git a/testing/tests/route-based/rw-shared-xfrmi/hosts/moon/etc/strongswan.conf b/testing/tests/route-based/rw-shared-xfrmi/hosts/moon/etc/strongswan.conf
index e02353f799..5292ed0711 100644
--- a/testing/tests/route-based/rw-shared-xfrmi/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/route-based/rw-shared-xfrmi/hosts/moon/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /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-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }
-- 
2.47.2