From: Tobias Brunner Date: Mon, 15 Apr 2019 16:20:20 +0000 (+0200) Subject: testing: Rename public keys in DNSSEC scenarios X-Git-Tag: 5.8.0rc1~5^2~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e059c837bb10f9af773c9a06461c783a8e2ae6f;p=thirdparty%2Fstrongswan.git testing: Rename public keys in DNSSEC scenarios We will generate PEM-encoded public keys with the script. --- diff --git a/testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/ipsec.conf index ea10eb0a3f..a7799439ed 100644 --- a/testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/ipsec.conf +++ b/testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/ipsec.conf @@ -9,12 +9,12 @@ conn %default keyingtries=1 keyexchange=ikev2 mobike=no - + conn net-net left=PH_IP_MOON leftid=moon.strongswan.org leftsubnet=10.1.0.0/16 - leftsigkey=moonPub.der + leftsigkey=moonPub.pem leftauth=pubkey leftfirewall=yes right=sun.strongswan.org diff --git a/testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/ipsec.d/certs/moonPub.der b/testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/ipsec.d/certs/moonPub.pem similarity index 100% rename from testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/ipsec.d/certs/moonPub.der rename to testing/tests/ikev2/net2net-dnssec/hosts/moon/etc/ipsec.d/certs/moonPub.pem diff --git a/testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/ipsec.conf b/testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/ipsec.conf index 9e310050d0..06704e68ac 100644 --- a/testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/ipsec.conf +++ b/testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/ipsec.conf @@ -9,12 +9,12 @@ conn %default keyingtries=1 keyexchange=ikev2 mobike=no - + conn net-net left=PH_IP_SUN leftid=sun.strongswan.org leftsubnet=10.2.0.0/16 - leftsigkey=sunPub.der + leftsigkey=sunPub.pem leftauth=pubkey leftfirewall=yes right=moon.strongswan.org diff --git a/testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/ipsec.d/certs/sunPub.der b/testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/ipsec.d/certs/sunPub.pem similarity index 100% rename from testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/ipsec.d/certs/sunPub.der rename to testing/tests/ikev2/net2net-dnssec/hosts/sun/etc/ipsec.d/certs/sunPub.pem diff --git a/testing/tests/ikev2/rw-dnssec/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/rw-dnssec/hosts/moon/etc/ipsec.conf index 74ddc6e016..3c5c64cdeb 100644 --- a/testing/tests/ikev2/rw-dnssec/hosts/moon/etc/ipsec.conf +++ b/testing/tests/ikev2/rw-dnssec/hosts/moon/etc/ipsec.conf @@ -2,19 +2,19 @@ config setup -conn %default +conn %default ikelifetime=60m keylife=20m rekeymargin=3m keyingtries=1 keyexchange=ikev2 -conn rw +conn rw left=PH_IP_MOON leftsubnet=10.1.0.0/16 leftid=moon.strongswan.org leftauth=pubkey - leftsigkey=moonPub.der + leftsigkey=moonPub.pem leftfirewall=yes right=%any rightauth=pubkey diff --git a/testing/tests/ikev2/rw-dnssec/hosts/moon/etc/ipsec.d/certs/moonPub.der b/testing/tests/ikev2/rw-dnssec/hosts/moon/etc/ipsec.d/certs/moonPub.pem similarity index 100% rename from testing/tests/ikev2/rw-dnssec/hosts/moon/etc/ipsec.d/certs/moonPub.der rename to testing/tests/ikev2/rw-dnssec/hosts/moon/etc/ipsec.d/certs/moonPub.pem diff --git a/testing/tests/swanctl/rw-dnssec/hosts/carol/etc/swanctl/pubkey/carolPub.der b/testing/tests/swanctl/rw-dnssec/hosts/carol/etc/swanctl/pubkey/carolPub.pem similarity index 100% rename from testing/tests/swanctl/rw-dnssec/hosts/carol/etc/swanctl/pubkey/carolPub.der rename to testing/tests/swanctl/rw-dnssec/hosts/carol/etc/swanctl/pubkey/carolPub.pem diff --git a/testing/tests/swanctl/rw-dnssec/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/swanctl/rw-dnssec/hosts/carol/etc/swanctl/swanctl.conf index edb9710e2a..abcea5c98d 100755 --- a/testing/tests/swanctl/rw-dnssec/hosts/carol/etc/swanctl/swanctl.conf +++ b/testing/tests/swanctl/rw-dnssec/hosts/carol/etc/swanctl/swanctl.conf @@ -2,13 +2,13 @@ connections { home { local_addrs = 192.168.0.100 - remote_addrs = 192.168.0.1 + remote_addrs = 192.168.0.1 vips = 0.0.0.0 local { auth = pubkey id = carol.strongswan.org - pubkeys = carolPub.der + pubkeys = carolPub.pem } remote { auth = pubkey @@ -16,7 +16,7 @@ connections { } children { home { - remote_ts = 10.1.0.0/16 + remote_ts = 10.1.0.0/16 updown = /usr/local/libexec/ipsec/_updown iptables esp_proposals = aes128gcm128-x25519 diff --git a/testing/tests/swanctl/rw-dnssec/hosts/dave/etc/swanctl/pubkey/davePub.der b/testing/tests/swanctl/rw-dnssec/hosts/dave/etc/swanctl/pubkey/davePub.pem similarity index 100% rename from testing/tests/swanctl/rw-dnssec/hosts/dave/etc/swanctl/pubkey/davePub.der rename to testing/tests/swanctl/rw-dnssec/hosts/dave/etc/swanctl/pubkey/davePub.pem diff --git a/testing/tests/swanctl/rw-dnssec/hosts/dave/etc/swanctl/swanctl.conf b/testing/tests/swanctl/rw-dnssec/hosts/dave/etc/swanctl/swanctl.conf index b894dc7fbb..fe711c1206 100755 --- a/testing/tests/swanctl/rw-dnssec/hosts/dave/etc/swanctl/swanctl.conf +++ b/testing/tests/swanctl/rw-dnssec/hosts/dave/etc/swanctl/swanctl.conf @@ -2,13 +2,13 @@ connections { home { local_addrs = 192.168.0.200 - remote_addrs = 192.168.0.1 + remote_addrs = 192.168.0.1 vips = 0.0.0.0 local { auth = pubkey id = dave.strongswan.org - pubkeys = davePub.der + pubkeys = davePub.pem } remote { auth = pubkey @@ -16,7 +16,7 @@ connections { } children { home { - remote_ts = 10.1.0.0/16 + remote_ts = 10.1.0.0/16 updown = /usr/local/libexec/ipsec/_updown iptables esp_proposals = aes128gcm128-x25519 diff --git a/testing/tests/swanctl/rw-dnssec/hosts/moon/etc/swanctl/pubkey/moonPub.der b/testing/tests/swanctl/rw-dnssec/hosts/moon/etc/swanctl/pubkey/moonPub.pem similarity index 100% rename from testing/tests/swanctl/rw-dnssec/hosts/moon/etc/swanctl/pubkey/moonPub.der rename to testing/tests/swanctl/rw-dnssec/hosts/moon/etc/swanctl/pubkey/moonPub.pem diff --git a/testing/tests/swanctl/rw-dnssec/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/swanctl/rw-dnssec/hosts/moon/etc/swanctl/swanctl.conf index 6b1a2c281d..73aabd83c7 100755 --- a/testing/tests/swanctl/rw-dnssec/hosts/moon/etc/swanctl/swanctl.conf +++ b/testing/tests/swanctl/rw-dnssec/hosts/moon/etc/swanctl/swanctl.conf @@ -7,14 +7,14 @@ connections { local { auth = pubkey id = moon.strongswan.org - pubkeys = moonPub.der + pubkeys = moonPub.pem } remote { auth = pubkey } children { net { - local_ts = 10.1.0.0/16 + local_ts = 10.1.0.0/16 updown = /usr/local/libexec/ipsec/_updown iptables esp_proposals = aes128gcm128-x25519