updated default configuration of UML hosts to 5.0.0

diff --git a/testing/hosts/alice/etc/ipsec.conf b/testing/hosts/alice/etc/ipsec.conf
index 134c1c032dfe5961c6648a7bf1f0c09c02a7943d..0671537e994d414b23b3abead2860879228e982c 100755 (executable)
--- a/testing/hosts/alice/etc/ipsec.conf
+++ b/testing/hosts/alice/etc/ipsec.conf
@@ -1,21 +1,15 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
 config setup
-       plutodebug=control
-       crlcheckinterval=180
-       strictcrlpolicy=no
-       nat_traversal=yes
-       charonstart=no
 
 conn %default
        ikelifetime=60m
        keylife=20m
        rekeymargin=3m
        keyingtries=1
-       keyexchange=ikev1
                
 conn nat-t
-       left=%defaultroute
+       left=%any
        leftcert=aliceCert.pem
        leftid=alice@strongswan.org
        leftfirewall=yes

diff --git a/testing/hosts/alice/etc/strongswan.conf b/testing/hosts/alice/etc/strongswan.conf
index c4c200a07ca14c42389f2256a1ecf212f4075bd2..f7a87e90cf2602b0499ab41c3aa48319cde76db8 100644 (file)
--- a/testing/hosts/alice/etc/strongswan.conf
+++ b/testing/hosts/alice/etc/strongswan.conf
@@ -1,11 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random nonce curl kernel-netlink
+charon {
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints pubkey gmp random nonce curl kernel-netlink socket-default updown stroke
 }
 
-# pluto uses optimized DH exponent sizes (RFC 3526)
-
 libstrongswan {
   dh_exponent_ansi_x9_42 = no
 }

diff --git a/testing/hosts/bob/etc/ipsec.conf b/testing/hosts/bob/etc/ipsec.conf
index 62c0ec787decb4550f90fa033fd7d4a7e193e706..5896c3436442ea9cb5375c5eb4cd8494f466cc7a 100755 (executable)
--- a/testing/hosts/bob/etc/ipsec.conf
+++ b/testing/hosts/bob/etc/ipsec.conf
@@ -1,24 +1,18 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
 config setup
-       plutodebug=control
-       crlcheckinterval=180
-       strictcrlpolicy=no
-       nat_traversal=yes
-       charonstart=no
 
 conn %default
        ikelifetime=60m
        keylife=20m
        rekeymargin=3m
        keyingtries=1
-       keyexchange=ikev1
 
 conn nat-t
-       left=%defaultroute
+       left=%any
        leftcert=bobCert.pem
        leftid=bob@strongswan.org
        leftfirewall=yes
        right=%any
-       rightsubnetwithin=10.1.0.0/16
+       rightsubnet=10.1.0.0/16
        auto=add

diff --git a/testing/hosts/bob/etc/strongswan.conf b/testing/hosts/bob/etc/strongswan.conf
index c4c200a07ca14c42389f2256a1ecf212f4075bd2..f7a87e90cf2602b0499ab41c3aa48319cde76db8 100644 (file)
--- a/testing/hosts/bob/etc/strongswan.conf
+++ b/testing/hosts/bob/etc/strongswan.conf
@@ -1,11 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random nonce curl kernel-netlink
+charon {
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints pubkey gmp random nonce curl kernel-netlink socket-default updown stroke
 }
 
-# pluto uses optimized DH exponent sizes (RFC 3526)
-
 libstrongswan {
   dh_exponent_ansi_x9_42 = no
 }

diff --git a/testing/hosts/carol/etc/ipsec.conf b/testing/hosts/carol/etc/ipsec.conf
index 1def6ca99c226e6af498f255f3f475695dfaee0d..0848ee716d07aea4f6fec5f82517e67d8c04bb2f 100755 (executable)
--- a/testing/hosts/carol/etc/ipsec.conf
+++ b/testing/hosts/carol/etc/ipsec.conf
@@ -1,17 +1,12 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
 config setup
-       plutodebug=control
-       crlcheckinterval=180
-       strictcrlpolicy=no
-       charonstart=no
 
 conn %default
        ikelifetime=60m
        keylife=20m
        rekeymargin=3m
        keyingtries=1
-       keyexchange=ikev1
 
 conn home
        left=PH_IP_CAROL

diff --git a/testing/hosts/carol/etc/strongswan.conf b/testing/hosts/carol/etc/strongswan.conf
index c4c200a07ca14c42389f2256a1ecf212f4075bd2..f7a87e90cf2602b0499ab41c3aa48319cde76db8 100644 (file)
--- a/testing/hosts/carol/etc/strongswan.conf
+++ b/testing/hosts/carol/etc/strongswan.conf
@@ -1,11 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random nonce curl kernel-netlink
+charon {
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints pubkey gmp random nonce curl kernel-netlink socket-default updown stroke
 }
 
-# pluto uses optimized DH exponent sizes (RFC 3526)
-
 libstrongswan {
   dh_exponent_ansi_x9_42 = no
 }

diff --git a/testing/hosts/dave/etc/ipsec.conf b/testing/hosts/dave/etc/ipsec.conf
index c9d559f0d985a9a05a3b7df7b269b8737e266259..96502581e5483326b920016f0e2b70660ce616f5 100755 (executable)
--- a/testing/hosts/dave/etc/ipsec.conf
+++ b/testing/hosts/dave/etc/ipsec.conf
@@ -1,17 +1,12 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
 config setup
-       plutodebug=control
-       crlcheckinterval=180
-       strictcrlpolicy=no
-       charonstart=no
 
 conn %default
        ikelifetime=60m
        keylife=20m
        rekeymargin=3m
        keyingtries=1
-       keyexchange=ikev1
 
 conn home
        left=PH_IP_DAVE

diff --git a/testing/hosts/dave/etc/strongswan.conf b/testing/hosts/dave/etc/strongswan.conf
index c4c200a07ca14c42389f2256a1ecf212f4075bd2..f7a87e90cf2602b0499ab41c3aa48319cde76db8 100644 (file)
--- a/testing/hosts/dave/etc/strongswan.conf
+++ b/testing/hosts/dave/etc/strongswan.conf
@@ -1,11 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random nonce curl kernel-netlink
+charon {
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints pubkey gmp random nonce curl kernel-netlink socket-default updown stroke
 }
 
-# pluto uses optimized DH exponent sizes (RFC 3526)
-
 libstrongswan {
   dh_exponent_ansi_x9_42 = no
 }

diff --git a/testing/hosts/moon/etc/ipsec.conf b/testing/hosts/moon/etc/ipsec.conf
index b1e6549cf77aa4b35ef57e27f930752950bb8d9c..6ee481e495ac901d63b7a41fecbbb65cdf5426c4 100755 (executable)
--- a/testing/hosts/moon/etc/ipsec.conf
+++ b/testing/hosts/moon/etc/ipsec.conf
@@ -1,17 +1,12 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
 config setup
-       plutodebug=control
-       crlcheckinterval=180
-       strictcrlpolicy=no
-       charonstart=no
 
 conn %default
        ikelifetime=60m
        keylife=20m
        rekeymargin=3m
        keyingtries=1
-       keyexchange=ikev1
        left=PH_IP_MOON
        leftcert=moonCert.pem
        leftid=@moon.strongswan.org

diff --git a/testing/hosts/moon/etc/strongswan.conf b/testing/hosts/moon/etc/strongswan.conf
index c4c200a07ca14c42389f2256a1ecf212f4075bd2..f7a87e90cf2602b0499ab41c3aa48319cde76db8 100644 (file)
--- a/testing/hosts/moon/etc/strongswan.conf
+++ b/testing/hosts/moon/etc/strongswan.conf
@@ -1,11 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random nonce curl kernel-netlink
+charon {
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints pubkey gmp random nonce curl kernel-netlink socket-default updown stroke
 }
 
-# pluto uses optimized DH exponent sizes (RFC 3526)
-
 libstrongswan {
   dh_exponent_ansi_x9_42 = no
 }

diff --git a/testing/hosts/sun/etc/ipsec.conf b/testing/hosts/sun/etc/ipsec.conf
index 083e589702a206169afa151cc230ecf246c77c9a..277928ec1fe78802406876ac554e574aeaf03572 100755 (executable)
--- a/testing/hosts/sun/etc/ipsec.conf
+++ b/testing/hosts/sun/etc/ipsec.conf
@@ -1,18 +1,12 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
 config setup
-       plutodebug=control
-       crlcheckinterval=180
-       strictcrlpolicy=no
-       nat_traversal=yes
-       charonstart=no
 
 conn %default
        ikelifetime=60m
        keylife=20m
        rekeymargin=3m
        keyingtries=1
-       keyexchange=ikev1
        left=PH_IP_SUN
        leftcert=sunCert.pem
        leftid=@sun.strongswan.org
@@ -33,5 +27,5 @@ conn host-host
 conn nat-t
        leftsubnet=10.2.0.0/16
        right=%any
-       rightsubnetwithin=10.1.0.0/16
+       rightsubnet=10.1.0.0/16
        auto=add

diff --git a/testing/hosts/sun/etc/strongswan.conf b/testing/hosts/sun/etc/strongswan.conf
index c4c200a07ca14c42389f2256a1ecf212f4075bd2..f7a87e90cf2602b0499ab41c3aa48319cde76db8 100644 (file)
--- a/testing/hosts/sun/etc/strongswan.conf
+++ b/testing/hosts/sun/etc/strongswan.conf
@@ -1,11 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random nonce curl kernel-netlink
+charon {
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints pubkey gmp random nonce curl kernel-netlink socket-default updown stroke
 }
 
-# pluto uses optimized DH exponent sizes (RFC 3526)
-
 libstrongswan {
   dh_exponent_ansi_x9_42 = no
 }

diff --git a/testing/hosts/venus/etc/ipsec.conf b/testing/hosts/venus/etc/ipsec.conf
index 86cd6c9d45e2f847b46bda8bbdeaea7039d68fda..dd6a82f89a2c6311aa7bc35b29c27269eb7b1c8d 100755 (executable)
--- a/testing/hosts/venus/etc/ipsec.conf
+++ b/testing/hosts/venus/etc/ipsec.conf
@@ -1,21 +1,15 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
 config setup
-       plutodebug=control
-       crlcheckinterval=180
-       strictcrlpolicy=no
-       nat_traversal=yes
-       charonstart=no
 
 conn %default
        ikelifetime=60m
        keylife=20m
        rekeymargin=3m
        keyingtries=1
-       keyexchange=ikev1
 
 conn nat-t
-       left=%defaultroute
+       left=%any
        leftcert=venusCert.pem
        leftid=@venus.strongswan.org
        leftfirewall=yes

diff --git a/testing/hosts/venus/etc/strongswan.conf b/testing/hosts/venus/etc/strongswan.conf
index c4c200a07ca14c42389f2256a1ecf212f4075bd2..f7a87e90cf2602b0499ab41c3aa48319cde76db8 100644 (file)
--- a/testing/hosts/venus/etc/strongswan.conf
+++ b/testing/hosts/venus/etc/strongswan.conf
@@ -1,11 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
-pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random nonce curl kernel-netlink
+charon {
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints pubkey gmp random nonce curl kernel-netlink socket-default updown stroke
 }
 
-# pluto uses optimized DH exponent sizes (RFC 3526)
-
 libstrongswan {
   dh_exponent_ansi_x9_42 = no
 }