testing: Migrated botan scenarios

diff --git a/testing/tests/botan/net2net-ed25519/description.txt b/testing/tests/botan/net2net-ed25519/description.txt
index 8c67989f4806fa692e357a43cbb81b0eda97474b..eeb874e63e780cf3b7d79b34e37f7b8a3b265c07 100755 (executable)
--- a/testing/tests/botan/net2net-ed25519/description.txt
+++ b/testing/tests/botan/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 botan plugin based on the Botan library for all
-cryptographical functions whereas <b>sun</b> uses the default strongSwan
-cryptographical plugins.
+cryptographical functions whereas <b>sun</b> uses <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/botan/net2net-ed25519/hosts/sun/etc/strongswan.conf b/testing/tests/botan/net2net-ed25519/hosts/sun/etc/strongswan.conf
index 13c6cf84eb2f3eca78ae67aa32838446b02a11b7..f0c7480ca3e04ad2423d4571c3dff93563ed3e43 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 = 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 constraints 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/botan/rw-cert/description.txt b/testing/tests/botan/rw-cert/description.txt
index 2d9d550fc2f3e7d6143ed8a1d5d0ffd1f5095ea6..9eb7cacb13402c780a57b196448d0263d66b224f 100755 (executable)
--- a/testing/tests/botan/rw-cert/description.txt
+++ b/testing/tests/botan/rw-cert/description.txt
@@ -1,8 +1,8 @@
 The roadwarrior <b>carol</b> and the gateway <b>moon</b> use the <b>botan</b>
 plugin based on the <b>Botan</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/botan/rw-cert/hosts/dave/etc/strongswan.conf b/testing/tests/botan/rw-cert/hosts/dave/etc/strongswan.conf
index ad87328e359d3c7bbdeec441816113e28c71d94e..d8d81a1bec99cf3befd655fcc8613373c949b3f6 100755 (executable)
--- a/testing/tests/botan/rw-cert/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/botan/rw-cert/hosts/dave/etc/strongswan.conf
@@ -5,7 +5,7 @@ swanctl {
 }
 
 charon-systemd {
-  load = random nonce sha1 sha2 aes curve25519 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
 }

diff --git a/testing/tests/botan/rw-modp3072/description.txt b/testing/tests/botan/rw-modp3072/description.txt
index 3c1c0dc8499cdf9c852b218d8997b3ab07251b53..c73a528d10837145883246cfd6a2eee86d7b574f 100755 (executable)
--- a/testing/tests/botan/rw-modp3072/description.txt
+++ b/testing/tests/botan/rw-modp3072/description.txt
@@ -1,8 +1,8 @@
 The roadwarrior <b>carol</b> and the gateway <b>moon</b> use the <b>botan</b>
 plugin based on the <b>Botan</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 t<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/botan/rw-modp3072/hosts/dave/etc/strongswan.conf b/testing/tests/botan/rw-modp3072/hosts/dave/etc/strongswan.conf
index f9df83ca4bd7a173c963f3c2572b38252de0e6e7..033ea6b2970d321078a6681e49770f890ce037ce 100755 (executable)
--- a/testing/tests/botan/rw-modp3072/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/botan/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
 }