testing: Optimized plugin use in pkcs8 scenarios

diff --git a/testing/tests/botan/net2net-ed25519/hosts/moon/etc/strongswan.conf b/testing/tests/botan/net2net-ed25519/hosts/moon/etc/strongswan.conf
index 508c30a00ad3e00d5dbc33ca68f290d7eb1b8430..27954d8e2fab4ebb72a890a3adfc7248c74e3bb4 100755 (executable)
--- a/testing/tests/botan/net2net-ed25519/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/botan/net2net-ed25519/hosts/moon/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = random pem x509 revocation constraints pubkey botan
+  load = random pem botan x509 revocation constraints
 }
 
 charon-systemd {
-  load = random nonce pem x509 botan revocation curl kernel-netlink socket-default updown vici
+  load = random nonce pem botan x509 revocation constraints curl kernel-netlink socket-default updown vici
 }

diff --git a/testing/tests/botan/net2net-ed25519/hosts/sun/etc/strongswan.conf b/testing/tests/botan/net2net-ed25519/hosts/sun/etc/strongswan.conf
index a35aea01cc3e02a701fd13d6139350ad0a858ce7..f3115e84efe1ed1cea69b7d16c473013b9f2c7c4 100755 (executable)
--- a/testing/tests/botan/net2net-ed25519/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/botan/net2net-ed25519/hosts/sun/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 pkcs8 curve25519 x509 revocation constraints pubkey openssl random
+  load = random pem sha1 pkcs1 pkcs8 curve25519 x509 revocation constraints
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac pem pkcs1 pkcs8 x509 revocation curve25519 curl kernel-netlink socket-default updown vici
+  load = random nonce aes sha1 sha2 hmac pem pkcs1 pkcs8 x509 revocation constraints curve25519 curl kernel-netlink socket-default updown vici
 }

diff --git a/testing/tests/ikev2/net2net-ed25519/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/net2net-ed25519/hosts/moon/etc/strongswan.conf
index a35aea01cc3e02a701fd13d6139350ad0a858ce7..e6713bc9d431236b0da6e35c2581fc39bb9ed491 100755 (executable)
--- a/testing/tests/ikev2/net2net-ed25519/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ikev2/net2net-ed25519/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 pkcs8 curve25519 x509 revocation constraints pubkey openssl random
+  load = random pem sha1 pkcs1 pkcs8 curve25519 x509 revocation constraints
 }
 
 charon-systemd {

diff --git a/testing/tests/ikev2/net2net-ed25519/hosts/sun/etc/strongswan.conf b/testing/tests/ikev2/net2net-ed25519/hosts/sun/etc/strongswan.conf
index a35aea01cc3e02a701fd13d6139350ad0a858ce7..e6713bc9d431236b0da6e35c2581fc39bb9ed491 100755 (executable)
--- a/testing/tests/ikev2/net2net-ed25519/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ikev2/net2net-ed25519/hosts/sun/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 pkcs8 curve25519 x509 revocation constraints pubkey openssl random
+  load = random pem sha1 pkcs1 pkcs8 curve25519 x509 revocation constraints
 }
 
 charon-systemd {

diff --git a/testing/tests/ikev2/rw-pkcs8/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/rw-pkcs8/hosts/carol/etc/strongswan.conf
index 7415f931cb2d09b6f74df2e3ce95435ce082ee22..539c0447077600cc919deae180a8d890e52722e3 100755 (executable)
--- a/testing/tests/ikev2/rw-pkcs8/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-pkcs8/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 = random des sha1 pem pkcs1 pkcs8 gmp x509 revocation constraints
 }
 
 charon-systemd {
-  load = random drbg nonce aes sha1 sha2 pem pkcs1 pkcs8 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
+  load = random nonce aes sha1 sha2 hmac pem pkcs1 gmp x509 revocation curve25519 curl kernel-netlink socket-default updown vici
 }

diff --git a/testing/tests/ikev2/rw-pkcs8/hosts/dave/etc/strongswan.conf b/testing/tests/ikev2/rw-pkcs8/hosts/dave/etc/strongswan.conf
index 7415f931cb2d09b6f74df2e3ce95435ce082ee22..7e1d249f5562cac386bd69332f5dc8fe1aa13be3 100755 (executable)
--- a/testing/tests/ikev2/rw-pkcs8/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-pkcs8/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 = random aes sha1 pem pkcs1 pkcs8 gmp x509 revocation constraints
 }
 
 charon-systemd {
-  load = random drbg nonce aes sha1 sha2 pem pkcs1 pkcs8 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
+  load = random nonce aes sha1 sha2 hmac pem pkcs1 gmp x509 revocation curve25519 curl kernel-netlink socket-default updown vici
 }

diff --git a/testing/tests/ikev2/rw-pkcs8/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/rw-pkcs8/hosts/moon/etc/strongswan.conf
index 7415f931cb2d09b6f74df2e3ce95435ce082ee22..1dbc15b633d0fffe03dc22afce7d361fab671aca 100755 (executable)
--- a/testing/tests/ikev2/rw-pkcs8/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-pkcs8/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 = random sha1 pem pkcs1 gmp x509 revocation constraints
 }
 
 charon-systemd {
-  load = random drbg nonce aes sha1 sha2 pem pkcs1 pkcs8 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
+  load = random nonce aes sha1 sha2 hmac pem pkcs1 pkcs8 gmp x509 revocation curve25519 curl kernel-netlink socket-default updown vici
 }

diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/carol/etc/strongswan.conf b/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/carol/etc/strongswan.conf
index a322670f4b19de0c3a6c79fcffc652c6de3ad985..1c5179f81ef45709376837df1e3c22529545fc2e 100644 (file)
--- a/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/carol/etc/strongswan.conf
@@ -1,5 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-charon {
-  load = random nonce pem pkcs1 openssl curl revocation vici kernel-netlink socket-default updown
+swanctl {
+  load = pem openssl
+}
+
+charon-systemd {
+  load = nonce pem openssl curl revocation vici kernel-netlink socket-default updown
 }

diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/dave/etc/strongswan.conf
index a322670f4b19de0c3a6c79fcffc652c6de3ad985..1c5179f81ef45709376837df1e3c22529545fc2e 100644 (file)
--- a/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/dave/etc/strongswan.conf
@@ -1,5 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-charon {
-  load = random nonce pem pkcs1 openssl curl revocation vici kernel-netlink socket-default updown
+swanctl {
+  load = pem openssl
+}
+
+charon-systemd {
+  load = nonce pem openssl curl revocation vici kernel-netlink socket-default updown
 }

diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/moon/etc/strongswan.conf
index a322670f4b19de0c3a6c79fcffc652c6de3ad985..1c5179f81ef45709376837df1e3c22529545fc2e 100644 (file)
--- a/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/moon/etc/strongswan.conf
@@ -1,5 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-charon {
-  load = random nonce pem pkcs1 openssl curl revocation vici kernel-netlink socket-default updown
+swanctl {
+  load = pem openssl
+}
+
+charon-systemd {
+  load = nonce pem openssl curl revocation vici kernel-netlink socket-default updown
 }

diff --git a/testing/tests/wolfssl/net2net-ed25519/hosts/moon/etc/strongswan.conf b/testing/tests/wolfssl/net2net-ed25519/hosts/moon/etc/strongswan.conf
index b32eaf53a69b1cde4cfb3b054de9657e5f122057..3c7664b30152c06fdb4dc4ee87a0fa2858576ebb 100755 (executable)
--- a/testing/tests/wolfssl/net2net-ed25519/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/wolfssl/net2net-ed25519/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = random pem wolfssl pkcs1 pkcs8 x509 revocation constraints
+  load = random pem wolfssl x509 revocation constraints
 }
 
 charon-systemd {

diff --git a/testing/tests/wolfssl/net2net-ed25519/hosts/sun/etc/strongswan.conf b/testing/tests/wolfssl/net2net-ed25519/hosts/sun/etc/strongswan.conf
index a35aea01cc3e02a701fd13d6139350ad0a858ce7..e6713bc9d431236b0da6e35c2581fc39bb9ed491 100755 (executable)
--- a/testing/tests/wolfssl/net2net-ed25519/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/wolfssl/net2net-ed25519/hosts/sun/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 pkcs8 curve25519 x509 revocation constraints pubkey openssl random
+  load = random pem sha1 pkcs1 pkcs8 curve25519 x509 revocation constraints
 }
 
 charon-systemd {