From 558529afe266b2872e22976040afa3e6e931fbc6 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Fri, 21 Oct 2022 20:38:16 +0200
Subject: [PATCH] testing: Migrated wolfssl scenarios

---
 testing/tests/wolfssl/net2net-ed25519/description.txt       | 4 ++--
 .../wolfssl/net2net-ed25519/hosts/sun/etc/strongswan.conf   | 4 ++--
 testing/tests/wolfssl/rw-cert/description.txt               | 6 +++---
 .../tests/wolfssl/rw-cert/hosts/dave/etc/strongswan.conf    | 4 ++--
 testing/tests/wolfssl/rw-modp3072/description.txt           | 6 +++---
 .../wolfssl/rw-modp3072/hosts/dave/etc/strongswan.conf      | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/testing/tests/wolfssl/net2net-ed25519/description.txt b/testing/tests/wolfssl/net2net-ed25519/description.txt
index f50109769..58dbc6b33 100755
--- a/testing/tests/wolfssl/net2net-ed25519/description.txt
+++ b/testing/tests/wolfssl/net2net-ed25519/description.txt
@@ -1,8 +1,8 @@
 A connection between the subnets behind the gateways <b>moon</b> and <b>sun</b> is set up.
 The authentication is based on <b>X.509 certificates</b> containing <b>Ed25519</b> keys.
 <b>moon</b> uses the wolfssl plugin based on the wolfCrypt library for all
-cryptographical functions whereas <b>sun</b> uses the default strongSwan
-cryptographical plugins.
+cryptographical functions whereas <b>sun</b> uses t<b>openssl</b> as the default
+<b>strongSwan</b> cryptographical plugin.
 <p/>
 Upon the successful establishment of the IPsec tunnel, the updown script automatically
 inserts iptables-based firewall rules that let pass the tunneled traffic.
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 24aa52cfb..f0c7480ca 100755
--- a/testing/tests/wolfssl/net2net-ed25519/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/wolfssl/net2net-ed25519/hosts/sun/etc/strongswan.conf
@@ -1,9 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = random pem sha1 pkcs1 pkcs8 curve25519 x509 revocation constraints
+  load = random pem pkcs1 openssl revocation constraints
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 pkcs8 x509 revocation curve25519 curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation constraints curl kernel-netlink socket-default updown vici
 }
diff --git a/testing/tests/wolfssl/rw-cert/description.txt b/testing/tests/wolfssl/rw-cert/description.txt
index 9006bcb51..3fffa7b6a 100755
--- a/testing/tests/wolfssl/rw-cert/description.txt
+++ b/testing/tests/wolfssl/rw-cert/description.txt
@@ -1,8 +1,8 @@
 The roadwarrior <b>carol</b> and the gateway <b>moon</b> use the <b>wolfssl</b>
 plugin based on the <b>wolfSSL</b> library for all cryptographical functions whereas
-roadwarrior <b>dave</b> uses the default <b>strongSwan</b> cryptographical
-plugins. The authentication is based on <b>X.509 certificates</b> and the key exchange
-on <b>x25519</b>.
+roadwarrior <b>dave</b> uses <b>openssl</b> as the default <b>strongSwan</b>
+cryptographical plugin. The authentication is based on <b>X.509 certificates</b>
+and the key exchange on <b>x25519</b>.
 <p/>
 Upon the successful establishment of the IPsec tunnels, the updown script
 automatically inserts iptables-based firewall rules that let pass the tunneled traffic.
diff --git a/testing/tests/wolfssl/rw-cert/hosts/dave/etc/strongswan.conf b/testing/tests/wolfssl/rw-cert/hosts/dave/etc/strongswan.conf
index ba275349d..924fc90dc 100755
--- a/testing/tests/wolfssl/rw-cert/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/wolfssl/rw-cert/hosts/dave/etc/strongswan.conf
@@ -1,11 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pkcs1 pem openssl x509 revocation constraints
+  load = pkcs1 pem openssl revocation constraints
 }
 
 charon-systemd {
-  load = random nonce sha1 sha2 sha3 aes curve25519 hmac kdf mgf1 pem pkcs1 x509 revocation constraints gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation constraints curl kernel-netlink socket-default updown vici
 
   rsa_pss = yes
 }
diff --git a/testing/tests/wolfssl/rw-modp3072/description.txt b/testing/tests/wolfssl/rw-modp3072/description.txt
index a847d2652..de6d2ff69 100755
--- a/testing/tests/wolfssl/rw-modp3072/description.txt
+++ b/testing/tests/wolfssl/rw-modp3072/description.txt
@@ -1,8 +1,8 @@
 The roadwarrior <b>carol</b> and the gateway <b>moon</b> use the <b>wolfssl</b>
 plugin based on the <b>wolfCrypt</b> library for all cryptographical functions whereas
-roadwarrior <b>dave</b> uses the default <b>strongSwan</b> cryptographical
-plugins. The authentication is based on <b>X.509 certificates</b> and the key exchange
-on <b>modp3072</b>.
+roadwarrior <b>dave</b> uses <b>openssl</b> as the default <b>strongSwan</b>
+cryptographical plugin. The authentication is based on <b>X.509 certificates</b>
+and the key exchange on <b>modp3072</b>.
 <p/>
 Upon the successful establishment of the IPsec tunnels, the updown script
 automatically inserts iptables-based firewall rules that let pass the tunneled traffic.
diff --git a/testing/tests/wolfssl/rw-modp3072/hosts/dave/etc/strongswan.conf b/testing/tests/wolfssl/rw-modp3072/hosts/dave/etc/strongswan.conf
index f9df83ca4..033ea6b29 100755
--- a/testing/tests/wolfssl/rw-modp3072/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/wolfssl/rw-modp3072/hosts/dave/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 sha1 sha2 aes hmac kdf mgf1 pem pkcs1 x509 revocation constraints pubkey gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation constraints pubkey curl kernel-netlink socket-default updown vici
 
   rsa_pss = yes
 }