testing: Configure logging via syslog in strongswan.conf

Globally configure logging in strongswan.conf.testing and replace all
charondebug statements with strongswan.conf settings.

testing/hosts/default/etc/strongswan.conf.testing

@@ -7,8 +7,6 @@ charon {
       xfrm_acq_expires = 60
     }
   }
-}
-charon-systemd {
   syslog {
     daemon {
     }

testing/tests/ikev1/net2net-ah/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="cfg 2, knl 3"
-
 conn %default
 	keyexchange=ikev1
 	ike=aes128-sha256-modp3072!

testing/tests/ikev1/net2net-ah/hosts/moon/etc/strongswan.conf

@@ -3,4 +3,10 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      cfg = 2
+      knl = 3
+    }
+  }
 }

testing/tests/ikev1/net2net-ah/hosts/sun/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="cfg 2, knl 3"
-
 conn %default
 	keyexchange=ikev1
 	ike=aes128-sha256-modp3072!

testing/tests/ikev1/net2net-ah/hosts/sun/etc/strongswan.conf

@@ -3,4 +3,10 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      cfg = 2
+      knl = 3
+    }
+  }
 }

testing/tests/ikev1/net2net-esn/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="cfg 2, knl 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev1/net2net-esn/hosts/moon/etc/strongswan.conf

@@ -3,4 +3,10 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      cfg = 2
+      knl = 2
+    }
+  }
 }

testing/tests/ikev1/net2net-esn/hosts/sun/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="cfg 2, knl 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev1/net2net-esn/hosts/sun/etc/strongswan.conf

@@ -3,4 +3,10 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      cfg = 2
+      knl = 2
+    }
+  }
 }

testing/tests/ikev1/net2net-ntru-cert/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="ike 4, lib 4"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
@@ -13,7 +10,7 @@ conn %default
 	esp=aes256-sha512!
 	mobike=no
 
-conn net-net 
+conn net-net
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]

testing/tests/ikev1/net2net-ntru-cert/hosts/moon/etc/strongswan.conf

@@ -6,6 +6,12 @@ charon {
   multiple_authentication = no
   send_vendor_id = yes
 
+  syslog {
+    daemon {
+      ike = 4
+      lib = 4
+    }
+  }
   plugins {
     ntru {
       parameter_set = optimum

testing/tests/ikev1/net2net-ntru-cert/hosts/sun/etc/ipsec.conf

@@ -1,19 +1,16 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="ike 4, lib 4"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
 	rekeymargin=3m
-        keyingtries=1
+	keyingtries=1
 	keyexchange=ikev1
 	ike=aes256-sha512-ntru256!
 	esp=aes256-sha512!
 	mobike=no
 
-conn net-net 
+conn net-net
 	left=PH_IP_SUN
 	leftcert=sunCert.pem
 	[email protected]

testing/tests/ikev1/net2net-ntru-cert/hosts/sun/etc/strongswan.conf

@@ -5,4 +5,10 @@ charon {
 
   multiple_authentication = no
   send_vendor_id = yes
+  syslog {
+    daemon {
+      ike = 4
+      lib = 4
+    }
+  }
 }

testing/tests/ikev1/rw-cert-aggressive/hosts/carol/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="job 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev1/rw-cert-aggressive/hosts/carol/etc/strongswan.conf

@@ -2,4 +2,9 @@
 
 charon {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
+  syslog {
+    daemon {
+      job = 2
+    }
+  }
 }

testing/tests/ikev1/rw-cert-aggressive/hosts/dave/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="job 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev1/rw-cert-aggressive/hosts/dave/etc/strongswan.conf

@@ -2,4 +2,9 @@
 
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
+  syslog {
+    daemon {
+      job = 2
+    }
+  }
 }

testing/tests/ikev2/alg-blowfish/hosts/carol/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="cfg 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/alg-blowfish/hosts/carol/etc/strongswan.conf

@@ -2,4 +2,9 @@
 
 charon {
   load = random nonce aes blowfish md5 sha1 sha2 pem pkcs1 gmp curl x509 revocation hmac stroke kernel-netlink socket-default updown
+  syslog {
+    daemon {
+      cfg = 2
+    }
+  }
 }

testing/tests/ikev2/alg-blowfish/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="cfg 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/alg-blowfish/hosts/moon/etc/strongswan.conf

@@ -2,4 +2,9 @@
 
 charon {
   load = random nonce blowfish sha1 sha2 pem pkcs1 gmp curl x509 revocation hmac stroke kernel-netlink socket-default updown
+  syslog {
+    daemon {
+      cfg = 2
+    }
+  }
 }

testing/tests/ikev2/nat-rw-mark/hosts/sun/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="knl 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
@@ -10,7 +7,7 @@ conn %default
 	keyingtries=1
 	keyexchange=ikev2
 
-conn alice 
+conn alice
 	[email protected]
 	mark=10/0xffffffff
 	also=sun

testing/tests/ikev2/nat-rw-mark/hosts/sun/etc/strongswan.conf

@@ -2,4 +2,9 @@
 
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
+  syslog {
+    daemon {
+      knl = 2
+    }
+  }
 }

testing/tests/ikev2/net2net-ah/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="cfg 2, knl 2"
-
 conn %default
 	keyexchange=ikev2
 	ike=aes128-sha256-modp3072!

testing/tests/ikev2/net2net-ah/hosts/moon/etc/strongswan.conf

@@ -3,4 +3,10 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      cfg = 2
+      knl = 2
+    }
+  }
 }

testing/tests/ikev2/net2net-ah/hosts/sun/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="cfg 2, knl 2"
-
 conn %default
 	keyexchange=ikev2
 	ike=aes128-sha256-modp3072!

testing/tests/ikev2/net2net-ah/hosts/sun/etc/strongswan.conf

@@ -3,4 +3,10 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      cfg = 2
+      knl = 2
+    }
+  }
 }

testing/tests/ikev2/net2net-esn/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="cfg 2, knl 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
@@ -13,7 +10,7 @@ conn %default
 	esp=aes128-sha256-esn-noesn!
 	mobike=no
 
-conn net-net 
+conn net-net
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]

testing/tests/ikev2/net2net-esn/hosts/moon/etc/strongswan.conf

@@ -3,4 +3,10 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      cfg = 2
+      knl = 2
+    }
+  }
 }

testing/tests/ikev2/net2net-esn/hosts/sun/etc/ipsec.conf

@@ -1,19 +1,16 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="cfg 2, knl 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
 	rekeymargin=3m
-        keyingtries=1
+	keyingtries=1
 	keyexchange=ikev2
 	ike=aes128-sha256-modp3072!
 	esp=aes128-sha256-esn!
 	mobike=no
 
-conn net-net 
+conn net-net
 	left=PH_IP_SUN
 	leftcert=sunCert.pem
 	[email protected]

testing/tests/ikev2/net2net-esn/hosts/sun/etc/strongswan.conf

@@ -3,4 +3,10 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      cfg = 2
+      knl = 2
+    }
+  }
 }

testing/tests/ikev2/net2net-ntru-bandwidth/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="ike 4, lib 4"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
@@ -13,7 +10,7 @@ conn %default
 	esp=aes128-sha256!
 	mobike=no
 
-conn net-net 
+conn net-net
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]

testing/tests/ikev2/net2net-ntru-bandwidth/hosts/moon/etc/strongswan.conf

@@ -6,9 +6,15 @@ charon {
   multiple_authentication = no
   send_vendor_id = yes
 
+  syslog {
+    daemon {
+      ike = 4
+      lib = 4
+    }
+  }
   plugins {
     ntru {
-      parameter_set = x9_98_bandwidth 
+      parameter_set = x9_98_bandwidth
     }
   }
 }

testing/tests/ikev2/net2net-ntru-bandwidth/hosts/sun/etc/ipsec.conf

@@ -1,19 +1,16 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="ike 4, lib 4"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
 	rekeymargin=3m
-        keyingtries=1
+	keyingtries=1
 	keyexchange=ikev2
 	ike=aes128-sha256-ntru128!
 	esp=aes128-sha256!
 	mobike=no
 
-conn net-net 
+conn net-net
 	left=PH_IP_SUN
 	leftcert=sunCert.pem
 	[email protected]

testing/tests/ikev2/net2net-ntru-bandwidth/hosts/sun/etc/strongswan.conf

@@ -6,6 +6,12 @@ charon {
   multiple_authentication = no
   send_vendor_id = yes
 
+  syslog {
+    daemon {
+      ike = 4
+      lib = 4
+    }
+  }
   plugins {
     ntru {
       parameter_set = x9_98_bandwidth

testing/tests/ikev2/net2net-ntru-cert/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="ike 4, lib 4"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
@@ -13,7 +10,7 @@ conn %default
 	esp=aes256-sha512!
 	mobike=no
 
-conn net-net 
+conn net-net
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]

testing/tests/ikev2/net2net-ntru-cert/hosts/moon/etc/strongswan.conf

@@ -6,6 +6,12 @@ charon {
   multiple_authentication = no
   send_vendor_id = yes
 
+  syslog {
+    daemon {
+      ike = 4
+      lib = 4
+    }
+  }
   plugins {
     ntru {
       parameter_set = optimum

testing/tests/ikev2/net2net-ntru-cert/hosts/sun/etc/ipsec.conf

@@ -1,19 +1,16 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="ike 4, lib 4"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
 	rekeymargin=3m
-        keyingtries=1
+	keyingtries=1
 	keyexchange=ikev2
 	ike=aes256-sha512-ntru256!
 	esp=aes256-sha512!
 	mobike=no
 
-conn net-net 
+conn net-net
 	left=PH_IP_SUN
 	leftcert=sunCert.pem
 	[email protected]

testing/tests/ikev2/net2net-ntru-cert/hosts/sun/etc/strongswan.conf

@@ -4,4 +4,10 @@ charon {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl mgf1 ntru revocation hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
   send_vendor_id = yes
+  syslog {
+    daemon {
+      ike = 4
+      lib = 4
+    }
+  }
 }

testing/tests/ikev2/net2net-psk-dscp/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="knl 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
@@ -25,7 +22,7 @@ conn dscp-ef
 	also=net-net
 	auto=add
 
-conn net-net 
+conn net-net
 	left=PH_IP_MOON
 	leftsubnet=10.1.0.0/16
 	leftfirewall=yes

testing/tests/ikev2/net2net-psk-dscp/hosts/moon/etc/strongswan.conf

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes sha1 sha2 curve25519 hmac curl stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      knl = 2
+    }
+  }
 }

testing/tests/ikev2/net2net-psk-dscp/hosts/sun/etc/ipsec.conf

@@ -1,13 +1,10 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="knl 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
 	rekeymargin=3m
-        keyingtries=1
+	keyingtries=1
 	keyexchange=ikev2
 	mobike=no
 
@@ -25,7 +22,7 @@ conn dscp-ef
 	also=net-net
 	auto=add
 
-conn net-net 
+conn net-net
 	left=PH_IP_SUN
 	leftsubnet=10.2.0.0/16
 	leftfirewall=yes

testing/tests/ikev2/net2net-psk-dscp/hosts/sun/etc/strongswan.conf

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes sha1 sha2 curve25519 hmac curl stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      knl = 2
+    }
+  }
 }

testing/tests/ikev2/net2net-rekey/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="knl 2"
-
 conn %default
 	ikelifetime=60m
 	lifetime=10s

testing/tests/ikev2/net2net-rekey/hosts/moon/etc/strongswan.conf

@@ -4,4 +4,9 @@ charon {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
   # remove rekeyed inbound SA a bit quicker for the test scenario
   delete_rekeyed_delay = 2
+  syslog {
+    daemon {
+      knl = 2
+    }
+  }
 }

testing/tests/ikev2/net2net-rfc3779/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="cfg 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
@@ -11,7 +8,7 @@ conn %default
 	keyexchange=ikev2
 	mobike=no
 
-conn net-net 
+conn net-net
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]

testing/tests/ikev2/net2net-rfc3779/hosts/moon/etc/strongswan.conf

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation addrblock hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      cfg = 2
+    }
+  }
 }

testing/tests/ikev2/net2net-rfc3779/hosts/sun/etc/ipsec.conf

@@ -1,17 +1,14 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="cfg 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
 	rekeymargin=3m
-        keyingtries=1
+	keyingtries=1
 	keyexchange=ikev2
 	mobike=no
 
-conn net-net 
+conn net-net
 	left=PH_IP_SUN
 	leftcert=sunCert.pem
 	[email protected]

testing/tests/ikev2/net2net-rfc3779/hosts/sun/etc/strongswan.conf

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation addrblock hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      cfg = 2
+    }
+  }
 }

testing/tests/ikev2/redirect-active/hosts/carol/etc/ipsec.conf

@@ -1,7 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="knl 2"
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/redirect-active/hosts/carol/etc/strongswan.conf

@@ -2,4 +2,9 @@
 
 charon {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
+  syslog {
+    daemon {
+      knl = 2
+    }
+  }
 }

testing/tests/ikev2/rw-eap-tls-fragments/hosts/carol/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/rw-eap-tls-fragments/hosts/carol/etc/strongswan.conf

@@ -4,6 +4,11 @@ charon {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl hmac gcm stroke kernel-netlink socket-default eap-tls updown
   multiple_authentication=no
 
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
   plugins {
     eap-tls {
       max_message_count = 40

testing/tests/ikev2/rw-eap-tls-fragments/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/rw-eap-tls-fragments/hosts/moon/etc/strongswan.conf

@@ -4,6 +4,11 @@ charon {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl hmac gcm stroke kernel-netlink socket-default eap-tls updown
   multiple_authentication=no
 
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
   plugins {
     eap-tls {
       max_message_count = 40

testing/tests/ikev2/rw-eap-tls-only/hosts/carol/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/rw-eap-tls-only/hosts/carol/etc/strongswan.conf

@@ -4,4 +4,9 @@ charon {
   load = random nonce aes md5 sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac gcm stroke kernel-netlink socket-default eap-tls updown
 
   multiple_authentication=no
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
 }

testing/tests/ikev2/rw-eap-tls-only/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/rw-eap-tls-only/hosts/moon/etc/strongswan.conf

@@ -4,6 +4,11 @@ charon {
   load = random nonce aes md5 sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac gcm stroke kernel-netlink socket-default eap-tls updown
 
   multiple_authentication=no
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
 }
 
 libtls {

testing/tests/ikev2/rw-eap-tls-radius/hosts/carol/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/rw-eap-tls-radius/hosts/carol/etc/strongswan.conf

@@ -3,6 +3,11 @@
 charon {
   load = random nonce aes md5 sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default eap-tls updown
   multiple_authentication=no
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
 }
 
 libtls {

testing/tests/ikev2/rw-eap-ttls-only/hosts/carol/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/rw-eap-ttls-only/hosts/carol/etc/strongswan.conf

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls updown
   multiple_authentication=no
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
 }

testing/tests/ikev2/rw-eap-ttls-only/hosts/dave/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/rw-eap-ttls-only/hosts/dave/etc/strongswan.conf

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls updown
   multiple_authentication=no
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
 }

testing/tests/ikev2/rw-eap-ttls-only/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/rw-eap-ttls-only/hosts/moon/etc/strongswan.conf

@@ -4,6 +4,11 @@ charon {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls updown
   multiple_authentication=no
 
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
   plugins {
     eap-ttls {
       phase2_method = md5

testing/tests/ikev2/rw-eap-ttls-phase2-piggyback/hosts/carol/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/rw-eap-ttls-phase2-piggyback/hosts/carol/etc/strongswan.conf

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls updown
   multiple_authentication=no
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
 }

testing/tests/ikev2/rw-eap-ttls-phase2-piggyback/hosts/dave/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/rw-eap-ttls-phase2-piggyback/hosts/dave/etc/strongswan.conf

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls updown
   multiple_authentication=no
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
 }

testing/tests/ikev2/rw-eap-ttls-phase2-piggyback/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/rw-eap-ttls-phase2-piggyback/hosts/moon/etc/strongswan.conf

@@ -4,6 +4,11 @@ charon {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls updown
   multiple_authentication=no
 
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
   plugins {
     eap-ttls {
       phase2_method = md5

testing/tests/ikev2/rw-eap-ttls-radius/hosts/carol/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/rw-eap-ttls-radius/hosts/carol/etc/strongswan.conf

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes md5 sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls updown
   multiple_authentication=no
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
 }

testing/tests/ikev2/rw-eap-ttls-radius/hosts/dave/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/rw-eap-ttls-radius/hosts/dave/etc/strongswan.conf

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes md5 sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls updown
   multiple_authentication=no
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
 }

testing/tests/ikev2/rw-mark-in-out/hosts/sun/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="knl 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m
@@ -10,7 +7,7 @@ conn %default
 	keyingtries=1
 	keyexchange=ikev2
 
-conn alice 
+conn alice
 	[email protected]
 	mark_in=10/0xffffffff
 	mark_out=11/0xffffffff

testing/tests/ikev2/rw-mark-in-out/hosts/sun/etc/strongswan.conf

@@ -2,4 +2,9 @@
 
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
+  syslog {
+    daemon {
+      knl = 2
+    }
+  }
 }

testing/tests/ikev2/trap-any/hosts/carol/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="knl 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

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

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      knl = 2
+    }
+  }
 }

testing/tests/ikev2/trap-any/hosts/dave/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="knl 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/trap-any/hosts/dave/etc/strongswan.conf

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      knl = 2
+    }
+  }
 }

testing/tests/ikev2/trap-any/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="knl 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

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

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      knl = 2
+    }
+  }
 }

testing/tests/ikev2/trap-any/hosts/sun/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="knl 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/ikev2/trap-any/hosts/sun/etc/strongswan.conf

@@ -3,4 +3,9 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-netlink socket-default updown
   multiple_authentication = no
+  syslog {
+    daemon {
+      knl = 2
+    }
+  }
 }

testing/tests/openssl-ikev2/rw-eap-tls-only/hosts/carol/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/openssl-ikev2/rw-eap-tls-only/hosts/carol/etc/strongswan.conf

@@ -3,4 +3,9 @@
 charon {
   load = pem pkcs1 random nonce openssl curl revocation stroke kernel-netlink socket-default eap-tls updown
   multiple_authentication=no
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
 }

testing/tests/openssl-ikev2/rw-eap-tls-only/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="tls 2"
-
 conn %default
 	ikelifetime=60m
 	keylife=20m

testing/tests/openssl-ikev2/rw-eap-tls-only/hosts/moon/etc/strongswan.conf

@@ -3,6 +3,11 @@
 charon {
   load = pem pkcs1 random nonce openssl curl revocation stroke kernel-netlink socket-default eap-tls updown
   multiple_authentication=no
+  syslog {
+    daemon {
+      tls = 2
+    }
+  }
 }
 
 libtls {

testing/tests/pfkey/net2net-rekey/hosts/moon/etc/ipsec.conf

@@ -1,8 +1,5 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
-config setup
-	charondebug="knl 2"
-
 conn %default
 	ikelifetime=60m
 	lifetime=10s

testing/tests/pfkey/net2net-rekey/hosts/moon/etc/strongswan.conf

@@ -4,4 +4,9 @@ charon {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac stroke kernel-pfkey kernel-netlink socket-default updown
   # remove rekeyed inbound SA a bit quicker for the test scenario
   delete_rekeyed_delay = 2
+  syslog {
+    daemon {
+      knl = 2
+    }
+  }
 }

testing/tests/tnc/tnccs-20-fhh/hosts/dave/etc/strongswan.conf

@@ -4,7 +4,6 @@ charon-systemd {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 gmp hmac x509 revocation curl vici kernel-netlink socket-default eap-identity eap-md5 eap-ttls eap-tnc tnc-imc tnc-tnccs tnccs-20 updown
 
   multiple_authentication = no
-
   syslog {
     daemon {
       tnc = 3

testing/tests/tnc/tnccs-20-hcd-eap/hosts/carol/etc/strongswan.conf

@@ -57,7 +57,7 @@ libimcv {
             }
             fw-2 {
               name = Firmware UVW for ARMv6 32 bit strongPrint OS 1.0
-              patches = "security patch CVE-2014-1288 2014-01-01\r\nsecurity patch CVE-2014-1492 2014-02-01\r\nsecurity patch CVE-2014-1622 2014-05-01\r\nsecurity patch CVE-2014-2775 2014-07-01\r\n\security patch CVE-2014-4453 2014-08-01\r\nsecurity patch CVE-2014-6108 2014-11-01\r\nsecurity patch CVE-2015-0555 2015-01-01\r\nsecurity patch CVE-2015-4319 2015-07-01\r\n"
+              patches = "security patch CVE-2014-1288 2014-01-01\r\nsecurity patch CVE-2014-1492 2014-02-01\r\nsecurity patch CVE-2014-1622 2014-05-01\r\nsecurity patch CVE-2014-2775 2014-07-01\r\n\security patch CVE-2014-4453 2014-08-01\r\nsecurity patch CVE-2014-6108 2014-11-01\r\nsecurity patch CVE-2015-0555 2015-01-01\r\nsecurity patch CVE-2015-4319 2015-07-01\r\n" 
               string_version = 13.8.5
               version = 0000000D000000080000000500000000
             }

testing/tests/tnc/tnccs-20-mutual-eap-fail/hosts/sun/etc/strongswan.conf

@@ -3,8 +3,7 @@
 charon-systemd {
   load = random nonce x509 openssl pem pkcs1 revocation curl vici kernel-netlink socket-default eap-identity eap-ttls eap-tnc tnc-tnccs tnc-imc tnc-imv tnccs-20 updown
 
-   multiple_authentication = no
+  multiple_authentication = no
-
   syslog {
     daemon {
       tnc = 2

testing/tests/tnc/tnccs-20-mutual-eap/hosts/sun/etc/strongswan.conf

@@ -3,8 +3,7 @@
 charon-systemd {
   load = random nonce x509 openssl pem pkcs1 revocation curl vici kernel-netlink socket-default eap-identity eap-ttls eap-tnc tnc-tnccs tnc-imc tnc-imv tnccs-20 updown
 
-   multiple_authentication = no
+  multiple_authentication = no
-
   syslog {
     daemon {
       tnc = 2

testing/tests/tnc/tnccs-20-os-pts/hosts/moon/etc/strongswan.conf

@@ -5,7 +5,7 @@ charon-systemd {
 
   multiple_authentication = no
 
- syslog {
+  syslog {
     daemon {
       tnc = 2
       imv = 3