Allow x25519 as an alias of the curve25519 KE algorithm

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
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes128ccm96-aesxcbc-curve25519!
esp=aes128ccm96-curve25519!
ike=aes128ccm96-aesxcbc-x25519!
esp=aes128ccm96-x25519!
conn home
left=PH_IP_CAROL
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes128ccm12-aesxcbc-curve25519!
esp=aes128ccm12-curve25519!
ike=aes128ccm12-aesxcbc-x25519!
esp=aes128ccm12-x25519!
conn rw
left=PH_IP_MOON
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes128ctr-aesxcbc-curve25519!
esp=aes128ctr-aesxcbc-curve25519!
ike=aes128ctr-aesxcbc-x25519!
esp=aes128ctr-aesxcbc-x25519!
conn home
left=PH_IP_CAROL
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes128ctr-aesxcbc-curve25519!
esp=aes128ctr-aesxcbc-curve25519!
ike=aes128ctr-aesxcbc-x25519!
esp=aes128ctr-aesxcbc-x25519!
conn rw
left=PH_IP_MOON
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes256gcm128-aesxcbc-curve25519!
esp=aes256gcm128-curve25519!
ike=aes256gcm128-aesxcbc-x25519!
esp=aes256gcm128-x25519!
conn home
left=PH_IP_CAROL
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes256gcm16-aesxcbc-curve25519!
esp=aes256gcm16-curve25519!
ike=aes256gcm16-aesxcbc-x25519!
esp=aes256gcm16-x25519!
conn rw
left=PH_IP_MOON
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes128-aesxcbc-curve25519!
esp=aes128-aesxcbc-curve25519!
ike=aes128-aesxcbc-x25519!
esp=aes128-aesxcbc-x25519!
conn home
left=PH_IP_CAROL
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes128-aesxcbc-curve25519!
esp=aes128-aesxcbc-curve25519!
ike=aes128-aesxcbc-x25519!
esp=aes128-aesxcbc-x25519!
conn rw
left=PH_IP_MOON
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes128-sha256-curve25519!
esp=aes128-sha256_96-curve25519!
ike=aes128-sha256-x25519!
esp=aes128-sha256_96-x25519!
conn home
left=PH_IP_CAROL
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes128-sha256-curve25519!
esp=aes128-sha256_96-curve25519!
ike=aes128-sha256-x25519!
esp=aes128-sha256_96-x25519!
conn rw
left=PH_IP_MOON
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes128-sha256-curve25519!
esp=aes128-sha256-curve25519!
ike=aes128-sha256-x25519!
esp=aes128-sha256-x25519!
conn home
left=PH_IP_CAROL
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes128-sha256-curve25519!
esp=aes128-sha256-curve25519!
ike=aes128-sha256-x25519!
esp=aes128-sha256-x25519!
conn rw
left=PH_IP_MOON
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes192-sha384-curve25519!
esp=aes192-sha384-curve25519!
ike=aes192-sha384-x25519!
esp=aes192-sha384-x25519!
conn home
left=PH_IP_CAROL
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes192-sha384-curve25519!
esp=aes192-sha384-curve25519!
ike=aes192-sha384-x25519!
esp=aes192-sha384-x25519!
conn rw
left=PH_IP_MOON
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes256-aesxcbc-curve25519!
esp=aes256gmac-curve25519!
ike=aes256-aesxcbc-x25519!
esp=aes256gmac-x25519!
conn home
left=PH_IP_CAROL
@@ -8,8 +8,8 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes256-aesxcbc-curve25519!
esp=aes256gmac-curve25519!
ike=aes256-aesxcbc-x25519!
esp=aes256gmac-x25519!
conn rw
left=PH_IP_MOON
@@ -8,7 +8,7 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes128-sha256-curve25519!
ike=aes128-sha256-x25519!
esp=null-sha256!
conn home
@@ -8,7 +8,7 @@ conn %default
rekeymargin=3m
keyingtries=1
keyexchange=ikev2
ike=aes128-sha256-curve25519!
ike=aes128-sha256-x25519!
esp=null-sha256!
conn rw