vpnmain.cgi: Fix ECP regex again for Brainpool curves
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 1 May 2015 14:57:13 +0000 (16:57 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 1 May 2015 14:57:13 +0000 (16:57 +0200)
The regular expression did not take into account that
there could be characters like "bp" in case of the Brainpool
curves (ecp512bp).

html/cgi-bin/vpnmain.cgi

index 1d75356..2a020ea 100644 (file)
@@ -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");