From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@link38.eu>
To: development@lists.ipfire.org
Subject: [PATCH] add missing check for Curve25519 in vpnmain.cgi
Date: Sun, 08 Oct 2017 20:41:10 +0200
Message-ID: <20171008204110.2569252c.peter.mueller@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2575021606414357252=="
List-Id: <development.lists.ipfire.org>

--===============2575021606414357252==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

This fixes bug #11501 which causes IPsec connections to crash if
Curve25519 has been enabled.

Signed-off-by: Peter Müller <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($$$$$) {
 
 					if ($grp =~ m/^e(.*)$/) {
 						push(@algo, "ecp$1");
+					} elsif ($grp =~ m/curve25519/) {
+                                                push(@algo, "$grp");
 					} else {
 						push(@algo, "modp$grp");
 					}
@@ -3140,6 +3142,8 @@ sub make_algos($$$$$) {
 						# noop
 					} elsif ($grp =~ m/^e(.*)$/) {
 						push(@algo, "ecp$1");
+                                        } elsif ($grp =~ m/curve25519/) {
+                                                push(@algo, "$grp");
 					} else {
 						push(@algo, "modp$grp");
 					}

--===============2575021606414357252==--