[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2c531c2132ae6681d5b0dc6ec114fb5e8cbb0040

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2c531c2132ae6681d5b0dc6ec114fb5e8cbb0040

[git]

[-- Attachment #1: Type: text/plain, Size: 1796 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  2c531c2132ae6681d5b0dc6ec114fb5e8cbb0040 (commit)
      from  8d1e36cca59e68d3061d2c53a535bfadebe4edf1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2c531c2132ae6681d5b0dc6ec114fb5e8cbb0040
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri May 1 16:57:13 2015 +0200

    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).

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/vpnmain.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 1d75356..2a020ea 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");


hooks/post-receive
--
IPFire 2.x development tree