From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] add missing check for Curve25519 in vpnmain.cgi
Date: Mon, 09 Oct 2017 14:55:38 +0100
Message-ID: <1507557338.4045.7.camel@ipfire.org>
In-Reply-To: <20171008204110.2569252c.peter.mueller@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8866912342660077504=="
List-Id: <development.lists.ipfire.org>

--===============8866912342660077504==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi,

I am quite surprised that I didn't notice this earlier, but thanks for sending
in the patch.

I fixed the whitespace because you indented with spaces and sometimes tabs wh=
ere
we only use tabs.

Best,
-Michael

On Sun, 2017-10-08 at 20:41 +0200, Peter M=C3=BCller wrote:
> This fixes bug #11501 which causes IPsec connections to crash if
> Curve25519 has been enabled.
>=20
> Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
> ---
> diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
> index f9508b53d..25551008f 100644
> --- a/html/cgi-bin/vpnmain.cgi
> +++ b/html/cgi-bin/vpnmain.cgi
> @@ -3125,6 +3125,8 @@ sub make_algos($$$$$) {
> =20
>  					if ($grp =3D~ m/^e(.*)$/) {
>  						push(@algo, "ecp$1");
> +					} elsif ($grp =3D~ m/curve25519/) {
> +                                                push(@algo, "$grp");
>  					} else {
>  						push(@algo, "modp$grp");
>  					}
> @@ -3140,6 +3142,8 @@ sub make_algos($$$$$) {
>  						# noop
>  					} elsif ($grp =3D~ m/^e(.*)$/) {
>  						push(@algo, "ecp$1");
> +                                        } elsif ($grp =3D~ m/curve25519/) {
> +                                                push(@algo, "$grp");
>  					} else {
>  						push(@algo, "modp$grp");
>  					}

--===============8866912342660077504==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl
Mnlwa3R4Z0hudy8yK1FDUWNGQWxuYmY5b0FDZ2tRZ0hudy8yK1EKQ1FkdXNnLy9lb2FvTGJQTGs3
UkJCOVdxQStoOG5hTHViU1Z6RnZTWUtRVW1NRTFYcm10SWM0ZUwwQUNZWUkyYQpFN0I1MTZzTG5p
TUI3enVxSEZOT2xYMXRoRm5TZVRZYjJoRTBySEplSnZ4YlhwYUZ1Tzl5NEJnUWFZVEwyMkltClNK
dEsza1N1SUtIam15SlN6ejJ4Y2VwZWRBRW9qcW1nWlFrSG8xaFVHQ1YvWklLUFRCT1lwT3JQRmRF
ZFhid1MKL1pMbGZRQ0d5dlk0d0szV2VrOFZjeW1YOGRkZ2hPTVVWenJzQTFMZUt6cWZ4dmNVMTNz
VUFYajZidXZUenYzNQpFMldLbjVMWWtodEdQRmNtaHpZUXZ4cUExdU1ZUFc0em5JbTVMSnkvZExp
a0FoYkZtd0YyVUFtc2pTdDVjTWw1Ck55eXpBTmhkbU05cDVIOVBXK2hKR2tzdGJ6Z2dieFhTaVlj
QnUzam5VUzBicFNLMXRyMnV1ZU5yNjZHVWEyOHkKL0VlQWRZc2xDandPOWdiZ2JQWWVpMXhnMk5I
NllYQjAyeUFyRXRxNlJIcVZTaU0wbUQxUUVwMWVkb0xmVDdydwpoRVB0RXMxQU5JVnBWQ3ExQ1Ba
dEtiWmRqNzNJaCtkWjNxL1cwekhQdXhuNHpsUzVweGxhNXFaL3lPdWtwRUFTCkVpWUJlVVBzQnpn
VC91YkFCWTFCaEhTQVBPQS91ZGxQRm12NHpXamM0VFM3cDRtY05UWUxZK3hKQ2dmN0t4bDcKODJZ
eWxTSWNYeWYzSHFaZE1sV3JnMzlxRDJKZjJ4bytiNVlqSjIyaGpiUkx2L25kWmc3RDRzajhCQUN6
YS9xegp0YjB2SGpGcVRCOUhONEJhVjRLMzdkQWdadjBQRzZwOFBPcVVGQ1J3MUthR1lmbEhYbjQ9
Cj1MOFpiCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo=

--===============8866912342660077504==--