From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Fri, 22 Oct 2021 09:39:20 +0000 (+0200)
Subject: testing: Minimum required plugins for net2net-pkcs12 scenarios
X-Git-Tag: 5.9.5dr1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c7288d6f155dbada79ad8d94609501a27ca9464;p=thirdparty%2Fstrongswan.git

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 1d9a7c08b5..03351e0fe0 100644
--- 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 1d9a7c08b5..03351e0fe0 100644
--- 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 d165857f0d..9cd68f1535 100755
--- 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 d165857f0d..9cd68f1535 100755
--- 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 a8ed134485..9232c58ad1 100644
--- 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 a8ed134485..9232c58ad1 100644
--- 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
 }