testing: migrated openssl-ikev2/critical-extension to swanctl

testing/tests/openssl-ikev2/critical-extension/evaltest.dat

@@ -1,6 +1,4 @@
 moon::cat /var/log/daemon.log::sending end entity cert::YES
 moon::cat /var/log/daemon.log::received AUTHENTICATION_FAILED notify error::YES
 sun:: cat /var/log/daemon.log::found unsupported critical X.509 extension::YES
-sun:: cat /var/log/daemon.log::building CRED_CERTIFICATE - ANY failed::YES
-sun:: cat /var/log/daemon.log::loading certificate from 'sunCert.der' failed::YES
 sun:: cat /var/log/daemon.log::building CRED_CERTIFICATE - X509 failed::YES

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

@@ -1,9 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = pem pkcs1 random nonce openssl revocation curl hmac stroke kernel-netlink socket-default updown
+  load = random nonce pem pkcs1 openssl revocation curl vici kernel-netlink socket-default updown
   multiple_authentication = no
+}
 
+libstrongswan {
   x509 {
     enforce_critical = no
   }

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

@@ -0,0 +1,26 @@
+connections {
+
+   gw-gw {
+      local_addrs  = 192.168.0.1
+      remote_addrs = 192.168.0.2
+
+      local {
+         auth = pubkey
+         id = moon.strongswan.org
+      }
+      remote {
+         auth = pubkey
+         id = sun.strongswan.org
+      }
+      children {
+         net-net {
+            local_ts  = 10.1.0.0/16
+            remote_ts = 10.2.0.0/16
+            esp_proposals = aes128gcm128-ecp256
+         }
+      }
+      version = 2
+      mobike = no
+      proposals = aes128-sha256-ecp256
+   }
+}

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

@@ -1,6 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = pem pkcs1 random nonce openssl curl revocation hmac stroke kernel-netlink socket-default updown
+  load = random nonce pem pkcs1 openssl curl revocation vici kernel-netlink socket-default updown
   multiple_authentication = no
 }

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

@@ -0,0 +1,26 @@
+connections {
+
+   gw-gw {
+      local_addrs  = 192.168.0.2
+      remote_addrs = 192.168.0.1
+
+      local {
+         auth = pubkey
+         id = sun.strongswan.org
+      }
+      remote {
+         auth = pubkey
+         id = moon.strongswan.org
+      }
+      children {
+         net-net {
+            local_ts  = 10.2.0.0/16
+            remote_ts = 10.1.0.0/16
+             esp_proposals = aes128gcm128-ecp256
+         }
+      }
+      version = 2
+      mobike = no
+      proposals = aes128-sha256-ecp256
+   }
+}

testing/tests/openssl-ikev2/critical-extension/posttest.dat

@@ -1,5 +1,4 @@
-moon::ipsec stop
+moon::systemctl stop strongswan-swanctl
-sun::ipsec stop
+sun::systemctl stop strongswan-swanctl
-moon::iptables-restore < /etc/iptables.flush
+moon::rm /etc/swanctl/x509/moonCert.der
-sun::iptables-restore < /etc/iptables.flush
+sun::rm /etc/swanctl/x509/sunCert.der
-

testing/tests/openssl-ikev2/critical-extension/pretest.dat

@@ -1,7 +1,7 @@
-moon::iptables-restore < /etc/iptables.rules
+moon::rm /etc/swanctl/x509/moonCert.pem
-sun::iptables-restore < /etc/iptables.rules
+sun::rm /etc/swanctl/x509/sunCert.pem
-moon::ipsec start
+moon::systemctl start strongswan-swanctl
-sun::ipsec start
+sun::systemctl start strongswan-swanctl
-moon::expect-connection net-net
+moon::expect-connection gw-gw
-sun::expect-connection net-net
+sun::expect-connection gw-gw
-moon::ipsec up net-net
+moon::swanctl --initiate --child net-net 2> /dev/null

testing/tests/openssl-ikev2/critical-extension/test.conf

@@ -19,3 +19,7 @@ TCPDUMPHOSTS=""
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon sun"
+
+# charon controlled by swanctl
+#
+SWANCTL=1