From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 5 Jan 2014 00:34:40 +0000 (+0100)
Subject: IPsec: Add MODP-2048 subgroups.
X-Git-Tag: v2.15-beta1~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22fc183e08240d59230459c9bca1004e27c7e381;p=people%2Fms%2Fipfire-2.x.git

IPsec: Add MODP-2048 subgroups.
---

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 81bad5cb1f..5a943b779a 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -2123,7 +2123,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
 	    goto ADVANCED_ERROR;
 	}
 	foreach my $val (@temp) {
-	    if ($val !~ /^(e521|e384|e256|e224|e192|e512bp|e384bp|e256bp|e224bp|1024|1536|2048|3072|4096|6144|8192)$/) {
+	    if ($val !~ /^(e521|e384|e256|e224|e192|e512bp|e384bp|e256bp|e224bp|1024|1536|2048|2048s256|2048s224|2048s160|3072|4096|6144|8192)$/) {
 		$errormessage = $Lang::tr{'invalid input'};
 		goto ADVANCED_ERROR;
 	    }
@@ -2160,7 +2160,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
 	}
 	if ($cgiparams{'ESP_GROUPTYPE'} ne '' &&
 	    $cgiparams{'ESP_GROUPTYPE'} !~  /^ecp(192|224|256|384|512)(bp)?$/ &&
-	    $cgiparams{'ESP_GROUPTYPE'} !~  /^modp(1024|1536|2048|3072|4096|6144|8192)$/) {
+	    $cgiparams{'ESP_GROUPTYPE'} !~  /^modp(1024|1536|2048|2048s(256|224|160)|3072|4096|6144|8192)$/) {
 	    $errormessage = $Lang::tr{'invalid input'};
 	    goto ADVANCED_ERROR;
 	}
@@ -2340,6 +2340,9 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
 		<option value='6144' $checked{'IKE_GROUPTYPE'}{'6144'}>MODP-6144</option>
 		<option value='4096' $checked{'IKE_GROUPTYPE'}{'4096'}>MODP-4096</option>
 		<option value='3072' $checked{'IKE_GROUPTYPE'}{'3072'}>MODP-3072</option>
+		<option value='2048s256' $checked{'IKE_GROUPTYPE'}{'2048s256'}>MODP-2048/256</option>
+		<option value='2048s224' $checked{'IKE_GROUPTYPE'}{'2048s224'}>MODP-2048/224</option>
+		<option value='2048s160' $checked{'IKE_GROUPTYPE'}{'2048s160'}>MODP-2048/160</option>
 		<option value='2048' $checked{'IKE_GROUPTYPE'}{'2048'}>MODP-2048</option>
 		<option value='1536' $checked{'IKE_GROUPTYPE'}{'1536'}>MODP-1536</option>
 		<option value='1024' $checked{'IKE_GROUPTYPE'}{'1024'}>MODP-1024</option>