[svn-upgrade] Integrating new upstream version, strongswan (4.2.4)

17 files changed, 60 insertions, 30 deletions

diff --git a/testing/tests/p2pnat/behind-same-nat/evaltest.dat b/testing/tests/p2pnat/behind-same-nat/evaltest.dat
index 0036e073f..e59334db9 100644
--- a/testing/tests/p2pnat/behind-same-nat/evaltest.dat
+++ b/testing/tests/p2pnat/behind-same-nat/evaltest.dat
@@ -2,10 +2,10 @@ alice::ipsec statusall::medsrv.*ESTABLISHED::YES
 venus::ipsec statusall::medsrv.*ESTABLISHED::YES
 carol::ipsec statusall::medsrv.*ESTABLISHED.*PH_IP_MOON.*6cu1UTVw@medsrv.org::YES
 carol::ipsec statusall::medsrv.*ESTABLISHED.*PH_IP_MOON.*F1ubAio8@medsrv.org::YES
-alice::cat /var/log/daemon.log::received P2P_CALLBACK::YES
-alice::ipsec statusall::p2p.*ESTABLISHED::YES
-venus::ipsec statusall::p2p.*ESTABLISHED::YES
-alice::ipsec statusall::p2p.*INSTALLED::YES
-venus::ipsec statusall::p2p.*INSTALLED::YES
+alice::cat /var/log/daemon.log::received ME_CALLBACK::YES
+alice::ipsec statusall::peer.*ESTABLISHED::YES
+venus::ipsec statusall::peer.*ESTABLISHED::YES
+alice::ipsec statusall::peer.*INSTALLED::YES
+venus::ipsec statusall::peer.*INSTALLED::YES
 alice::ping -c 1 PH_IP_VENUS::64 bytes from PH_IP_VENUS: icmp_seq=1::YES
 venus::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES
diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/init.d/iptables b/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/init.d/iptables
index 937486984..1eb88c15c 100755
--- a/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/init.d/iptables
+++ b/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/init.d/iptables
@@ -25,7 +25,7 @@ start() {
         iptables -A INPUT  -i eth0 -p udp --sport 500 --dport 500 -j ACCEPT
         iptables -A OUTPUT -o eth0 -p udp --dport 500 --sport 500 -j ACCEPT
 			
-	# allow NAT-T including P2P 
+	# allow NAT-T 
 	iptables -A INPUT  -i eth0 -p udp --dport 4500 -j ACCEPT
 	iptables -A OUTPUT -o eth0 -p udp --sport 4500 -j ACCEPT
 
diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/ipsec.conf b/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/ipsec.conf
index e481996f7..b47f157f6 100755
--- a/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/ipsec.conf
+++ b/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/ipsec.conf
@@ -21,16 +21,16 @@ conn medsrv
 	leftid=6cu1UTVw@medsrv.org
 	right=PH_IP_CAROL
 	rightid=carol@strongswan.org
-	p2p_mediation=yes
+	mediation=yes
 	authby=psk
 	auto=add
 
-conn p2p 
+conn peer
 	leftcert=aliceCert.pem
 	leftid=alice@strongswan.org
 	right=%any
 	rightid=@venus.strongswan.org
 	rightsubnet=PH_IP_VENUS/32
-	p2p_mediated_by=medsrv
-	p2p_peerid=F1ubAio8@medsrv.org
+	mediated_by=medsrv
+	me_peerid=F1ubAio8@medsrv.org
 	auto=start
diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/strongswan.conf b/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/strongswan.conf
new file mode 100644
index 000000000..ca22de61f
--- /dev/null
+++ b/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/strongswan.conf
@@ -0,0 +1,5 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke
+}
diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/ipsec.conf b/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/ipsec.conf
index 712d888b1..e38922cf4 100755
--- a/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/ipsec.conf
@@ -21,5 +21,5 @@ conn medsrv
 	leftid=carol@strongswan.org
 	leftfirewall=yes
 	right=%any
-	p2p_mediation=yes
+	mediation=yes
 	auto=add
diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/strongswan.conf b/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/strongswan.conf
new file mode 100644
index 000000000..ca22de61f
--- /dev/null
+++ b/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/strongswan.conf
@@ -0,0 +1,5 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke
+}
diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/init.d/iptables b/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/init.d/iptables
index 06d0ebca8..6fca87b4a 100755
--- a/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/init.d/iptables
+++ b/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/init.d/iptables
@@ -25,7 +25,7 @@ start() {
         iptables -A INPUT  -i eth0 -p udp --sport 500 --dport 500 -j ACCEPT
         iptables -A OUTPUT -o eth0 -p udp --dport 500 --sport 500 -j ACCEPT
 			
-	# allow NAT-T including P2P 
+	# allow NAT-T
 	iptables -A INPUT  -i eth0 -p udp --dport 4500 -j ACCEPT
 	iptables -A OUTPUT -o eth0 -p udp --sport 4500 -j ACCEPT
 
diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/ipsec.conf b/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/ipsec.conf
index d21009353..3943c361e 100755
--- a/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/ipsec.conf
+++ b/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/ipsec.conf
@@ -22,15 +22,15 @@ conn medsrv
 	right=PH_IP_CAROL
 	rightid=carol@strongswan.org
 	authby=psk
-	p2p_mediation=yes
+	mediation=yes
 	auto=start
 
-conn p2p 
+conn peer 
 	leftcert=venusCert.pem
 	leftid=@venus.strongswan.org
 	right=%any
 	rightid=alice@strongswan.org
 	rightsubnet=PH_IP_ALICE/32
-	p2p_mediated_by=medsrv
-	p2p_peerid=6cu1UTVw@medsrv.org
+	mediated_by=medsrv
+	me_peerid=6cu1UTVw@medsrv.org
 	auto=add
diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/strongswan.conf b/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/strongswan.conf
new file mode 100644
index 000000000..ca22de61f
--- /dev/null
+++ b/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/strongswan.conf
@@ -0,0 +1,5 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke
+}
diff --git a/testing/tests/p2pnat/medsrv-psk/evaltest.dat b/testing/tests/p2pnat/medsrv-psk/evaltest.dat
index b8280c325..ba14bb858 100644
--- a/testing/tests/p2pnat/medsrv-psk/evaltest.dat
+++ b/testing/tests/p2pnat/medsrv-psk/evaltest.dat
@@ -2,10 +2,10 @@ alice::ipsec statusall::medsrv.*ESTABLISHED::YES
 bob::ipsec statusall::medsrv.*ESTABLISHED::YES
 carol::ipsec statusall::medsrv.*ESTABLISHED.*PH_IP_MOON.*6cu1UTVw@medsrv.org::YES
 carol::ipsec statusall::medsrv.*ESTABLISHED.*PH_IP_SUN.*v9oEPMz@medsrv.org::YES
-alice::ipsec statusall::p2p.*ESTABLISHED::YES
-bob::ipsec statusall::p2p.*ESTABLISHED::YES
-alice::ipsec statusall::p2p.*INSTALLED::YES
-bob::ipsec statusall::p2p.*INSTALLED::YES
+alice::ipsec statusall::peer.*ESTABLISHED::YES
+bob::ipsec statusall::peer.*ESTABLISHED::YES
+alice::ipsec statusall::peer.*INSTALLED::YES
+bob::ipsec statusall::peer.*INSTALLED::YES
 alice::ping -c 1 PH_IP_BOB::64 bytes from PH_IP_BOB: icmp_seq=1::YES
 bob::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES
 moon::tcpdump::IP moon.strongswan.org.* > sun.strongswan.org.*: UDP::YES
diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/init.d/iptables b/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/init.d/iptables
index 09b4cabfa..c6371c745 100755
--- a/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/init.d/iptables
+++ b/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/init.d/iptables
@@ -21,7 +21,7 @@ start() {
         iptables -A INPUT  -i eth0 -p udp --sport 500 --dport 500 -j ACCEPT
         iptables -A OUTPUT -o eth0 -p udp --dport 500 --sport 500 -j ACCEPT
 			
-	# allow NAT-T including P2P 
+	# allow NAT-T
 	iptables -A INPUT  -i eth0 -p udp --dport 4500 -j ACCEPT
 	iptables -A OUTPUT -o eth0 -p udp --sport 4500 -j ACCEPT
 
diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf b/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf
index 370934ce7..99a50d5d8 100755
--- a/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf
+++ b/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf
@@ -21,16 +21,16 @@ conn medsrv
 	leftid=6cu1UTVw@medsrv.org
 	right=PH_IP_CAROL
 	rightid=carol@strongswan.org
-	p2p_mediation=yes
+	mediation=yes
 	authby=psk
 	auto=add
 
-conn p2p 
+conn peer 
 	leftcert=aliceCert.pem
 	leftid=alice@strongswan.org
 	right=%any
 	rightid=bob@strongswan.org
 	rightsubnet=PH_IP_BOB/32
-	p2p_mediated_by=medsrv
-	p2p_peerid=av9oEPMz@medsrv.org
+	mediated_by=medsrv
+	me_peerid=av9oEPMz@medsrv.org
 	auto=start
diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/strongswan.conf b/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/strongswan.conf
new file mode 100644
index 000000000..ca22de61f
--- /dev/null
+++ b/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/strongswan.conf
@@ -0,0 +1,5 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke
+}
diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf b/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf
index 8d8d9391f..39dee8521 100755
--- a/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf
+++ b/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf
@@ -22,15 +22,15 @@ conn medsrv
 	right=PH_IP_CAROL
 	rightid=carol@strongswan.org
 	authby=psk
-	p2p_mediation=yes
+	mediation=yes
 	auto=start
 
-conn p2p 
+conn peer
 	leftcert=bobCert.pem
 	leftid=bob@strongswan.org
 	right=%any
 	rightid=alice@strongswan.org
 	rightsubnet=PH_IP_ALICE/32
-	p2p_mediated_by=medsrv
-	p2p_peerid=6cu1UTVw@medsrv.org
+	mediated_by=medsrv
+	me_peerid=6cu1UTVw@medsrv.org
 	auto=add
diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/strongswan.conf b/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/strongswan.conf
new file mode 100644
index 000000000..ca22de61f
--- /dev/null
+++ b/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/strongswan.conf
@@ -0,0 +1,5 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke
+}
diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/ipsec.conf b/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/ipsec.conf
index 712d888b1..e38922cf4 100755
--- a/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/ipsec.conf
@@ -21,5 +21,5 @@ conn medsrv
 	leftid=carol@strongswan.org
 	leftfirewall=yes
 	right=%any
-	p2p_mediation=yes
+	mediation=yes
 	auto=add
diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/strongswan.conf b/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/strongswan.conf
new file mode 100644
index 000000000..ca22de61f
--- /dev/null
+++ b/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/strongswan.conf
@@ -0,0 +1,5 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke
+}