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, fifteen has been updated via 63e3da5935ee846b9e1e29f624bd299518194d35 (commit) via 22fc183e08240d59230459c9bca1004e27c7e381 (commit) via 651d442ecfe233b2a07773a606f49acf12991184 (commit) via d72a820484dae4d4118e345537795bc69b20b8ac (commit) from 660f97283578616426bac2333a14c527770c2c0f (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 63e3da5935ee846b9e1e29f624bd299518194d35 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 5 02:18:43 2014 +0100

vpnmain.cgi: Re-design algorithm selection.

commit 22fc183e08240d59230459c9bca1004e27c7e381 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 5 01:34:40 2014 +0100

IPsec: Add MODP-2048 subgroups.

commit 651d442ecfe233b2a07773a606f49acf12991184 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 5 01:27:53 2014 +0100

IPsec: Add Brainpool elliptic curves.

commit d72a820484dae4d4118e345537795bc69b20b8ac Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 5 01:11:10 2014 +0100

IPsec: Add Camellia cipher for IKE and ESP.

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

Summary of changes: doc/language_issues.de | 9 ++ doc/language_issues.en | 9 ++ doc/language_issues.es | 13 +++ doc/language_issues.fr | 13 +++ doc/language_issues.nl | 13 +++ doc/language_issues.pl | 13 +++ doc/language_issues.ru | 13 +++ doc/language_issues.tr | 13 +++ doc/language_missings | 16 ++++ html/cgi-bin/vpnmain.cgi | 231 ++++++++++++++++++++++++++++++----------------- langs/de/cgi-bin/de.pl | 4 + langs/en/cgi-bin/en.pl | 4 + 12 files changed, 266 insertions(+), 85 deletions(-)

Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 4c6ef63..b07ee32 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -161,6 +161,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -231,6 +235,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -385,6 +393,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile diff --git a/doc/language_issues.en b/doc/language_issues.en index 88a8f6e..314643d 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -184,6 +184,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -256,6 +260,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -412,6 +420,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile diff --git a/doc/language_issues.es b/doc/language_issues.es index 356dc0e..09ebf81 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -183,6 +183,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -224,6 +228,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -375,6 +383,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile @@ -606,6 +615,7 @@ WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules +WARNING: untranslated string: encryption WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -766,7 +776,10 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: grouptype +WARNING: untranslated string: integrity WARNING: untranslated string: least preferred +WARNING: untranslated string: lifetime WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: new diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 6e1c15b..c37425e 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -183,6 +183,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -224,6 +228,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -377,6 +385,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile @@ -609,6 +618,7 @@ WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules +WARNING: untranslated string: encryption WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -769,7 +779,10 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: grouptype +WARNING: untranslated string: integrity WARNING: untranslated string: least preferred +WARNING: untranslated string: lifetime WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: new diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 902b6e5..55fd951 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -185,6 +185,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -226,6 +230,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -382,6 +390,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile @@ -572,6 +581,7 @@ WARNING: untranslated string: drop action1 WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +WARNING: untranslated string: encryption WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings @@ -715,7 +725,10 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: grouptype +WARNING: untranslated string: integrity WARNING: untranslated string: least preferred +WARNING: untranslated string: lifetime WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: notice diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 356dc0e..09ebf81 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -183,6 +183,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -224,6 +228,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -375,6 +383,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile @@ -606,6 +615,7 @@ WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules +WARNING: untranslated string: encryption WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -766,7 +776,10 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: grouptype +WARNING: untranslated string: integrity WARNING: untranslated string: least preferred +WARNING: untranslated string: lifetime WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: new diff --git a/doc/language_issues.ru b/doc/language_issues.ru index a5e6638..200ab29 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -182,6 +182,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -219,6 +223,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -371,6 +379,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile @@ -602,6 +611,7 @@ WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules +WARNING: untranslated string: encryption WARNING: untranslated string: extrahd because there is already a device mounted WARNING: untranslated string: extrahd cant umount WARNING: untranslated string: extrahd install or load driver @@ -752,8 +762,11 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: grouptype WARNING: untranslated string: incoming traffic in bytes per second +WARNING: untranslated string: integrity WARNING: untranslated string: least preferred +WARNING: untranslated string: lifetime WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: new diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 810b3d6..30a7a8a 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -185,6 +185,10 @@ WARNING: translation string unused: err rs 7 untartst WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access +WARNING: translation string unused: esp encryption +WARNING: translation string unused: esp grouptype +WARNING: translation string unused: esp integrity +WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -226,6 +230,10 @@ WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id WARNING: translation string unused: ids preprocessor +WARNING: translation string unused: ike encryption +WARNING: translation string unused: ike grouptype +WARNING: translation string unused: ike integrity +WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -382,6 +390,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled WARNING: translation string unused: polfile @@ -568,6 +577,7 @@ WARNING: untranslated string: drop action1 WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +WARNING: untranslated string: encryption WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings @@ -711,7 +721,10 @@ WARNING: untranslated string: fwhost stdnet WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: grouptype +WARNING: untranslated string: integrity WARNING: untranslated string: least preferred +WARNING: untranslated string: lifetime WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: notice diff --git a/doc/language_missings b/doc/language_missings index 0b6e3f0..e3e5c8e 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -75,6 +75,7 @@ < drop action2 < drop forward < drop outgoing +< encryption < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -265,7 +266,10 @@ < fw settings dropdown < fw settings remark < fw settings ruletable +< grouptype +< integrity < least preferred +< lifetime < minute < most preferred < notice @@ -488,6 +492,7 @@ < drop action2 < drop forward < drop outgoing +< encryption < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -678,7 +683,10 @@ < fw settings dropdown < fw settings remark < fw settings ruletable +< grouptype +< integrity < least preferred +< lifetime < minute < most preferred < notice @@ -893,6 +901,7 @@ < drop action2 < drop forward < drop outgoing +< encryption < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -1075,7 +1084,10 @@ < fw settings dropdown < fw settings remark < fw settings ruletable +< grouptype +< integrity < least preferred +< lifetime < minute < most preferred < notice @@ -1278,6 +1290,7 @@ < drop forward < drop outgoing < Edit an existing route +< encryption < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -1461,9 +1474,12 @@ < fw settings dropdown < fw settings remark < fw settings ruletable +< grouptype < hour-graph < incoming traffic in bytes per second +< integrity < least preferred +< lifetime < minute < month-graph < most preferred diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 2d9058d..64bf17e 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2101,7 +2101,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || goto ADVANCED_ERROR; } foreach my $val (@temp) { - if ($val !~ /^(aes256|aes192|aes128|3des)$/) { + if ($val !~ /^(aes256|aes192|aes128|3des|camellia256|camellia192|camellia128)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } @@ -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|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; } @@ -2142,7 +2142,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || goto ADVANCED_ERROR; } foreach my $val (@temp) { - if ($val !~ /^(aes256|aes192|aes128|3des)$/) { + if ($val !~ /^(aes256|aes192|aes128|3des|camellia256|camellia192|camellia128)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } @@ -2159,8 +2159,8 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || } } if ($cgiparams{'ESP_GROUPTYPE'} ne '' && - $cgiparams{'ESP_GROUPTYPE'} !~ /^ecp(192|224|256|384|512)$/ && - $cgiparams{'ESP_GROUPTYPE'} !~ /^modp(1024|1536|2048|3072|4096|6144|8192)$/) { + $cgiparams{'ESP_GROUPTYPE'} !~ /^ecp(192|224|256|384|512)(bp)?$/ && + $cgiparams{'ESP_GROUPTYPE'} !~ /^modp(1024|1536|2048|2048s(256|224|160)|3072|4096|6144|8192)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } @@ -2228,6 +2228,9 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $checked{'IKE_ENCRYPTION'}{'aes192'} = ''; $checked{'IKE_ENCRYPTION'}{'aes128'} = ''; $checked{'IKE_ENCRYPTION'}{'3des'} = ''; + $checked{'IKE_ENCRYPTION'}{'camellia256'} = ''; + $checked{'IKE_ENCRYPTION'}{'camellia192'} = ''; + $checked{'IKE_ENCRYPTION'}{'camellia128'} = ''; my @temp = split('|', $cgiparams{'IKE_ENCRYPTION'}); foreach my $key (@temp) {$checked{'IKE_ENCRYPTION'}{$key} = "selected='selected'"; } $checked{'IKE_INTEGRITY'}{'sha2_512'} = ''; @@ -2256,6 +2259,9 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $checked{'ESP_ENCRYPTION'}{'aes192'} = ''; $checked{'ESP_ENCRYPTION'}{'aes128'} = ''; $checked{'ESP_ENCRYPTION'}{'3des'} = ''; + $checked{'ESP_ENCRYPTION'}{'camellia256'} = ''; + $checked{'ESP_ENCRYPTION'}{'camellia192'} = ''; + $checked{'ESP_ENCRYPTION'}{'camellia128'} = ''; @temp = split('|', $cgiparams{'ESP_ENCRYPTION'}); foreach my $key (@temp) {$checked{'ESP_ENCRYPTION'}{$key} = "selected='selected'"; } $checked{'ESP_INTEGRITY'}{'sha2_512'} = ''; @@ -2298,96 +2304,151 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || <input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />

<table width='100%'> - <tr><td class='boldbase' align='right' valign='top'>$Lang::tr{'ike encryption'}</td><td class='boldbase' valign='top'> - <select name='IKE_ENCRYPTION' multiple='multiple' size='4'> - <option value='aes256' $checked{'IKE_ENCRYPTION'}{'aes256'}>AES (256 bit)</option> - <option value='aes192' $checked{'IKE_ENCRYPTION'}{'aes192'}>AES (192 bit)</option> - <option value='aes128' $checked{'IKE_ENCRYPTION'}{'aes128'}>AES (128 bit)</option> - <option value='3des' $checked{'IKE_ENCRYPTION'}{'3des'}>3DES</option> - </select></td> - - <td class='boldbase' align='right' valign='top'>$Lang::tr{'ike integrity'}</td><td class='boldbase' valign='top'> - <select name='IKE_INTEGRITY' multiple='multiple' size='4'> - <option value='sha2_512' $checked{'IKE_INTEGRITY'}{'sha2_512'}>SHA2 512 bit</option> - <option value='sha2_384' $checked{'IKE_INTEGRITY'}{'sha2_384'}>SHA2 384 bit</option> - <option value='sha2_256' $checked{'IKE_INTEGRITY'}{'sha2_256'}>SHA2 256 bit</option> - <option value='sha' $checked{'IKE_INTEGRITY'}{'sha'}>SHA1</option> - <option value='md5' $checked{'IKE_INTEGRITY'}{'md5'}>MD5</option> - <option value='aesxcbc' $checked{'IKE_INTEGRITY'}{'aesxcbc'}>AES XCBC</option> - </select></td> - - <td class='boldbase' align='right' valign='top'>$Lang::tr{'ike grouptype'}</td><td class='boldbase' valign='top'> - <select name='IKE_GROUPTYPE' multiple='multiple' size='4'> - <option value='e521' $checked{'IKE_GROUPTYPE'}{'e521'}>ECP-521</option> - <option value='e384' $checked{'IKE_GROUPTYPE'}{'e384'}>ECP-384</option> - <option value='e256' $checked{'IKE_GROUPTYPE'}{'e256'}>ECP-256</option> - <option value='e224' $checked{'IKE_GROUPTYPE'}{'e224'}>ECP-224</option> - <option value='e192' $checked{'IKE_GROUPTYPE'}{'e192'}>ECP-192</option> - <option value='8192' $checked{'IKE_GROUPTYPE'}{'8192'}>MODP-8192</option> - <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='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> - </select></td> - </tr><tr> - <td class='boldbase' align='right' valign='top'>$Lang::tr{'ike lifetime'}</td><td class='boldbase' valign='top'> - <input type='text' name='IKE_LIFETIME' value='$cgiparams{'IKE_LIFETIME'}' size='5' /> $Lang::tr{'hours'}</td> + <thead> + <tr> + <th></th> + <th>IKE</th> + <th>ESP</th> + </tr> + </thead> + <tbody> + <tr> + <td class='boldbase'>$Lang::tr{'encryption'}</td> + <td class='boldbase'> + <select name='IKE_ENCRYPTION' multiple='multiple' size='6' style='width: 100%'> + <option value='aes256' $checked{'IKE_ENCRYPTION'}{'aes256'}>AES (256 bit)</option> + <option value='aes192' $checked{'IKE_ENCRYPTION'}{'aes192'}>AES (192 bit)</option> + <option value='aes128' $checked{'IKE_ENCRYPTION'}{'aes128'}>AES (128 bit)</option> + <option value='3des' $checked{'IKE_ENCRYPTION'}{'3des'}>3DES</option> + <option value='camellia256' $checked{'IKE_ENCRYPTION'}{'camellia256'}>Camellia (256 bit)</option> + <option value='camellia192' $checked{'IKE_ENCRYPTION'}{'camellia192'}>Camellia (192 bit)</option> + <option value='camellia128' $checked{'IKE_ENCRYPTION'}{'camellia128'}>Camellia (128 bit)</option> + </select> + </td> + <td class='boldbase'> + <select name='ESP_ENCRYPTION' multiple='multiple' size='6' style='width: 100%'> + <option value='aes256' $checked{'ESP_ENCRYPTION'}{'aes256'}>AES (256 bit)</option> + <option value='aes192' $checked{'ESP_ENCRYPTION'}{'aes192'}>AES (192 bit)</option> + <option value='aes128' $checked{'ESP_ENCRYPTION'}{'aes128'}>AES (128 bit)</option> + <option value='3des' $checked{'ESP_ENCRYPTION'}{'3des'}>3DES</option> + <option value='camellia256' $checked{'ESP_ENCRYPTION'}{'camellia256'}>Camellia (256 bit)</option> + <option value='camellia192' $checked{'ESP_ENCRYPTION'}{'camellia192'}>Camellia (192 bit)</option> + <option value='camellia128' $checked{'ESP_ENCRYPTION'}{'camellia128'}>Camellia (128 bit)</option> + </select> + </td> + </tr>

- </tr><tr> - <td colspan='1'><hr /></td> - </tr><tr> - <td class='boldbase' align='right' valign='top'>$Lang::tr{'esp encryption'}</td><td class='boldbase' valign='top'> - <select name='ESP_ENCRYPTION' multiple='multiple' size='4'> - <option value='aes256' $checked{'ESP_ENCRYPTION'}{'aes256'}>AES (256 bit)</option> - <option value='aes192' $checked{'ESP_ENCRYPTION'}{'aes192'}>AES (192 bit)</option> - <option value='aes128' $checked{'ESP_ENCRYPTION'}{'aes128'}>AES (128 bit)</option> - <option value='3des' $checked{'ESP_ENCRYPTION'}{'3des'}>3DES</option> - - <td class='boldbase' align='right' valign='top'>$Lang::tr{'esp integrity'}</td><td class='boldbase' valign='top'> - <select name='ESP_INTEGRITY' multiple='multiple' size='4'> - <option value='sha2_512' $checked{'ESP_INTEGRITY'}{'sha2_512'}>SHA2 512 bit</option> - <option value='sha2_384' $checked{'ESP_INTEGRITY'}{'sha2_384'}>SHA2 384 bit</option> - <option value='sha2_256' $checked{'ESP_INTEGRITY'}{'sha2_256'}>SHA2 256 bit</option> - <option value='sha1' $checked{'ESP_INTEGRITY'}{'sha1'}>SHA1</option> - <option value='md5' $checked{'ESP_INTEGRITY'}{'md5'}>MD5</option> - <option value='aesxcbc' $checked{'ESP_INTEGRITY'}{'aesxcbc'}>AES XCBC</option> - </select></td> - - <td class='boldbase' align='right' valign='top'>$Lang::tr{'esp grouptype'}</td><td class='boldbase' valign='top'> - <select name='ESP_GROUPTYPE'> - <option value=''>$Lang::tr{'phase1 group'}</option></select></td> - </tr><tr> - <td class='boldbase' align='right' valign='top'>$Lang::tr{'esp keylife'}</td><td class='boldbase' valign='top'> - <input type='text' name='ESP_KEYLIFE' value='$cgiparams{'ESP_KEYLIFE'}' size='5' /> $Lang::tr{'hours'}</td> - </tr><tr> - <td colspan='1'><hr /></td> - </tr><tr> - <td colspan='5'><input type='checkbox' name='ONLY_PROPOSED' $checked{'ONLY_PROPOSED'} /> - IKE+ESP: $Lang::tr{'use only proposed settings'}</td> - </tr><tr> - <td colspan='5'><input type='checkbox' name='PFS' $checked{'PFS'} /> - $Lang::tr{'pfs yes no'}</td> - <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> - </tr><tr> - <td colspan='5'><input type='checkbox' name='COMPRESSION' $checked{'COMPRESSION'} /> - $Lang::tr{'vpn payload compression'}</td> - <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></td> + <tr> + <td class='boldbase'>$Lang::tr{'integrity'}</td> + <td class='boldbase'> + <select name='IKE_INTEGRITY' multiple='multiple' size='6' style='width: 100%'> + <option value='sha2_512' $checked{'IKE_INTEGRITY'}{'sha2_512'}>SHA2 512 bit</option> + <option value='sha2_384' $checked{'IKE_INTEGRITY'}{'sha2_384'}>SHA2 384 bit</option> + <option value='sha2_256' $checked{'IKE_INTEGRITY'}{'sha2_256'}>SHA2 256 bit</option> + <option value='sha' $checked{'IKE_INTEGRITY'}{'sha'}>SHA1</option> + <option value='md5' $checked{'IKE_INTEGRITY'}{'md5'}>MD5</option> + <option value='aesxcbc' $checked{'IKE_INTEGRITY'}{'aesxcbc'}>AES XCBC</option> + </select> + </td> + <td class='boldbase'> + <select name='ESP_INTEGRITY' multiple='multiple' size='6' style='width: 100%'> + <option value='sha2_512' $checked{'ESP_INTEGRITY'}{'sha2_512'}>SHA2 512 bit</option> + <option value='sha2_384' $checked{'ESP_INTEGRITY'}{'sha2_384'}>SHA2 384 bit</option> + <option value='sha2_256' $checked{'ESP_INTEGRITY'}{'sha2_256'}>SHA2 256 bit</option> + <option value='sha1' $checked{'ESP_INTEGRITY'}{'sha1'}>SHA1</option> + <option value='md5' $checked{'ESP_INTEGRITY'}{'md5'}>MD5</option> + <option value='aesxcbc' $checked{'ESP_INTEGRITY'}{'aesxcbc'}>AES XCBC</option> + </select> + </td> + </tr> + <tr> + <td class='boldbase'>$Lang::tr{'lifetime'}</td> + <td class='boldbase'> + <input type='text' name='IKE_LIFETIME' value='$cgiparams{'IKE_LIFETIME'}' size='5' /> $Lang::tr{'hours'} + </td> + <td class='boldbase'> + <input type='text' name='ESP_KEYLIFE' value='$cgiparams{'ESP_KEYLIFE'}' size='5' /> $Lang::tr{'hours'} + </td> + </tr> + <tr> + <td class='boldbase'>$Lang::tr{'grouptype'}</td> + <td class='boldbase'> + <select name='IKE_GROUPTYPE' multiple='multiple' size='6' style='width: 100%'> + <option value='e521' $checked{'IKE_GROUPTYPE'}{'e521'}>ECP-521 (NIST)</option> + <option value='e384' $checked{'IKE_GROUPTYPE'}{'e384'}>ECP-384 (NIST)</option> + <option value='e256' $checked{'IKE_GROUPTYPE'}{'e256'}>ECP-256 (NIST)</option> + <option value='e224' $checked{'IKE_GROUPTYPE'}{'e224'}>ECP-224 (NIST)</option> + <option value='e192' $checked{'IKE_GROUPTYPE'}{'e192'}>ECP-192 (NIST)</option> + <option value='e512bp' $checked{'IKE_GROUPTYPE'}{'e512bp'}>ECP-512 (Brainpool)</option> + <option value='e384bp' $checked{'IKE_GROUPTYPE'}{'e384bp'}>ECP-384 (Brainpool)</option> + <option value='e256bp' $checked{'IKE_GROUPTYPE'}{'e256bp'}>ECP-256 (Brainpool)</option> + <option value='e224bp' $checked{'IKE_GROUPTYPE'}{'e224bp'}>ECP-224 (Brainpool)</option> + <option value='8192' $checked{'IKE_GROUPTYPE'}{'8192'}>MODP-8192</option> + <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> + </select> + </td> + <td></td> + </tr> + </tbody> + </table> + + <hr> + + <table width="100%"> + <tr> + <td> + <label> + <input type='checkbox' name='ONLY_PROPOSED' $checked{'ONLY_PROPOSED'} /> + IKE+ESP: $Lang::tr{'use only proposed settings'}</td> + </label> + </td> + </tr> + <tr> + <td> + <label> + <input type='checkbox' name='PFS' $checked{'PFS'} /> + $Lang::tr{'pfs yes no'} + </label> + </td> + </tr> + <tr> + <td> + <label> + <input type='checkbox' name='COMPRESSION' $checked{'COMPRESSION'} /> + $Lang::tr{'vpn payload compression'} + </label> + </td> </tr> EOF ; if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { print "<tr><td><input type='hidden' name='VHOST' value='off' /></td></tr>"; } elsif ($confighash{$cgiparams{'KEY'}}[10]) { - print "<tr><td colspan='5'><input type='checkbox' name='VHOST' $checked{'VHOST'} disabled='disabled' />"; - print " $Lang::tr{'vpn vhost'}</td></tr>"; + print "<tr><td><label><input type='checkbox' name='VHOST' $checked{'VHOST'} disabled='disabled' />"; + print " $Lang::tr{'vpn vhost'}</label></td></tr>"; } else { - print "<tr><td colspan='5'><input type='checkbox' name='VHOST' $checked{'VHOST'} />"; - print " $Lang::tr{'vpn vhost'}</td></tr>"; + print "<tr><td><label><input type='checkbox' name='VHOST' $checked{'VHOST'} />"; + print " $Lang::tr{'vpn vhost'}</label></td></tr>"; }

- print "</table></form>"; + print <<EOF; + <tr> + <td align='right'> + <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /> + <input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /> + </td> + </tr> + </table></form> +EOF + &Header::closebox(); &Header::closebigbox(); &Header::closepage(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e8fb995..d89a4bd 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -801,6 +801,7 @@ 'enabledtitle' => 'Aktiviert', 'encapsulation' => 'Encapsulation', 'encrypted' => 'Verschlüsselt', +'encryption' => 'Verschlüsselung:', 'end address' => 'Endadresse:', 'enter ack class' => 'Legen Sie hier die ACK-Klasse fest <br /> und klicken Sie danach auf <i>Speichern</i>.', 'enter data' => 'Geben Sie die Daten ein <br /> und klicken Sie danach auf <i>Speichern</i>.', @@ -1103,6 +1104,7 @@ 'graph per' => 'pro', 'green' => 'GRÜN', 'green interface' => 'Grünes Interface', +'grouptype' => 'Gruppentyp:', 'guaranteed bandwith' => 'Garantierte Bandbreite', 'guardian alertfile' => 'Alertfile', 'guardian configuration' => 'Guardian Konfiguration', @@ -1179,6 +1181,7 @@ 'installed' => 'Installiert', 'installed updates' => 'Installierte Updates:', 'instant update' => 'Sofortiges Update', +'integrity' => 'Integrität:', 'interface' => 'Schnittstelle', 'interfaces' => 'Interfaces', 'internet' => 'INTERNET', @@ -1290,6 +1293,7 @@ 'least preferred' => 'weniger präferiert', 'legend' => 'Legende', 'length' => 'Länge', +'lifetime' => 'Lebensdauer:', 'line' => 'Leitung', 'linkq' => 'Antwortzeit', 'load printer' => 'Load Printer', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 8bbfff3..30bf70a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -826,6 +826,7 @@ 'enabledtitle' => 'Enabled', 'encapsulation' => 'Encapsulation', 'encrypted' => 'Encrypted', +'encryption' => 'Encryption:', 'end address' => 'End address:', 'enter ack class' => 'Enter the ACK- Class <br /> and then press <i>Save</i>.', 'enter data' => 'Enter your settings <br /> and then press <i>Save</i>.', @@ -1130,6 +1131,7 @@ 'graph per' => 'per', 'green' => 'GREEN', 'green interface' => 'Green Interface', +'grouptype' => 'Grouptype:', 'guaranteed bandwith' => 'Guaranteed bandwith', 'guardian alertfile' => 'Alertfile', 'guardian configuration' => 'Guardian Configuration', @@ -1207,6 +1209,7 @@ 'installed' => 'Installed', 'installed updates' => 'Installed updates:', 'instant update' => 'Instant Update', +'integrity' => 'Integrity:', 'interface' => 'Interface', 'interfaces' => 'Interfaces', 'internet' => 'INTERNET', @@ -1318,6 +1321,7 @@ 'least preferred' => 'least preferred', 'legend' => 'Legend', 'length' => 'Length', +'lifetime' => 'Lifetime:', 'line' => 'Line', 'linkq' => 'Link Quality', 'load printer' => 'Load Printer',

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