testing: Optimized plugin use in pkcs8 scenarios

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
 }

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
 }

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 {

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 {

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
 }

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
 }

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
 }

testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-charon {
+swanctl {
-  load = random nonce pem pkcs1 openssl curl revocation vici kernel-netlink socket-default updown
+  load = pem openssl
+}
+
+charon-systemd {
+  load = nonce pem openssl curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/dave/etc/strongswan.conf

@@ -1,5 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-charon {
+swanctl {
-  load = random nonce pem pkcs1 openssl curl revocation vici kernel-netlink socket-default updown
+  load = pem openssl
+}
+
+charon-systemd {
+  load = nonce pem openssl curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-charon {
+swanctl {
-  load = random nonce pem pkcs1 openssl curl revocation vici kernel-netlink socket-default updown
+  load = pem openssl
+}
+
+charon-systemd {
+  load = nonce pem openssl curl revocation vici kernel-netlink socket-default updown
 }

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 {

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 {