testing: Migrated ikev2 scenarios to new default plugins

testing/tests/ikev2/acert-cached/hosts/carol/etc/strongswan.conf

@@ -5,5 +5,5 @@ swanctl {
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 x509 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/acert-cached/hosts/dave/etc/strongswan.conf

@@ -5,5 +5,5 @@ swanctl {
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 x509 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/acert-cached/hosts/moon/etc/strongswan.conf

@@ -5,5 +5,5 @@ swanctl {
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 acert revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 x509 acert revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/acert-fallback/hosts/carol/etc/strongswan.conf

@@ -5,5 +5,5 @@ swanctl {
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 pem pkcs1 gmp curve25519 x509 curl revocation hmac kdf kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 x509 revocation curl kernel-netlink socket-default vici
 }

testing/tests/ikev2/acert-fallback/hosts/moon/etc/strongswan.conf

@@ -5,5 +5,5 @@ swanctl {
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 pem pkcs1 gmp curve25519 x509 acert curl revocation hmac kdf kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 x509 acert revocation curl kernel-netlink socket-default vici
 }

testing/tests/ikev2/acert-inline/hosts/carol/etc/strongswan.conf

@@ -5,5 +5,5 @@ swanctl {
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 x509 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/acert-inline/hosts/dave/etc/strongswan.conf

@@ -5,5 +5,5 @@ swanctl {
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 x509 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/acert-inline/hosts/moon/etc/strongswan.conf

@@ -5,5 +5,5 @@ swanctl {
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 acert revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 x509 acert revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/after-2038-certs/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/ikev2/after-2038-certs/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/ikev2/compress-nat/hosts/alice/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/ikev2/compress-nat/hosts/bob/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/ikev2/compress-nat/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/ikev2/compress/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default
 }

testing/tests/ikev2/compress/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default
 }

testing/tests/ikev2/config-payload/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/config-payload/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/config-payload/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/critical-extension/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce pem pkcs1 x509 revocation openssl curl vici kernel-netlink socket-default updown
 
   multiple_authentication = no
 

testing/tests/ikev2/critical-extension/hosts/sun/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce pem pkcs1 x509 revocation openssl curl vici kernel-netlink socket-default updown
 
   multiple_authentication = no
 }

testing/tests/ikev2/crl-from-cache/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac kdf kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 curl revocation kernel-netlink socket-default vici
 }

testing/tests/ikev2/crl-from-cache/hosts/carol/etc/swanctl/swanctl.conf

@@ -16,8 +16,10 @@ connections {
       children {
          home {
             remote_ts = 10.1.0.0/16 
+            esp_proposals = aes128gcm128-modp3072
          }
       }
       version = 2
+      proposals = aes128-sha256-modp3072
    }
 }

testing/tests/ikev2/crl-from-cache/hosts/moon/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 aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac kdf kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 curl revocation kernel-netlink socket-default vici
 
   cache_crls = yes
 }

testing/tests/ikev2/crl-from-cache/hosts/moon/etc/swanctl/swanctl.conf

@@ -14,8 +14,10 @@ connections {
       children {
          net {
             local_ts  = 10.1.0.0/16 
-         }
+            esp_proposals = aes128gcm128-modp3072
+        }
       }
       version = 2
+      proposals = aes128-sha256-modp3072
    }
 }

testing/tests/ikev2/crl-ldap/hosts/carol/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 aes sha1 sha2 pem pkcs1 gmp x509 ldap revocation hmac kdf kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 ldap revocation kernel-netlink socket-default vici
 
   cache_crls = yes
 }

testing/tests/ikev2/crl-ldap/hosts/carol/etc/swanctl/swanctl.conf

@@ -24,8 +24,10 @@ connections {
       children {
          home {
             remote_ts = 10.1.0.0/16
-         }
+            esp_proposals = aes128gcm128-modp3072
+        }
       }
       version = 2
+      proposals = aes128-sha256-modp3072
    }
 }

testing/tests/ikev2/crl-ldap/hosts/moon/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 aes sha1 sha2 pem pkcs1 gmp x509 ldap revocation hmac kdf kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 ldap revocation kernel-netlink socket-default vici
 
   cache_crls = yes
 }

testing/tests/ikev2/crl-ldap/hosts/moon/etc/swanctl/swanctl.conf

@@ -22,8 +22,10 @@ connections {
       children {
          net {
             local_ts  = 10.1.0.0/16
+            esp_proposals = aes128gcm128-modp3072
          }
       }
       version = 2
+      proposals = aes128-sha256-modp3072
    }
 }

testing/tests/ikev2/crl-revoked/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac kdf kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 curl revocation kernel-netlink socket-default vici
 }

testing/tests/ikev2/crl-revoked/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac kdf kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 curl revocation kernel-netlink socket-default vici
 }

testing/tests/ikev2/crl-to-cache/hosts/carol/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 aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac kdf kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 curl revocation kernel-netlink socket-default vici
 
   cache_crls = yes
 }

testing/tests/ikev2/crl-to-cache/hosts/moon/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 aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac kdf kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 curl revocation kernel-netlink socket-default vici
 
   cache_crls = yes
 }

testing/tests/ikev2/dhcp-dynamic/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce sha1 sha2 aes hmac kdf pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl kernel-netlink socket-default resolve updown vici
+  load = random nonce openssl pem pkcs1 revocation constraints pubkey curl kernel-netlink socket-default resolve updown vici
 }

testing/tests/ikev2/dhcp-dynamic/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce sha1 sha2 aes hmac kdf pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl kernel-netlink socket-default resolve updown vici
+  load = random nonce openssl pem pkcs1 revocation constraints pubkey curl kernel-netlink socket-default resolve updown vici
 }

testing/tests/ikev2/dhcp-dynamic/hosts/moon/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 aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown attr farp dhcp
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown attr farp dhcp
 
   plugins {
     dhcp {

testing/tests/ikev2/dhcp-static-client-id/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce sha1 sha2 aes hmac kdf pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl kernel-netlink socket-default resolve updown vici
+  load = random nonce openssl pem pkcs1 revocation constraints pubkey curl kernel-netlink socket-default resolve updown vici
 }

testing/tests/ikev2/dhcp-static-client-id/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce sha1 sha2 aes hmac kdf pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl kernel-netlink socket-default resolve updown vici
+  load = random nonce openssl pem pkcs1 revocation constraints pubkey curl kernel-netlink socket-default resolve updown vici
 }

testing/tests/ikev2/dhcp-static-client-id/hosts/moon/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 aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown attr farp dhcp
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown attr farp dhcp
 
   plugins {
     dhcp {

testing/tests/ikev2/dhcp-static-mac/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce sha1 sha2 aes hmac kdf pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl kernel-netlink socket-default resolve updown vici
+  load = random nonce openssl pem pkcs1 revocation constraints pubkey curl kernel-netlink socket-default resolve updown vici
 }

testing/tests/ikev2/dhcp-static-mac/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce sha1 sha2 aes hmac kdf pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl kernel-netlink socket-default resolve updown vici
+  load = random nonce openssl pem pkcs1 revocation constraints pubkey curl kernel-netlink socket-default resolve updown vici
 }

testing/tests/ikev2/dhcp-static-mac/hosts/moon/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 aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown attr farp dhcp
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown attr farp dhcp
 
   plugins {
     dhcp {

testing/tests/ikev2/double-nat-net/hosts/alice/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/ikev2/double-nat-net/hosts/bob/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/ikev2/double-nat/hosts/alice/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/ikev2/double-nat/hosts/bob/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/ikev2/dpd-clear/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default
 }

testing/tests/ikev2/dpd-clear/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default
 }

testing/tests/ikev2/dpd-restart/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default
 }

testing/tests/ikev2/dpd-restart/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default
 }

testing/tests/ikev2/dpd-trap/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default
 }

testing/tests/ikev2/dpd-trap/hosts/carol/etc/swanctl/swanctl.conf

@@ -16,12 +16,13 @@ connections {
       children {
          home {
             remote_ts = 10.1.0.0/16
-            esp_proposals =aes128gcm16-x25519
+            esp_proposals = aes128gcm16-x25519
             dpd_action = trap
          }
       }
       version = 2
       mobike = no
+      proposals = aes128-sha256-x25519
       dpd_delay = 10
    }
 }

testing/tests/ikev2/dpd-trap/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default
 }

testing/tests/ikev2/dynamic-initiator/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/dynamic-initiator/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/dynamic-initiator/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/farp/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici resolve
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici resolve
 }

testing/tests/ikev2/farp/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici resolve
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici resolve
 }

testing/tests/ikev2/farp/hosts/moon/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 aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici attr farp
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici attr farp
   dns1 = PH_IP_WINNETOU
   dns2 = PH_IP_VENUS
 }

testing/tests/ikev2/force-udp-encap/hosts/alice/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/ikev2/force-udp-encap/hosts/sun/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/ikev2/forecast/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown resolve
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown resolve
 }

testing/tests/ikev2/forecast/hosts/dave/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown resolve
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown resolve
 }

testing/tests/ikev2/forecast/hosts/moon/etc/strongswan.conf

@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown attr forecast
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown attr forecast
 
   syslog {
     daemon {

testing/tests/ikev2/host2host-ah/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation xcbc gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation xcbc kdf curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/host2host-ah/hosts/moon/etc/swanctl/swanctl.conf

@@ -19,7 +19,7 @@ connections {
             rekey_time = 5400
             rekey_bytes = 500000000
             rekey_packets = 1000000
-            ah_proposals = aesxcbc
+            ah_proposals = aesxcbc-modp3072
             mode = transport
 
          }

testing/tests/ikev2/host2host-ah/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation xcbc gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation xcbc kdf curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/host2host-ah/hosts/sun/etc/swanctl/swanctl.conf

@@ -19,7 +19,7 @@ connections {
             rekey_time = 5400
             rekey_bytes = 500000000
             rekey_packets = 1000000
-            ah_proposals = aesxcbc
+            ah_proposals = aesxcbc-modp3072
             mode = transport
         }
       }

testing/tests/ikev2/host2host-cert/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/host2host-cert/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/host2host-transport-connmark/hosts/alice/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/ikev2/host2host-transport-connmark/hosts/sun/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default connmark
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default connmark
 }

testing/tests/ikev2/host2host-transport-connmark/hosts/venus/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default updown
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default updown
 }

testing/tests/ikev2/host2host-transport-nat/hosts/alice/etc/strongswan.conf

@@ -1,9 +1,9 @@
 # /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 aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/host2host-transport-nat/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/host2host-transport-nat/hosts/venus/etc/strongswan.conf

@@ -1,9 +1,9 @@
 # /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 aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/host2host-transport/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/host2host-transport/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/inactivity-timeout/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default
 }

testing/tests/ikev2/inactivity-timeout/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac kdf vici kernel-netlink socket-default
+  load = random nonce openssl pem pkcs1 curl revocation vici kernel-netlink socket-default
 }

testing/tests/ikev2/ip-pool-db/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default resolve updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default resolve updown vici
 }

testing/tests/ikev2/ip-pool-db/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default resolve updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default resolve updown vici
 }

testing/tests/ikev2/ip-pool-db/hosts/moon/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 aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown sqlite attr-sql vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown sqlite attr-sql vici
 
   plugins {
     attr-sql {

testing/tests/ikev2/ip-pool/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/ip-pool/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/ip-pool/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/ip-split-pools-db/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default vici
 }

testing/tests/ikev2/ip-split-pools-db/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default vici
 }

testing/tests/ikev2/ip-split-pools-db/hosts/moon/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 aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default sqlite attr-sql vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default sqlite attr-sql vici
 
   plugins {
     attr-sql {

testing/tests/ikev2/ip-two-pools-db/hosts/alice/etc/strongswan.conf

@@ -1,9 +1,9 @@
 # /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 aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici resolve
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici resolve
 }

testing/tests/ikev2/ip-two-pools-db/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici resolve
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici resolve
 }

testing/tests/ikev2/ip-two-pools-db/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici resolve
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici resolve
 }

testing/tests/ikev2/ip-two-pools-db/hosts/moon/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 aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl sqlite attr-sql kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl sqlite attr-sql kernel-netlink socket-default updown vici
 
   plugins {
     attr-sql {

testing/tests/ikev2/ip-two-pools-db/hosts/venus/etc/strongswan.conf

@@ -1,9 +1,9 @@
 # /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 aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici resolve
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici resolve
 }

testing/tests/ikev2/ip-two-pools-mixed/hosts/alice/etc/strongswan.conf

@@ -1,9 +1,9 @@
 # /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 aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/ip-two-pools-mixed/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default updown vici
 }

testing/tests/ikev2/ip-two-pools-mixed/hosts/moon/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 aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl sqlite attr-sql kernel-netlink socket-default updown vici
+  load = random nonce openssl pem pkcs1 revocation curl sqlite attr-sql kernel-netlink socket-default updown vici
 
   plugins {
     attr-sql {

testing/tests/ikev2/ip-two-pools-v4v6-db/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default vici
 }

testing/tests/ikev2/ip-two-pools-v4v6-db/hosts/moon/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 aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default vici sqlite attr-sql
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default vici sqlite attr-sql
 
   plugins {
     attr-sql {

testing/tests/ikev2/ip-two-pools-v4v6/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default vici
 }

testing/tests/ikev2/ip-two-pools-v4v6/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 = pem pkcs1 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
-  load = random nonce aes sha1 sha2 hmac kdf pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default vici
+  load = random nonce openssl pem pkcs1 revocation curl kernel-netlink socket-default vici
 }