testing: Minimum required plugins for net2net-pkcs12 scenarios

diff --git a/testing/tests/botan/net2net-pkcs12/hosts/moon/etc/strongswan.conf b/testing/tests/botan/net2net-pkcs12/hosts/moon/etc/strongswan.conf
index 1d9a7c08b5f7556e5248b747d26162efd606ac94..03351e0fe0c6ec6b2a802d854dd2f964a2cf79c5 100644 (file)
--- a/testing/tests/botan/net2net-pkcs12/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/botan/net2net-pkcs12/hosts/moon/etc/strongswan.conf
@@ -1,6 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-charon {
-  load = pem nonce revocation botan x509 curl vici kernel-netlink socket-default updown
-  multiple_authentication = no
+swanctl {
+  load = pem pkcs7 pkcs8 pkcs12 botan x509 revocation constraints
+}
+
+charon-systemd {
+  load = pem nonce botan x509 revocation constraints curl vici kernel-netlink socket-default updown
 }

diff --git a/testing/tests/botan/net2net-pkcs12/hosts/sun/etc/strongswan.conf b/testing/tests/botan/net2net-pkcs12/hosts/sun/etc/strongswan.conf
index 1d9a7c08b5f7556e5248b747d26162efd606ac94..03351e0fe0c6ec6b2a802d854dd2f964a2cf79c5 100644 (file)
--- a/testing/tests/botan/net2net-pkcs12/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/botan/net2net-pkcs12/hosts/sun/etc/strongswan.conf
@@ -1,6 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-charon {
-  load = pem nonce revocation botan x509 curl vici kernel-netlink socket-default updown
-  multiple_authentication = no
+swanctl {
+  load = pem pkcs7 pkcs8 pkcs12 botan x509 revocation constraints
+}
+
+charon-systemd {
+  load = pem nonce botan x509 revocation constraints curl vici kernel-netlink socket-default updown
 }

diff --git a/testing/tests/ikev2/net2net-pkcs12/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/net2net-pkcs12/hosts/moon/etc/strongswan.conf
index d165857f0db225c06013d188704cb48468ea20f6..9cd68f153589c3c9904203ce30ca88a4e85c4dfe 100755 (executable)
--- a/testing/tests/ikev2/net2net-pkcs12/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ikev2/net2net-pkcs12/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 aes sha1 sha2 hmac pem pkcs1 pkcs7 pkcs8 pkcs12 gmp x509 revocation constraints
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac pem pkcs1 pkcs12 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  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/net2net-pkcs12/hosts/sun/etc/strongswan.conf b/testing/tests/ikev2/net2net-pkcs12/hosts/sun/etc/strongswan.conf
index d165857f0db225c06013d188704cb48468ea20f6..9cd68f153589c3c9904203ce30ca88a4e85c4dfe 100755 (executable)
--- a/testing/tests/ikev2/net2net-pkcs12/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ikev2/net2net-pkcs12/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 = random aes sha1 sha2 hmac pem pkcs1 pkcs7 pkcs8 pkcs12 gmp x509 revocation constraints
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac pem pkcs1 pkcs12 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  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/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/strongswan.conf
index a8ed134485de02fbbcfa9528bbf918aa5cdfc839..9232c58ad166574027b0149a2af0ed6c62f3a0e8 100644 (file)
--- a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/strongswan.conf
@@ -1,6 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-charon {
-  load = pem nonce revocation openssl curl vici kernel-netlink socket-default updown
-  multiple_authentication = no
+swanctl {
+  load = pem openssl
+}
+
+charon-systemd {
+  load = pem nonce openssl curl vici kernel-netlink socket-default updown
 }

diff --git a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/strongswan.conf b/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/strongswan.conf
index a8ed134485de02fbbcfa9528bbf918aa5cdfc839..9232c58ad166574027b0149a2af0ed6c62f3a0e8 100644 (file)
--- a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/strongswan.conf
@@ -1,6 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-charon {
-  load = pem nonce revocation openssl curl vici kernel-netlink socket-default updown
-  multiple_authentication = no
+swanctl {
+  load = pem openssl
+}
+
+charon-systemd {
+  load = pem nonce openssl curl vici kernel-netlink socket-default updown
 }