From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 1 May 2015 14:57:13 +0000 (+0200)
Subject: vpnmain.cgi: Fix ECP regex again for Brainpool curves
X-Git-Tag: v2.17-core91~86
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=2c531c2132ae6681d5b0dc6ec114fb5e8cbb0040

vpnmain.cgi: Fix ECP regex again for Brainpool curves

The regular expression did not take into account that
there could be characters like "bp" in case of the Brainpool
curves (ecp512bp).
---

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 1d75356406..2a020eaddd 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -3017,7 +3017,7 @@ sub make_algos($$$$$) {
 				if ($mode eq "ike") {
 					push(@algo, $int);
 
-					if ($grp =~ m/^e(\d+)/) {
+					if ($grp =~ m/^e(.*)$/) {
 						push(@algo, "ecp$1");
 					} else {
 						push(@algo, "modp$grp");
@@ -3030,7 +3030,7 @@ sub make_algos($$$$$) {
 						push(@algo, $int);
 					}
 
-					if ($grp =~ m/^e(\d+)/) {
+					if ($grp =~ m/^e(.*)$/) {
 						push(@algo, "ecp$1");
 					} else {
 						push(@algo, "modp$grp");