From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 28 Jun 2018 16:03:57 +0000 (+0200)
Subject: testing: Fix IKE proposal in swanctl/net2net-gw scenario
X-Git-Tag: 5.7.0dr5~25^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=1ecac75f372a386ef9709097d6b0341f241c43e6;p=thirdparty%2Fstrongswan.git

testing: Fix IKE proposal in swanctl/net2net-gw scenario

Also simplify config by using references.
---

diff --git a/testing/tests/swanctl/net2net-gw/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/swanctl/net2net-gw/hosts/carol/etc/swanctl/swanctl.conf
index cdf6bcaf5a..aeea94e1f0 100755
--- a/testing/tests/swanctl/net2net-gw/hosts/carol/etc/swanctl/swanctl.conf
+++ b/testing/tests/swanctl/net2net-gw/hosts/carol/etc/swanctl/swanctl.conf
@@ -11,7 +11,7 @@ connections {
          id = moon.strongswan.org
       }
       children {
-         net-moon {
+         net {
             local_ts  = 10.2.0.0/16
             remote_ts = 10.1.0.0/16
 
@@ -23,27 +23,16 @@ connections {
       mobike = no
       proposals = aes128-sha256-x25519
    }
-   gw-sun {
-      local {
-         auth = pubkey
-         certs = carolCert.pem
-         id = carol@strongswan.org
-      }
+
+   gw-sun : connections.gw-moon {
       remote {
-         auth = pubkey
          id = sun.strongswan.org
       }
       children {
-         net-sun {
+         net {
             local_ts  = 10.1.0.0/16
             remote_ts = 10.2.0.0/16
-
-            updown = /usr/local/libexec/ipsec/_updown iptables
-            esp_proposals = aes128gcm128-modp3072
          }
       }
-      version = 2
-      mobike = no
-      proposals = aes128-sha256-modp3072
    }
 }