hash-and-url avoids IP fragmentation, cert and crl fetch based on IPv6

diff --git a/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/init.d/iptables b/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/init.d/iptables
index 25074a0f1edaa1484fd21249246d00988c15f735..2bca6ddf3a4ad3c8b0e8d67393cbc33fcf6ee436 100755 (executable)
--- a/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/init.d/iptables
+++ b/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/init.d/iptables
@@ -48,9 +48,9 @@ start() {
        ip6tables -A INPUT  -p icmpv6 --icmpv6-type neighbor-advertisement -j ACCEPT
        ip6tables -A OUTPUT -p icmpv6 --icmpv6-type neighbor-advertisement -j ACCEPT
 
-       # allow crl fetch from winnetou
-       iptables -A INPUT  -i eth0 -p tcp --sport 80 -s PH_IP_WINNETOU -j ACCEPT
-       iptables -A OUTPUT -o eth0 -p tcp --dport 80 -d PH_IP_WINNETOU -j ACCEPT
+       # allow crl and certificate fetch from winnetou
+       ip6tables -A INPUT  -i eth0 -p tcp --sport 80 -s PH_IP6_WINNETOU -j ACCEPT
+       ip6tables -A OUTPUT -o eth0 -p tcp --dport 80 -d PH_IP6_WINNETOU -j ACCEPT
 
        # allow ssh
        iptables -A INPUT  -p tcp --dport 22 -j ACCEPT

diff --git a/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/ipsec.conf b/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/ipsec.conf
index ccc8037b510c3253aca59a4ffaf6764bf9d34c67..930ae57854642f09556be5b493928654f44527a8 100755 (executable)
--- a/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/ipsec.conf
@@ -5,6 +5,12 @@ config setup
        crlcheckinterval=180
        plutostart=no
 
+ca strongswan
+       cacert=strongswanCert.pem
+       certuribase=http://ip6-winnetou.strongswan.org/certs/
+       crluri=http://ip6-winnetou.strongswan.org/strongswan.crl
+       auto=add
+
 conn %default
        ikelifetime=60m
        keylife=20m

diff --git a/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/strongswan.conf
index 06b1e9f4892f3fb4db4496be7c0f3c0c49c2e5f3..4732113faeae5b03c31a7f2c940652a8dcbc7b71 100644 (file)
--- a/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/strongswan.conf
@@ -1,5 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
+  hash_and_url = yes
   load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

diff --git a/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/init.d/iptables b/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/init.d/iptables
index 25074a0f1edaa1484fd21249246d00988c15f735..2bca6ddf3a4ad3c8b0e8d67393cbc33fcf6ee436 100755 (executable)
--- a/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/init.d/iptables
+++ b/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/init.d/iptables
@@ -48,9 +48,9 @@ start() {
        ip6tables -A INPUT  -p icmpv6 --icmpv6-type neighbor-advertisement -j ACCEPT
        ip6tables -A OUTPUT -p icmpv6 --icmpv6-type neighbor-advertisement -j ACCEPT
 
-       # allow crl fetch from winnetou
-       iptables -A INPUT  -i eth0 -p tcp --sport 80 -s PH_IP_WINNETOU -j ACCEPT
-       iptables -A OUTPUT -o eth0 -p tcp --dport 80 -d PH_IP_WINNETOU -j ACCEPT
+       # allow crl and certificate fetch from winnetou
+       ip6tables -A INPUT  -i eth0 -p tcp --sport 80 -s PH_IP6_WINNETOU -j ACCEPT
+       ip6tables -A OUTPUT -o eth0 -p tcp --dport 80 -d PH_IP6_WINNETOU -j ACCEPT
 
        # allow ssh
        iptables -A INPUT  -p tcp --dport 22 -j ACCEPT

diff --git a/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/ipsec.conf b/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/ipsec.conf
index 1ec8b49d6d932d22385ccb0cf3f6115678b2a143..d7653f1c3c9df3c5c61c2a5f0da8fceecb9c6ef6 100755 (executable)
--- a/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/ipsec.conf
+++ b/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/ipsec.conf
@@ -5,6 +5,12 @@ config setup
        crlcheckinterval=180
        plutostart=no
 
+ca strongswan
+       cacert=strongswanCert.pem
+       certuribase=http://ip6-winnetou.strongswan.org/certs/
+       crluri=http://ip6-winnetou.strongswan.org/strongswan.crl
+       auto=add
+
 conn %default
        ikelifetime=60m
        keylife=20m

diff --git a/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/strongswan.conf b/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/strongswan.conf
index 06b1e9f4892f3fb4db4496be7c0f3c0c49c2e5f3..4732113faeae5b03c31a7f2c940652a8dcbc7b71 100644 (file)
--- a/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/strongswan.conf
@@ -1,5 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
+  hash_and_url = yes
   load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 hmac xcbc stroke kernel-netlink updown
 }

diff --git a/testing/tests/ipv6/host2host-ikev2/pretest.dat b/testing/tests/ipv6/host2host-ikev2/pretest.dat
index 3536fd8865dbaea181e7514386901224af8f9de2..7e97e77834fb92da0071f9445092b4e755aac058 100644 (file)
--- a/testing/tests/ipv6/host2host-ikev2/pretest.dat
+++ b/testing/tests/ipv6/host2host-ikev2/pretest.dat
@@ -4,3 +4,4 @@ moon::ipsec start
 sun::ipsec start
 moon::sleep 2 
 moon::ipsec up host-host
+moon::sleep 1