denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow x25519 as an alias of the curve25519 KE algorithm

Browse Source
This commit is contained in:
Andreas Steffen
2017-03-20 21:18:00 +01:00
parent db1ab1cd99
commit efc1b98461
84 changed files with 172 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/crypto/proposal/proposal_keywords_static.txt
+1
View File
@@ -164,6 +164,7 @@ ecp256bp, DIFFIE_HELLMAN_GROUP, ECP_256_BP, 0
ecp384bp, DIFFIE_HELLMAN_GROUP, ECP_384_BP, 0 ecp384bp, DIFFIE_HELLMAN_GROUP, ECP_384_BP, 0
ecp512bp, DIFFIE_HELLMAN_GROUP, ECP_512_BP, 0 ecp512bp, DIFFIE_HELLMAN_GROUP, ECP_512_BP, 0
curve25519, DIFFIE_HELLMAN_GROUP, CURVE_25519, 0 curve25519, DIFFIE_HELLMAN_GROUP, CURVE_25519, 0
x25519, DIFFIE_HELLMAN_GROUP, CURVE_25519, 0
ntru112, DIFFIE_HELLMAN_GROUP, NTRU_112_BIT, 0 ntru112, DIFFIE_HELLMAN_GROUP, NTRU_112_BIT, 0
ntru128, DIFFIE_HELLMAN_GROUP, NTRU_128_BIT, 0 ntru128, DIFFIE_HELLMAN_GROUP, NTRU_128_BIT, 0
ntru192, DIFFIE_HELLMAN_GROUP, NTRU_192_BIT, 0 ntru192, DIFFIE_HELLMAN_GROUP, NTRU_192_BIT, 0
testing/tests/ikev2/alg-aes-ccm/hosts/carol/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes128ccm96-aesxcbc-curve25519! ike=aes128ccm96-aesxcbc-x25519!
esp=aes128ccm96-curve25519! esp=aes128ccm96-x25519!
conn home conn home
left=PH_IP_CAROL left=PH_IP_CAROL
testing/tests/ikev2/alg-aes-ccm/hosts/moon/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes128ccm12-aesxcbc-curve25519! ike=aes128ccm12-aesxcbc-x25519!
esp=aes128ccm12-curve25519! esp=aes128ccm12-x25519!
conn rw conn rw
left=PH_IP_MOON left=PH_IP_MOON
testing/tests/ikev2/alg-aes-ctr/hosts/carol/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes128ctr-aesxcbc-curve25519! ike=aes128ctr-aesxcbc-x25519!
esp=aes128ctr-aesxcbc-curve25519! esp=aes128ctr-aesxcbc-x25519!
conn home conn home
left=PH_IP_CAROL left=PH_IP_CAROL
testing/tests/ikev2/alg-aes-ctr/hosts/moon/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes128ctr-aesxcbc-curve25519! ike=aes128ctr-aesxcbc-x25519!
esp=aes128ctr-aesxcbc-curve25519! esp=aes128ctr-aesxcbc-x25519!
conn rw conn rw
left=PH_IP_MOON left=PH_IP_MOON
testing/tests/ikev2/alg-aes-gcm/hosts/carol/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes256gcm128-aesxcbc-curve25519! ike=aes256gcm128-aesxcbc-x25519!
esp=aes256gcm128-curve25519! esp=aes256gcm128-x25519!
conn home conn home
left=PH_IP_CAROL left=PH_IP_CAROL
testing/tests/ikev2/alg-aes-gcm/hosts/moon/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes256gcm16-aesxcbc-curve25519! ike=aes256gcm16-aesxcbc-x25519!
esp=aes256gcm16-curve25519! esp=aes256gcm16-x25519!
conn rw conn rw
left=PH_IP_MOON left=PH_IP_MOON
testing/tests/ikev2/alg-aes-xcbc/hosts/carol/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes128-aesxcbc-curve25519! ike=aes128-aesxcbc-x25519!
esp=aes128-aesxcbc-curve25519! esp=aes128-aesxcbc-x25519!
conn home conn home
left=PH_IP_CAROL left=PH_IP_CAROL
testing/tests/ikev2/alg-aes-xcbc/hosts/moon/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes128-aesxcbc-curve25519! ike=aes128-aesxcbc-x25519!
esp=aes128-aesxcbc-curve25519! esp=aes128-aesxcbc-x25519!
conn rw conn rw
left=PH_IP_MOON left=PH_IP_MOON
testing/tests/ikev2/alg-sha256-96/hosts/carol/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes128-sha256-curve25519! ike=aes128-sha256-x25519!
esp=aes128-sha256_96-curve25519! esp=aes128-sha256_96-x25519!
conn home conn home
left=PH_IP_CAROL left=PH_IP_CAROL
testing/tests/ikev2/alg-sha256-96/hosts/moon/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes128-sha256-curve25519! ike=aes128-sha256-x25519!
esp=aes128-sha256_96-curve25519! esp=aes128-sha256_96-x25519!
conn rw conn rw
left=PH_IP_MOON left=PH_IP_MOON
testing/tests/ikev2/alg-sha256/hosts/carol/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes128-sha256-curve25519! ike=aes128-sha256-x25519!
esp=aes128-sha256-curve25519! esp=aes128-sha256-x25519!
conn home conn home
left=PH_IP_CAROL left=PH_IP_CAROL
testing/tests/ikev2/alg-sha256/hosts/moon/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes128-sha256-curve25519! ike=aes128-sha256-x25519!
esp=aes128-sha256-curve25519! esp=aes128-sha256-x25519!
conn rw conn rw
left=PH_IP_MOON left=PH_IP_MOON
testing/tests/ikev2/alg-sha384/hosts/carol/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes192-sha384-curve25519! ike=aes192-sha384-x25519!
esp=aes192-sha384-curve25519! esp=aes192-sha384-x25519!
conn home conn home
left=PH_IP_CAROL left=PH_IP_CAROL
testing/tests/ikev2/alg-sha384/hosts/moon/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes192-sha384-curve25519! ike=aes192-sha384-x25519!
esp=aes192-sha384-curve25519! esp=aes192-sha384-x25519!
conn rw conn rw
left=PH_IP_MOON left=PH_IP_MOON
testing/tests/ikev2/esp-alg-aes-gmac/hosts/carol/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes256-aesxcbc-curve25519! ike=aes256-aesxcbc-x25519!
esp=aes256gmac-curve25519! esp=aes256gmac-x25519!
conn home conn home
left=PH_IP_CAROL left=PH_IP_CAROL
testing/tests/ikev2/esp-alg-aes-gmac/hosts/moon/etc/ipsec.conf
+2 -2
View File
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes256-aesxcbc-curve25519! ike=aes256-aesxcbc-x25519!
esp=aes256gmac-curve25519! esp=aes256gmac-x25519!
conn rw conn rw
left=PH_IP_MOON left=PH_IP_MOON
testing/tests/ikev2/esp-alg-null/hosts/carol/etc/ipsec.conf
+1 -1
View File
@@ -8,7 +8,7 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes128-sha256-curve25519! ike=aes128-sha256-x25519!
esp=null-sha256! esp=null-sha256!
conn home conn home
testing/tests/ikev2/esp-alg-null/hosts/moon/etc/ipsec.conf
+1 -1
View File
@@ -8,7 +8,7 @@ conn %default
rekeymargin=3m rekeymargin=3m
keyingtries=1 keyingtries=1
keyexchange=ikev2 keyexchange=ikev2
ike=aes128-sha256-curve25519! ike=aes128-sha256-x25519!
esp=null-sha256! esp=null-sha256!
conn rw conn rw
testing/tests/swanctl/config-payload/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -19,10 +19,10 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/config-payload/hosts/dave/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -19,10 +19,10 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/dhcp-dynamic/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -19,10 +19,10 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/dhcp-dynamic/hosts/dave/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -19,10 +19,10 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/dhcp-dynamic/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -17,10 +17,10 @@ connections {
local_ts = 10.1.0.0/16 local_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/ip-pool-db/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -19,10 +19,10 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/ip-pool-db/hosts/dave/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -19,10 +19,10 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/ip-pool-db/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -17,10 +17,10 @@ connections {
local_ts = 10.1.0.0/16 local_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/ip-pool/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -19,10 +19,10 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/ip-pool/hosts/dave/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -19,10 +19,10 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/ip-pool/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -17,11 +17,11 @@ connections {
local_ts = 10.1.0.0/16 local_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/manual-prio/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
priority = 2 priority = 2
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
shunts { shunts {
testing/tests/swanctl/manual-prio/hosts/dave/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
shunts { shunts {
testing/tests/swanctl/manual-prio/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
interface = eth0 interface = eth0
policies_fwd_out = yes policies_fwd_out = yes
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
shunts { shunts {
testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -23,10 +23,10 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/dave/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -23,10 +23,10 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -21,10 +21,10 @@ connections {
local_ts = 10.1.0.0/16 local_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-cert/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -22,12 +22,12 @@ connections {
rekey_time = 5400 rekey_time = 5400
rekey_bytes = 500000000 rekey_bytes = 500000000
rekey_packets = 1000000 rekey_packets = 1000000
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
reauth_time = 10800 reauth_time = 10800
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-cert/hosts/sun/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -22,12 +22,12 @@ connections {
rekey_time = 5400 rekey_time = 5400
rekey_bytes = 500000000 rekey_bytes = 500000000
rekey_packets = 1000000 rekey_packets = 1000000
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
reauth_time = 10800 reauth_time = 10800
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-ed25519/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -22,12 +22,12 @@ connections {
rekey_time = 5400 rekey_time = 5400
rekey_bytes = 500000000 rekey_bytes = 500000000
rekey_packets = 1000000 rekey_packets = 1000000
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
reauth_time = 10800 reauth_time = 10800
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-ed25519/hosts/sun/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -22,12 +22,12 @@ connections {
rekey_time = 5400 rekey_time = 5400
rekey_bytes = 500000000 rekey_bytes = 500000000
rekey_packets = 1000000 rekey_packets = 1000000
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
reauth_time = 10800 reauth_time = 10800
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-gw/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -16,12 +16,12 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
gw-sun { gw-sun {
local { local {
testing/tests/swanctl/net2net-gw/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
remote_ts = 10.2.0.0/16 remote_ts = 10.2.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-gw/hosts/sun/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-multicast/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -24,12 +24,12 @@ connections {
rekey_time = 5400 rekey_time = 5400
rekey_bytes = 500000000 rekey_bytes = 500000000
rekey_packets = 1000000 rekey_packets = 1000000
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
reauth_time = 10800 reauth_time = 10800
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-multicast/hosts/sun/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -24,12 +24,12 @@ connections {
rekey_time = 5400 rekey_time = 5400
rekey_bytes = 500000000 rekey_bytes = 500000000
rekey_packets = 1000000 rekey_packets = 1000000
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
reauth_time = 10800 reauth_time = 10800
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-route/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -20,11 +20,11 @@ connections {
start_action = trap start_action = trap
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-route/hosts/sun/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -20,11 +20,11 @@ connections {
start_action = none start_action = none
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-sha3-rsa-cert/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -22,12 +22,12 @@ connections {
rekey_time = 5400 rekey_time = 5400
rekey_bytes = 500000000 rekey_bytes = 500000000
rekey_packets = 1000000 rekey_packets = 1000000
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
reauth_time = 10800 reauth_time = 10800
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-sha3-rsa-cert/hosts/sun/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -22,12 +22,12 @@ connections {
rekey_time = 5400 rekey_time = 5400
rekey_bytes = 500000000 rekey_bytes = 500000000
rekey_packets = 1000000 rekey_packets = 1000000
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
reauth_time = 10800 reauth_time = 10800
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-start/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -20,11 +20,11 @@ connections {
start_action = start start_action = start
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/net2net-start/hosts/sun/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -20,11 +20,11 @@ connections {
start_action = none start_action = none
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
mobike = no mobike = no
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/ocsp-disabled/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
home { home {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/ocsp-disabled/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -16,10 +16,10 @@ connections {
net { net {
local_ts = 10.1.0.0/16 local_ts = 10.1.0.0/16
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/ocsp-signer-cert/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
home { home {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/ocsp-signer-cert/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -16,10 +16,10 @@ connections {
net { net {
local_ts = 10.1.0.0/16 local_ts = 10.1.0.0/16
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/protoport-dual/hosts/carol/etc/swanctl/swanctl.conf
+3 -3
View File
@@ -19,17 +19,17 @@ connections {
remote_ts = 10.1.0.0/16[icmp] remote_ts = 10.1.0.0/16[icmp]
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
ssh { ssh {
local_ts = dynamic[tcp] local_ts = dynamic[tcp]
remote_ts = 10.1.0.0/16[tcp/ssh] remote_ts = 10.1.0.0/16[tcp/ssh]
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/protoport-dual/hosts/moon/etc/swanctl/swanctl.conf
+3 -3
View File
@@ -18,7 +18,7 @@ connections {
hostaccess = yes hostaccess = yes
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
ssh { ssh {
local_ts = 10.1.0.0/16[tcp/ssh] local_ts = 10.1.0.0/16[tcp/ssh]
@@ -26,10 +26,10 @@ connections {
hostaccess = yes hostaccess = yes
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/protoport-range/hosts/carol/etc/swanctl/swanctl.conf
+4 -4
View File
@@ -19,24 +19,24 @@ connections {
remote_ts = 10.1.0.0/16[icmp/2048] remote_ts = 10.1.0.0/16[icmp/2048]
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
icmp-rep { icmp-rep {
local_ts = dynamic[icmp/0] local_ts = dynamic[icmp/0]
remote_ts = 10.1.0.0/16[icmp/0] remote_ts = 10.1.0.0/16[icmp/0]
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
ftp-ssh { ftp-ssh {
local_ts = dynamic[tcp/32768-65535] local_ts = dynamic[tcp/32768-65535]
remote_ts = 10.1.0.0/16[tcp/21-22] remote_ts = 10.1.0.0/16[tcp/21-22]
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/protoport-range/hosts/moon/etc/swanctl/swanctl.conf
+4 -4
View File
@@ -18,7 +18,7 @@ connections {
hostaccess = yes hostaccess = yes
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
icmp-rep { icmp-rep {
local_ts = 10.1.0.0/16[icmp/0] local_ts = 10.1.0.0/16[icmp/0]
@@ -26,7 +26,7 @@ connections {
hostaccess = yes hostaccess = yes
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
ftp-ssh { ftp-ssh {
local_ts = 10.1.0.0/16[tcp/21-22] local_ts = 10.1.0.0/16[tcp/21-22]
@@ -34,10 +34,10 @@ connections {
hostaccess = yes hostaccess = yes
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-cert/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-cert/hosts/dave/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,10 +18,10 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-cert/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -16,10 +16,10 @@ connections {
local_ts = 10.1.0.0/16 local_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-dnssec/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -19,10 +19,10 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-dnssec/hosts/dave/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -19,10 +19,10 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-dnssec/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -17,11 +17,11 @@ connections {
local_ts = 10.1.0.0/16 local_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
send_certreq = no send_certreq = no
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/dave/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
send_certreq = no send_certreq = no
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -16,11 +16,11 @@ connections {
local_ts = 10.1.0.0/16 local_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
send_certreq = no send_certreq = no
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-hash-and-url/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-hash-and-url/hosts/dave/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-hash-and-url/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -16,11 +16,11 @@ connections {
local_ts = 10.1.0.0/16 local_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -17,10 +17,10 @@ connections {
remote_ts = 10.1.0.0/28 remote_ts = 10.1.0.0/28
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128-sha256-curve25519 esp_proposals = aes128-sha256-x25519
} }
} }
version = 1 version = 1
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/swanctl/swanctl.conf
+3 -3
View File
@@ -15,11 +15,11 @@ connections {
local_ts = 10.1.0.0/28 local_ts = 10.1.0.0/28
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128-sha256-curve25519 esp_proposals = aes128-sha256-x25519
} }
} }
version = 1 version = 1
proposals = aes128-sha256-curve25519,3des-sha1-modp2048 proposals = aes128-sha256-x25519,3des-sha1-modp2048
} }
rw-2 { rw-2 {
@@ -40,6 +40,6 @@ connections {
} }
} }
version = 1 version = 1
proposals = 3des-sha1-modp2048,aes128-sha256-curve25519 proposals = 3des-sha1-modp2048,aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-psk-fqdn/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -17,11 +17,11 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-psk-fqdn/hosts/dave/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -17,11 +17,11 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-psk-fqdn/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -15,11 +15,11 @@ connections {
local_ts = 10.1.0.0/16 local_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-psk-ikev1/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -15,11 +15,11 @@ connections {
remote_ts = 10.1.0.0/28 remote_ts = 10.1.0.0/28
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 1 version = 1
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-psk-ikev1/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -15,11 +15,11 @@ connections {
local_ts = 10.1.0.0/28 local_ts = 10.1.0.0/28
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 1 version = 1
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
rw-2 { rw-2 {
testing/tests/swanctl/rw-psk-ipv4/hosts/carol/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -17,11 +17,11 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-psk-ipv4/hosts/dave/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -17,11 +17,11 @@ connections {
remote_ts = 10.1.0.0/16 remote_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/rw-psk-ipv4/hosts/moon/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -14,11 +14,11 @@ connections {
local_ts = 10.1.0.0/16 local_ts = 10.1.0.0/16
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/shunt-policies-nat-rw/hosts/alice/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
remote_ts = 0.0.0.0/0 remote_ts = 0.0.0.0/0
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
local-net { local-net {
testing/tests/swanctl/shunt-policies-nat-rw/hosts/sun/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -17,11 +17,11 @@ connections {
local_ts = 0.0.0.0/0 local_ts = 0.0.0.0/0
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
} }
testing/tests/swanctl/shunt-policies-nat-rw/hosts/venus/etc/swanctl/swanctl.conf
+2 -2
View File
@@ -18,11 +18,11 @@ connections {
remote_ts = 0.0.0.0/0 remote_ts = 0.0.0.0/0
updown = /usr/local/libexec/ipsec/_updown iptables updown = /usr/local/libexec/ipsec/_updown iptables
esp_proposals = aes128gcm128-curve25519 esp_proposals = aes128gcm128-x25519
} }
} }
version = 2 version = 2
proposals = aes128-sha256-curve25519 proposals = aes128-sha256-x25519
} }
local-net { local-net {