From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/2] IPsec: Add support for Curve448 Date: Wed, 02 Oct 2019 10:31:54 +0000 Message-ID: <20191002103154.3874-2-michael.tremer@ipfire.org> In-Reply-To: <20191002103154.3874-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8238503981782248462==" List-Id: --===============8238503981782248462== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is supported since strongswan 5.7.2 and is a good alternative to Curve25519 because Curve448 is almost equally secure but performs faster. https://en.wikipedia.org/wiki/Curve448 This is enabled by default although we do not expect many other implementations to be able to support this. Signed-off-by: Michael Tremer --- html/cgi-bin/vpnmain.cgi | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 750b69b1d..1cd7cb84b 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2000,11 +2000,11 @@ END #use default advanced value $cgiparams{'IKE_ENCRYPTION'} =3D 'chacha20poly1305|aes256gcm128|aes256gcm96= |aes256gcm64|aes256|aes192gcm128|aes192gcm96|aes192gcm64|aes192|aes128gcm128|= aes128gcm96|aes128gcm64|aes128'; #[18]; $cgiparams{'IKE_INTEGRITY'} =3D 'sha2_512|sha2_256'; #[19]; - $cgiparams{'IKE_GROUPTYPE'} =3D 'curve25519|4096|3072|2048'; #[20]; + $cgiparams{'IKE_GROUPTYPE'} =3D 'curve25519|curve448|4096|3072|2048'; #[20= ]; $cgiparams{'IKE_LIFETIME'} =3D '3'; #[16]; $cgiparams{'ESP_ENCRYPTION'} =3D 'chacha20poly1305|aes256gcm128|aes256gcm96= |aes256gcm64|aes256|aes192gcm128|aes192gcm96|aes192gcm64|aes192|aes128gcm128|= aes128gcm96|aes128gcm64|aes128'; #[21]; $cgiparams{'ESP_INTEGRITY'} =3D 'sha2_512|sha2_256'; #[22]; - $cgiparams{'ESP_GROUPTYPE'} =3D 'curve25519|4096|3072|2048'; #[23]; + $cgiparams{'ESP_GROUPTYPE'} =3D 'curve25519|curve448|4096|3072|2048'; #[23= ]; $cgiparams{'ESP_KEYLIFE'} =3D '1'; #[17]; $cgiparams{'COMPRESSION'} =3D 'off'; #[13]; $cgiparams{'ONLY_PROPOSED'} =3D 'on'; #[24]; @@ -2368,7 +2368,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || goto ADVANCED_ERROR; } foreach my $val (@temp) { - if ($val !~ /^(curve25519|e521|e384|e256|e224|e192|e512bp|e384bp|e256bp|e= 224bp|768|1024|1536|2048|3072|4096|6144|8192)$/) { + if ($val !~ /^(curve25519|curve448|e521|e384|e256|e224|e192|e512bp|e384bp= |e256bp|e224bp|768|1024|1536|2048|3072|4096|6144|8192)$/) { $errormessage =3D $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } @@ -2409,7 +2409,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || goto ADVANCED_ERROR; } foreach my $val (@temp) { - if ($val !~ /^(curve25519|e521|e384|e256|e224|e192|e512bp|e384bp|e256bp|e= 224bp|768|1024|1536|2048|3072|4096|6144|8192|none)$/) { + if ($val !~ /^(curve25519|curve448|e521|e384|e256|e224|e192|e512bp|e384bp= |e256bp|e224bp|768|1024|1536|2048|3072|4096|6144|8192|none)$/) { $errormessage =3D $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } @@ -2549,6 +2549,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || @temp =3D split('\|', $cgiparams{'IKE_INTEGRITY'}); foreach my $key (@temp) {$checked{'IKE_INTEGRITY'}{$key} =3D "selected=3D's= elected'"; } $checked{'IKE_GROUPTYPE'}{'curve25519'} =3D ''; + $checked{'IKE_GROUPTYPE'}{'curve448'} =3D ''; $checked{'IKE_GROUPTYPE'}{'768'} =3D ''; $checked{'IKE_GROUPTYPE'}{'1024'} =3D ''; $checked{'IKE_GROUPTYPE'}{'1536'} =3D ''; @@ -2588,6 +2589,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || @temp =3D split('\|', $cgiparams{'ESP_INTEGRITY'}); foreach my $key (@temp) {$checked{'ESP_INTEGRITY'}{$key} =3D "selected=3D's= elected'"; } $checked{'ESP_GROUPTYPE'}{'curve25519'} =3D ''; + $checked{'ESP_GROUPTYPE'}{'curve448'} =3D ''; $checked{'ESP_GROUPTYPE'}{'768'} =3D ''; $checked{'ESP_GROUPTYPE'}{'1024'} =3D ''; $checked{'ESP_GROUPTYPE'}{'1536'} =3D ''; @@ -2752,6 +2754,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || + @@ -3325,7 +3329,7 @@ sub make_algos($$$$$) { =20 if ($grp =3D~ m/^e(.*)$/) { push(@algo, "ecp$1"); - } elsif ($grp =3D~ m/curve25519/) { + } elsif ($grp =3D~ m/curve(25519|448)/) { push(@algo, "$grp"); } else { push(@algo, "modp$grp"); @@ -3342,7 +3346,7 @@ sub make_algos($$$$$) { # noop } elsif ($grp =3D~ m/^e(.*)$/) { push(@algo, "ecp$1"); - } elsif ($grp =3D~ m/curve25519/) { + } elsif ($grp =3D~ m/curve(25519|448)/) { push(@algo, "$grp"); } else { push(@algo, "modp$grp"); --=20 2.20.1 --===============8238503981782248462==--