diff options
Diffstat (limited to 'testing/tests')
30 files changed, 55 insertions, 41 deletions
diff --git a/testing/tests/double-nat-net/evaltest.dat b/testing/tests/double-nat-net/evaltest.dat index 41eba6501..d00613c07 100644 --- a/testing/tests/double-nat-net/evaltest.dat +++ b/testing/tests/double-nat-net/evaltest.dat @@ -1,5 +1,5 @@ alice::ipsec status::nat-t.*STATE_QUICK_I2.*IPsec SA established::YES bob::ipsec status::nat-t.*STATE_QUICK_R2.*IPsec SA established::YES -alice::ping -c 1 PH_IP1_SUN::64 bytes from PH_IP1_SUN: icmp_seq=1::YES +alice::ping -c 1 PH_IP_SUN1::64 bytes from PH_IP_SUN1: icmp_seq=1::YES moon::tcpdump::IP moon.strongswan.org.* > sun.strongswan.org.ipsec-nat-t: UDP::YES moon::tcpdump::IP sun.strongswan.org.ipsec-nat-t > moon.strongswan.org.*: UDP::YES diff --git a/testing/tests/ikev2-host2host/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2-host2host/hosts/moon/etc/ipsec.conf index 20ed31f5a..73cbfa50f 100644 --- a/testing/tests/ikev2-host2host/hosts/moon/etc/ipsec.conf +++ b/testing/tests/ikev2-host2host/hosts/moon/etc/ipsec.conf @@ -6,9 +6,11 @@ config setup plutostart=no conn host-host - left=PH_IP_SUN - leftcert=sunCert.pem - right=PH_IP_MOON - rightcert=moonCert.pem + left=PH_IP_MOON + leftcert=moonCert.pem + leftid=@moon.strongswan.org + right=PH_IP_SUN + rightcert=sunCert.pem + rightid=@sun.strongswan.org keyexchange=ikev2 auto=add diff --git a/testing/tests/ikev2-host2host/hosts/sun/etc/ipsec.conf b/testing/tests/ikev2-host2host/hosts/sun/etc/ipsec.conf index e759c8b18..ca8e2a7f4 100644 --- a/testing/tests/ikev2-host2host/hosts/sun/etc/ipsec.conf +++ b/testing/tests/ikev2-host2host/hosts/sun/etc/ipsec.conf @@ -6,9 +6,11 @@ config setup plutostart=no conn host-host - left=PH_IP_MOON - leftcert=moonCert.pem - right=PH_IP_SUN - rightcert=sunCert.pem + left=PH_IP_SUN + leftcert=sunCert.pem + leftid=@sun.strongswan.org + right=PH_IP_MOON + rightcert=moonCert.pem + rightid=@moon.strongswan.org keyexchange=ikev2 auto=add diff --git a/testing/tests/ikev2-ikev1-mixed/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2-ikev1-mixed/hosts/moon/etc/ipsec.conf index dae4cf516..ecdbd329d 100644 --- a/testing/tests/ikev2-ikev1-mixed/hosts/moon/etc/ipsec.conf +++ b/testing/tests/ikev2-ikev1-mixed/hosts/moon/etc/ipsec.conf @@ -2,8 +2,15 @@ version 2.0 # conforms to second version of ipsec.conf specification +config setup + plutodebug=control + crlcheckinterval=180 + conn %default + ikelifetime=60m + keylife=20m left=PH_IP_MOON + leftnexthop=%direct leftcert=moonCert.pem leftid=@moon.strongswan.org leftsubnet=10.1.0.0/16 diff --git a/testing/tests/mode-config-swapped/hosts/moon/etc/ipsec.conf b/testing/tests/mode-config-swapped/hosts/moon/etc/ipsec.conf index a449130cd..eab435d53 100755 --- a/testing/tests/mode-config-swapped/hosts/moon/etc/ipsec.conf +++ b/testing/tests/mode-config-swapped/hosts/moon/etc/ipsec.conf @@ -15,7 +15,7 @@ conn %default keyingtries=1 right=PH_IP_MOON rightsubnet=10.1.0.0/16 - rightsourceip=PH_IP1_MOON + rightsourceip=PH_IP_MOON1 rightnexthop=%direct rightcert=moonCert.pem rightid=@moon.strongswan.org @@ -24,11 +24,11 @@ conn %default conn rw-carol left=%any leftid=carol@strongswan.org - leftsourceip=PH_IP1_CAROL + leftsourceip=PH_IP_CAROL1 auto=add conn rw-dave left=%any leftid=dave@strongswan.org - leftsourceip=PH_IP1_DAVE + leftsourceip=PH_IP_DAVE1 auto=add diff --git a/testing/tests/mode-config-swapped/posttest.dat b/testing/tests/mode-config-swapped/posttest.dat index 932b319a7..f5fa1f375 100644 --- a/testing/tests/mode-config-swapped/posttest.dat +++ b/testing/tests/mode-config-swapped/posttest.dat @@ -7,5 +7,5 @@ dave::ipsec stop moon::/etc/init.d/iptables stop 2> /dev/null carol::/etc/init.d/iptables stop 2> /dev/null dave::/etc/init.d/iptables stop 2> /dev/null -carol::ip addr del PH_IP1_CAROL/32 dev eth0 -dave::ip addr del PH_IP1_DAVE/32 dev eth0 +carol::ip addr del PH_IP_CAROL1/32 dev eth0 +dave::ip addr del PH_IP_DAVE1/32 dev eth0 diff --git a/testing/tests/mode-config/hosts/moon/etc/ipsec.conf b/testing/tests/mode-config/hosts/moon/etc/ipsec.conf index d83b2d976..b7e864f02 100755 --- a/testing/tests/mode-config/hosts/moon/etc/ipsec.conf +++ b/testing/tests/mode-config/hosts/moon/etc/ipsec.conf @@ -15,7 +15,7 @@ conn %default keyingtries=1 left=PH_IP_MOON leftsubnet=10.1.0.0/16 - leftsourceip=PH_IP1_MOON + leftsourceip=PH_IP_MOON1 leftnexthop=%direct leftcert=moonCert.pem leftid=@moon.strongswan.org @@ -24,11 +24,11 @@ conn %default conn rw-carol right=%any rightid=carol@strongswan.org - rightsourceip=PH_IP1_CAROL + rightsourceip=PH_IP_CAROL1 auto=add conn rw-dave right=%any rightid=dave@strongswan.org - rightsourceip=PH_IP1_DAVE + rightsourceip=PH_IP_DAVE1 auto=add diff --git a/testing/tests/mode-config/posttest.dat b/testing/tests/mode-config/posttest.dat index 932b319a7..f5fa1f375 100644 --- a/testing/tests/mode-config/posttest.dat +++ b/testing/tests/mode-config/posttest.dat @@ -7,5 +7,5 @@ dave::ipsec stop moon::/etc/init.d/iptables stop 2> /dev/null carol::/etc/init.d/iptables stop 2> /dev/null dave::/etc/init.d/iptables stop 2> /dev/null -carol::ip addr del PH_IP1_CAROL/32 dev eth0 -dave::ip addr del PH_IP1_DAVE/32 dev eth0 +carol::ip addr del PH_IP_CAROL1/32 dev eth0 +dave::ip addr del PH_IP_DAVE1/32 dev eth0 diff --git a/testing/tests/mode-config/pretest.dat b/testing/tests/mode-config/pretest.dat index 1e45f00fd..bb222992e 100644 --- a/testing/tests/mode-config/pretest.dat +++ b/testing/tests/mode-config/pretest.dat @@ -7,3 +7,4 @@ moon::ipsec start carol::sleep 2 carol::ipsec up home dave::ipsec up home +carol::sleep 1 diff --git a/testing/tests/protoport-dual/evaltest.dat b/testing/tests/protoport-dual/evaltest.dat index 625c8c54c..11c34929f 100644 --- a/testing/tests/protoport-dual/evaltest.dat +++ b/testing/tests/protoport-dual/evaltest.dat @@ -1,7 +1,7 @@ carol::ipsec status::home.*STATE_QUICK_I2.*IPsec SA established::YES moon::ipsec status::rw.*STATE_QUICK_R2.*IPsec SA established::YES carol::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES -carol::ping -c 1 PH_IP1_MOON::64 bytes from PH_IP1_MOON: icmp_seq=1::YES +carol::ping -c 1 PH_IP_MOON1::64 bytes from PH_IP_MOON1: icmp_seq=1::YES carol::ssh -o ConnectTimeout=5 PH_IP_ALICE hostname::alice::YES moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP::YES moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP::YES diff --git a/testing/tests/protoport-pass/evaltest.dat b/testing/tests/protoport-pass/evaltest.dat index 625c8c54c..11c34929f 100644 --- a/testing/tests/protoport-pass/evaltest.dat +++ b/testing/tests/protoport-pass/evaltest.dat @@ -1,7 +1,7 @@ carol::ipsec status::home.*STATE_QUICK_I2.*IPsec SA established::YES moon::ipsec status::rw.*STATE_QUICK_R2.*IPsec SA established::YES carol::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES -carol::ping -c 1 PH_IP1_MOON::64 bytes from PH_IP1_MOON: icmp_seq=1::YES +carol::ping -c 1 PH_IP_MOON1::64 bytes from PH_IP_MOON1: icmp_seq=1::YES carol::ssh -o ConnectTimeout=5 PH_IP_ALICE hostname::alice::YES moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP::YES moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP::YES diff --git a/testing/tests/protoport-route/evaltest.dat b/testing/tests/protoport-route/evaltest.dat index 8f3eb208f..759295675 100644 --- a/testing/tests/protoport-route/evaltest.dat +++ b/testing/tests/protoport-route/evaltest.dat @@ -1,5 +1,5 @@ carol::ping -c 2 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq::YES -carol::ping -c 2 PH_IP1_MOON::64 bytes from PH_IP1_MOON: icmp_seq::YES +carol::ping -c 2 PH_IP_MOON1::64 bytes from PH_IP_MOON1: icmp_seq::YES carol::ssh PH_IP_ALICE hostname::alice::YES carol::cat /var/log/auth.log::initiate on demand::YES carol::ipsec status::home.*STATE_QUICK_I2.*IPsec SA established::YES diff --git a/testing/tests/starter-includes/hosts/moon/etc/ipsec.host b/testing/tests/starter-includes/hosts/moon/etc/ipsec.host index e84e5cdc6..acf753cc0 100755 --- a/testing/tests/starter-includes/hosts/moon/etc/ipsec.host +++ b/testing/tests/starter-includes/hosts/moon/etc/ipsec.host @@ -3,7 +3,7 @@ conn %default left=PH_IP_MOON leftsubnet=10.1.0.0/16 - leftsourceip=PH_IP1_MOON + leftsourceip=PH_IP_MOON1 leftnexthop=%direct leftcert=moonCert.pem leftid=@moon.strongswan.org diff --git a/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.carol b/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.carol index 9212a9e96..84bedfef6 100644 --- a/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.carol +++ b/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.carol @@ -3,6 +3,6 @@ conn rw-carol right=%any rightid=carol@strongswan.org - rightsourceip=PH_IP1_CAROL + rightsourceip=PH_IP_CAROL1 auto=add diff --git a/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.dave b/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.dave index 482d15a21..ee021c9be 100644 --- a/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.dave +++ b/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.dave @@ -3,6 +3,6 @@ conn rw-dave right=%any rightid=dave@strongswan.org - rightsourceip=PH_IP1_DAVE + rightsourceip=PH_IP_DAVE1 auto=add diff --git a/testing/tests/starter-includes/posttest.dat b/testing/tests/starter-includes/posttest.dat index 121aa8aea..a646f5c5f 100644 --- a/testing/tests/starter-includes/posttest.dat +++ b/testing/tests/starter-includes/posttest.dat @@ -7,7 +7,7 @@ dave::ipsec stop moon::/etc/init.d/iptables stop 2> /dev/null carol::/etc/init.d/iptables stop 2> /dev/null dave::/etc/init.d/iptables stop 2> /dev/null -carol::ip addr del PH_IP1_CAROL/32 dev eth0 -dave::ip addr del PH_IP1_DAVE/32 dev eth0 +carol::ip addr del PH_IP_CAROL1/32 dev eth0 +dave::ip addr del PH_IP_DAVE1/32 dev eth0 moon::rm /etc/ipsec.connections /etc/ipsec.host moon::rm -r /etc/ipsec.peers diff --git a/testing/tests/starter-includes/pretest.dat b/testing/tests/starter-includes/pretest.dat index 0af79a6d2..b034a0c03 100644 --- a/testing/tests/starter-includes/pretest.dat +++ b/testing/tests/starter-includes/pretest.dat @@ -8,3 +8,4 @@ moon::ipsec start --debug-all carol::sleep 2 carol::ipsec up home dave::ipsec up home +carol::sleep 1 diff --git a/testing/tests/virtual-ip-swapped/evaltest.dat b/testing/tests/virtual-ip-swapped/evaltest.dat index 5160a340f..1e2f9e136 100644 --- a/testing/tests/virtual-ip-swapped/evaltest.dat +++ b/testing/tests/virtual-ip-swapped/evaltest.dat @@ -1,8 +1,8 @@ carol::ipsec status::home.*STATE_QUICK_I2.*IPsec SA established::YES moon::ipsec status::rw.*STATE_QUICK_R2.*IPsec SA established::YES carol::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES -carol::ping -c 1 PH_IP1_MOON::64 bytes from PH_IP1_MOON: icmp_seq=1::YES -moon::ping -c 1 PH_IP1_CAROL::64 bytes from PH_IP1_CAROL: icmp_seq=1::YES +carol::ping -c 1 PH_IP_MOON1::64 bytes from PH_IP_MOON1: icmp_seq=1::YES +moon::ping -c 1 PH_IP_CAROL1::64 bytes from PH_IP_CAROL1: icmp_seq=1::YES moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP::YES moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP::YES alice::tcpdump::IP carol1.strongswan.org > alice.strongswan.org: icmp::YES diff --git a/testing/tests/virtual-ip-swapped/hosts/carol/etc/ipsec.conf b/testing/tests/virtual-ip-swapped/hosts/carol/etc/ipsec.conf index 980552d36..a1a72e3c7 100755 --- a/testing/tests/virtual-ip-swapped/hosts/carol/etc/ipsec.conf +++ b/testing/tests/virtual-ip-swapped/hosts/carol/etc/ipsec.conf @@ -16,7 +16,7 @@ conn %default conn home right=PH_IP_CAROL - rightsourceip=PH_IP1_CAROL + rightsourceip=PH_IP_CAROL1 rightnexthop=%direct rightcert=carolCert.pem rightid=carol@strongswan.org diff --git a/testing/tests/virtual-ip-swapped/hosts/moon/etc/ipsec.conf b/testing/tests/virtual-ip-swapped/hosts/moon/etc/ipsec.conf index 253c2989e..ec4672c59 100755 --- a/testing/tests/virtual-ip-swapped/hosts/moon/etc/ipsec.conf +++ b/testing/tests/virtual-ip-swapped/hosts/moon/etc/ipsec.conf @@ -16,7 +16,7 @@ conn %default conn rw right=PH_IP_MOON - rightsourceip=PH_IP1_MOON + rightsourceip=PH_IP_MOON1 rightnexthop=%direct rightcert=moonCert.pem rightid=@moon.strongswan.org diff --git a/testing/tests/virtual-ip-swapped/posttest.dat b/testing/tests/virtual-ip-swapped/posttest.dat index ac5c7dd82..f6db698b0 100644 --- a/testing/tests/virtual-ip-swapped/posttest.dat +++ b/testing/tests/virtual-ip-swapped/posttest.dat @@ -4,4 +4,4 @@ moon::ipsec stop carol::ipsec stop moon::/etc/init.d/iptables stop 2> /dev/null carol::/etc/init.d/iptables stop 2> /dev/null -carol::ip addr del PH_IP1_CAROL/32 dev eth0 +carol::ip addr del PH_IP_CAROL1/32 dev eth0 diff --git a/testing/tests/virtual-ip/evaltest.dat b/testing/tests/virtual-ip/evaltest.dat index 5160a340f..1e2f9e136 100644 --- a/testing/tests/virtual-ip/evaltest.dat +++ b/testing/tests/virtual-ip/evaltest.dat @@ -1,8 +1,8 @@ carol::ipsec status::home.*STATE_QUICK_I2.*IPsec SA established::YES moon::ipsec status::rw.*STATE_QUICK_R2.*IPsec SA established::YES carol::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES -carol::ping -c 1 PH_IP1_MOON::64 bytes from PH_IP1_MOON: icmp_seq=1::YES -moon::ping -c 1 PH_IP1_CAROL::64 bytes from PH_IP1_CAROL: icmp_seq=1::YES +carol::ping -c 1 PH_IP_MOON1::64 bytes from PH_IP_MOON1: icmp_seq=1::YES +moon::ping -c 1 PH_IP_CAROL1::64 bytes from PH_IP_CAROL1: icmp_seq=1::YES moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP::YES moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP::YES alice::tcpdump::IP carol1.strongswan.org > alice.strongswan.org: icmp::YES diff --git a/testing/tests/virtual-ip/hosts/carol/etc/ipsec.conf b/testing/tests/virtual-ip/hosts/carol/etc/ipsec.conf index 73f2189b0..3a15a5a89 100755 --- a/testing/tests/virtual-ip/hosts/carol/etc/ipsec.conf +++ b/testing/tests/virtual-ip/hosts/carol/etc/ipsec.conf @@ -16,7 +16,7 @@ conn %default conn home left=PH_IP_CAROL - leftsourceip=PH_IP1_CAROL + leftsourceip=PH_IP_CAROL1 leftnexthop=%direct leftcert=carolCert.pem leftid=carol@strongswan.org diff --git a/testing/tests/virtual-ip/hosts/moon/etc/ipsec.conf b/testing/tests/virtual-ip/hosts/moon/etc/ipsec.conf index 5cdd21530..c7a3d4160 100755 --- a/testing/tests/virtual-ip/hosts/moon/etc/ipsec.conf +++ b/testing/tests/virtual-ip/hosts/moon/etc/ipsec.conf @@ -16,7 +16,7 @@ conn %default conn rw left=PH_IP_MOON - leftsourceip=PH_IP1_MOON + leftsourceip=PH_IP_MOON1 leftnexthop=%direct leftcert=moonCert.pem leftid=@moon.strongswan.org diff --git a/testing/tests/virtual-ip/posttest.dat b/testing/tests/virtual-ip/posttest.dat index ac5c7dd82..f6db698b0 100644 --- a/testing/tests/virtual-ip/posttest.dat +++ b/testing/tests/virtual-ip/posttest.dat @@ -4,4 +4,4 @@ moon::ipsec stop carol::ipsec stop moon::/etc/init.d/iptables stop 2> /dev/null carol::/etc/init.d/iptables stop 2> /dev/null -carol::ip addr del PH_IP1_CAROL/32 dev eth0 +carol::ip addr del PH_IP_CAROL1/32 dev eth0 diff --git a/testing/tests/virtual-ip/pretest.dat b/testing/tests/virtual-ip/pretest.dat index 4fe0ee90b..0b2ae8d2b 100644 --- a/testing/tests/virtual-ip/pretest.dat +++ b/testing/tests/virtual-ip/pretest.dat @@ -4,3 +4,4 @@ carol::ipsec start moon::ipsec start carol::sleep 2 carol::ipsec up home +carol::sleep 1 diff --git a/testing/tests/wlan/evaltest.dat b/testing/tests/wlan/evaltest.dat index ccf5d0c8a..06d4a688a 100644 --- a/testing/tests/wlan/evaltest.dat +++ b/testing/tests/wlan/evaltest.dat @@ -3,7 +3,7 @@ venus::ipsec status::wlan.*STATE_QUICK_I2.*IPsec SA established::YES moon::ipsec status::alice.*STATE_QUICK_R2.*IPsec SA established::YES moon::ipsec status::venus.*STATE_QUICK_R2.*IPsec SA established::YES alice::ping -c 1 PH_IP_VENUS::64 bytes from PH_IP_VENUS: icmp_seq=1::YES -alice::ping -c 1 PH_IP1_MOON::64 bytes from PH_IP1_MOON: icmp_seq=1::YES +alice::ping -c 1 PH_IP_MOON1::64 bytes from PH_IP_MOON1: icmp_seq=1::YES alice::ping -c 1 PH_IP_MOON::64 bytes from PH_IP_MOON: icmp_seq=1::YES alice::ping -c 1 PH_IP_SUN::64 bytes from PH_IP_SUN: icmp_seq=1::YES venus::ping -c 1 PH_IP_SUN::64 bytes from PH_IP_SUN: icmp_seq=1::YES diff --git a/testing/tests/wlan/hosts/alice/etc/ipsec.conf b/testing/tests/wlan/hosts/alice/etc/ipsec.conf index 9c3003f43..8d349a42e 100755 --- a/testing/tests/wlan/hosts/alice/etc/ipsec.conf +++ b/testing/tests/wlan/hosts/alice/etc/ipsec.conf @@ -31,7 +31,7 @@ conn wlan leftcert=aliceCert.pem leftid=alice@strongswan.org leftfirewall=yes - right=PH_IP1_MOON + right=PH_IP_MOON1 rightid=@moon.strongswan.org rightsubnet=0.0.0.0/0 auto=add diff --git a/testing/tests/wlan/hosts/moon/etc/ipsec.conf b/testing/tests/wlan/hosts/moon/etc/ipsec.conf index 0a6c491b1..4c189c647 100755 --- a/testing/tests/wlan/hosts/moon/etc/ipsec.conf +++ b/testing/tests/wlan/hosts/moon/etc/ipsec.conf @@ -28,7 +28,7 @@ conn venus auto=add conn wlan - left=PH_IP1_MOON + left=PH_IP_MOON1 leftnexthop=%direct leftsubnet=0.0.0.0/0 leftcert=moonCert.pem diff --git a/testing/tests/wlan/hosts/venus/etc/ipsec.conf b/testing/tests/wlan/hosts/venus/etc/ipsec.conf index bf0f423c6..1c52e5b98 100755 --- a/testing/tests/wlan/hosts/venus/etc/ipsec.conf +++ b/testing/tests/wlan/hosts/venus/etc/ipsec.conf @@ -31,7 +31,7 @@ conn wlan leftcert=venusCert.pem leftid=@venus.strongswan.org leftfirewall=yes - right=PH_IP1_MOON + right=PH_IP_MOON1 rightid=@moon.strongswan.org rightsubnet=0.0.0.0/0 auto=add |