From: Michael Tremer Date: Sun, 11 May 2014 16:47:11 +0000 (+0200) Subject: Merge remote-tracking branch 'ummeegge/openvpn' into next X-Git-Tag: v2.15-core79~95 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=661cd276b68c274ecfee7cdf3bd6c7204dc56572;p=ipfire-2.x.git Merge remote-tracking branch 'ummeegge/openvpn' into next Conflicts: html/cgi-bin/ovpnmain.cgi langs/de/cgi-bin/de.pl langs/en/cgi-bin/en.pl --- 661cd276b68c274ecfee7cdf3bd6c7204dc56572 diff --cc doc/language_issues.de index 650d41552e,25612b5b74..a00e97a051 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@@ -408,11 -409,10 +408,10 @@@ WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu -WARNING: translation string unused: ovpn WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn dl - WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn reneg sec WARNING: translation string unused: ovpn_fastio WARNING: translation string unused: ovpn_fragment WARNING: translation string unused: ovpn_mssfix diff --cc doc/language_issues.en index c32d0579b8,e6af830a5d..ba7f0307df --- a/doc/language_issues.en +++ b/doc/language_issues.en @@@ -145,6 -146,6 +145,7 @@@ WARNING: translation string unused: des WARNING: translation string unused: destination ip or net WARNING: translation string unused: destination net WARNING: translation string unused: destination port overlaps ++WARNING: translation string unused: dh name is invalid WARNING: translation string unused: dhcp base ip fixed lease WARNING: translation string unused: dhcp create fixed leases WARNING: translation string unused: dhcp fixed lease err1 @@@ -434,13 -435,12 +435,11 @@@ WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu -WARNING: translation string unused: ovpn WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn dl - WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn reneg sec WARNING: translation string unused: ovpn_fastio --WARNING: translation string unused: ovpn_fragment WARNING: translation string unused: ovpn_mssfix WARNING: translation string unused: ovpn_mtudisc WARNING: translation string unused: ovpn_processprio @@@ -546,6 -550,6 +545,7 @@@ WARNING: translation string unused: suc WARNING: translation string unused: system graphs WARNING: translation string unused: system log viewer WARNING: translation string unused: system status information ++WARNING: translation string unused: teovpn_fragment WARNING: translation string unused: test WARNING: translation string unused: test email could not be sent WARNING: translation string unused: test email was sent diff --cc doc/language_issues.es index b274590afc,b854a2b7a6..54cb32e982 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@@ -633,9 -636,6 +633,10 @@@ WARNING: untranslated string: countryco WARNING: untranslated string: dead peer detection WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: details +WARNING: untranslated string: dh ++WARNING: untranslated string: dh key move failed +WARNING: untranslated string: dh key warn - WARNING: untranslated string: dh name is invalid ++WARNING: untranslated string: dh key warn1 WARNING: untranslated string: dnat address WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward @@@ -871,14 -851,8 +872,15 @@@ WARNING: untranslated string: othe WARNING: untranslated string: outgoing firewall access WARNING: untranslated string: outgoing firewall p2p allow WARNING: untranslated string: outgoing firewall p2p deny +WARNING: untranslated string: ovpn crypt options +WARNING: untranslated string: ovpn dh - WARNING: untranslated string: ovpn dh name ++WARNING: untranslated string: ovpn dh upload ++WARNING: untranslated string: ovpn engines WARNING: untranslated string: ovpn errmsg green already pushed WARNING: untranslated string: ovpn errmsg invalid ip or mask +WARNING: untranslated string: ovpn generating the root and host certificates +WARNING: untranslated string: ovpn ha +WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 diff --cc doc/language_issues.fr index 935d991e6c,6ab29e8bb6..0386f243cc --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@@ -643,9 -646,6 +643,10 @@@ WARNING: untranslated string: countryco WARNING: untranslated string: dead peer detection WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: details +WARNING: untranslated string: dh ++WARNING: untranslated string: dh key move failed +WARNING: untranslated string: dh key warn - WARNING: untranslated string: dh name is invalid ++WARNING: untranslated string: dh key warn1 WARNING: untranslated string: dnat address WARNING: untranslated string: dns address deleted txt WARNING: untranslated string: dns servers @@@ -882,12 -862,6 +883,13 @@@ WARNING: untranslated string: openvpn p WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other WARNING: untranslated string: outgoing firewall access +WARNING: untranslated string: ovpn crypt options +WARNING: untranslated string: ovpn dh - WARNING: untranslated string: ovpn dh name ++WARNING: untranslated string: ovpn dh upload ++WARNING: untranslated string: ovpn engines +WARNING: untranslated string: ovpn generating the root and host certificates +WARNING: untranslated string: ovpn ha +WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 diff --cc doc/language_issues.nl index 6115f62982,6245eefbf1..7c6f729dd0 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@@ -648,39 -652,9 +648,41 @@@ WARNING: untranslated string: Number o WARNING: untranslated string: Scan for Songs WARNING: untranslated string: atm device WARNING: untranslated string: bytes +WARNING: untranslated string: capabilities +WARNING: untranslated string: dh ++WARNING: untranslated string: dh key move failed +WARNING: untranslated string: dh key warn - WARNING: untranslated string: dh name is invalid ++WARNING: untranslated string: dh key warn1 WARNING: untranslated string: dns servers WARNING: untranslated string: drop outgoing +WARNING: untranslated string: firewall logs country WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: gen dh +WARNING: untranslated string: generate dh key +WARNING: untranslated string: imei +WARNING: untranslated string: imsi +WARNING: untranslated string: model +WARNING: untranslated string: modem hardware details +WARNING: untranslated string: modem information +WARNING: untranslated string: modem network bit error rate +WARNING: untranslated string: modem network information +WARNING: untranslated string: modem network mode +WARNING: untranslated string: modem network operator +WARNING: untranslated string: modem network registration +WARNING: untranslated string: modem network signal quality +WARNING: untranslated string: modem no connection +WARNING: untranslated string: modem no connection message +WARNING: untranslated string: modem sim information +WARNING: untranslated string: modem status +WARNING: untranslated string: monitor interface +WARNING: untranslated string: not a valid dh key +WARNING: untranslated string: ovpn crypt options +WARNING: untranslated string: ovpn dh - WARNING: untranslated string: ovpn dh name ++WARNING: untranslated string: ovpn dh upload ++WARNING: untranslated string: ovpn engines +WARNING: untranslated string: ovpn generating the root and host certificates +WARNING: untranslated string: ovpn ha +WARNING: untranslated string: ovpn hmac WARNING: untranslated string: random number generator daemon WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added diff --cc doc/language_issues.pl index b274590afc,b854a2b7a6..54cb32e982 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@@ -633,9 -636,6 +633,10 @@@ WARNING: untranslated string: countryco WARNING: untranslated string: dead peer detection WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: details +WARNING: untranslated string: dh ++WARNING: untranslated string: dh key move failed +WARNING: untranslated string: dh key warn - WARNING: untranslated string: dh name is invalid ++WARNING: untranslated string: dh key warn1 WARNING: untranslated string: dnat address WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward @@@ -871,14 -851,8 +872,15 @@@ WARNING: untranslated string: othe WARNING: untranslated string: outgoing firewall access WARNING: untranslated string: outgoing firewall p2p allow WARNING: untranslated string: outgoing firewall p2p deny +WARNING: untranslated string: ovpn crypt options +WARNING: untranslated string: ovpn dh - WARNING: untranslated string: ovpn dh name ++WARNING: untranslated string: ovpn dh upload ++WARNING: untranslated string: ovpn engines WARNING: untranslated string: ovpn errmsg green already pushed WARNING: untranslated string: ovpn errmsg invalid ip or mask +WARNING: untranslated string: ovpn generating the root and host certificates +WARNING: untranslated string: ovpn ha +WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 diff --cc doc/language_issues.ru index 18d93a7eb2,4058098609..c7c39ec983 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@@ -637,9 -640,6 +637,10 @@@ WARNING: untranslated string: countryco WARNING: untranslated string: dead peer detection WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: details +WARNING: untranslated string: dh ++WARNING: untranslated string: dh key move failed +WARNING: untranslated string: dh key warn - WARNING: untranslated string: dh name is invalid ++WARNING: untranslated string: dh key warn1 WARNING: untranslated string: disk access per WARNING: untranslated string: dnat address WARNING: untranslated string: dns servers @@@ -866,12 -846,6 +867,13 @@@ WARNING: untranslated string: openvpn s WARNING: untranslated string: other WARNING: untranslated string: outgoing firewall access WARNING: untranslated string: outgoing traffic in bytes per second +WARNING: untranslated string: ovpn crypt options +WARNING: untranslated string: ovpn dh - WARNING: untranslated string: ovpn dh name ++WARNING: untranslated string: ovpn dh upload ++WARNING: untranslated string: ovpn engines +WARNING: untranslated string: ovpn generating the root and host certificates +WARNING: untranslated string: ovpn ha +WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 diff --cc doc/language_issues.tr index ad6086cf5a,e6af830a5d..06cacf10fa --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@@ -643,40 -648,9 +643,42 @@@ WARNING: translation string unused: xta WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits +WARNING: untranslated string: Number of Countries for the pie chart WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes +WARNING: untranslated string: capabilities +WARNING: untranslated string: dh ++WARNING: untranslated string: dh key move failed +WARNING: untranslated string: dh key warn - WARNING: untranslated string: dh name is invalid ++WARNING: untranslated string: dh key warn1 +WARNING: untranslated string: firewall logs country WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: gen dh +WARNING: untranslated string: generate dh key +WARNING: untranslated string: imei +WARNING: untranslated string: imsi +WARNING: untranslated string: model +WARNING: untranslated string: modem hardware details +WARNING: untranslated string: modem information +WARNING: untranslated string: modem network bit error rate +WARNING: untranslated string: modem network information +WARNING: untranslated string: modem network mode +WARNING: untranslated string: modem network operator +WARNING: untranslated string: modem network registration +WARNING: untranslated string: modem network signal quality +WARNING: untranslated string: modem no connection +WARNING: untranslated string: modem no connection message +WARNING: untranslated string: modem sim information +WARNING: untranslated string: modem status +WARNING: untranslated string: monitor interface +WARNING: untranslated string: not a valid dh key +WARNING: untranslated string: ovpn crypt options +WARNING: untranslated string: ovpn dh - WARNING: untranslated string: ovpn dh name ++WARNING: untranslated string: ovpn dh upload ++WARNING: untranslated string: ovpn engines +WARNING: untranslated string: ovpn generating the root and host certificates +WARNING: untranslated string: ovpn ha +WARNING: untranslated string: ovpn hmac WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --cc doc/language_missings index 939d4b9a5d,1a386c19c2..d25ea40f8d --- a/doc/language_missings +++ b/doc/language_missings @@@ -6,6 -6,6 +6,7 @@@ ############################################################################ < addon < ccd maxclients ++< ovpn_fragment ############################################################################ # Checking install/setup translations for language: fr # ############################################################################ @@@ -78,9 -77,6 +79,10 @@@ < default ip < deprecated fs warn < details +< dh ++< dh key move failed +< dh key warn - < dh name is invalid ++< dh key warn1 < dnat address < dns address deleted txt < dnsforward @@@ -360,13 -339,6 +362,13 @@@ < other < our donors < outgoing firewall access +< ovpn crypt options +< ovpn dh - < ovpn dh name ++< ovpn dh upload +< ovpn engines +< ovpn generating the root and host certificates +< ovpn ha +< ovpn hmac < ovpn mgmt in root range < ovpn mtu-disc < ovpn mtu-disc and mtu not 1500 @@@ -590,9 -556,6 +592,10 @@@ < default ip < deprecated fs warn < details +< dh ++< dh key move failed +< dh key warn - < dh name is invalid ++< dh key warn1 < dnat address < dnsforward < dnsforward add a new entry @@@ -883,15 -829,8 +886,15 @@@ < outgoing firewall p2p description 2 < outgoing firewall p2p description 3 < outgoing firewall view group +< ovpn crypt options +< ovpn dh - < ovpn dh name ++< ovpn dh upload +< ovpn engines < ovpn errmsg green already pushed < ovpn errmsg invalid ip or mask +< ovpn generating the root and host certificates +< ovpn ha +< ovpn hmac < ovpn mgmt in root range < ovpn mtu-disc < ovpn mtu-disc and mtu not 1500 @@@ -1093,9 -1026,6 +1096,10 @@@ < default ip < deprecated fs warn < details +< dh ++< dh key move failed +< dh key warn - < dh name is invalid ++< dh key warn1 < dnat address < dnsforward < dnsforward add a new entry @@@ -1364,15 -1277,8 +1368,15 @@@ < other < our donors < outgoing firewall access +< ovpn crypt options +< ovpn dh - < ovpn dh name ++< ovpn dh upload +< ovpn engines < ovpn errmsg green already pushed < ovpn errmsg invalid ip or mask +< ovpn generating the root and host certificates +< ovpn ha +< ovpn hmac < ovpn mgmt in root range < ovpn mtu-disc < ovpn mtu-disc and mtu not 1500 @@@ -1574,9 -1474,6 +1578,10 @@@ < default ip < deprecated fs warn < details +< dh ++< dh key move failed +< dh key warn - < dh name is invalid ++< dh key warn1 < disk access per < dnat address < dnsforward @@@ -1852,13 -1732,6 +1857,13 @@@ < our donors < outgoing firewall access < outgoing traffic in bytes per second +< ovpn crypt options +< ovpn dh - < ovpn dh name ++< ovpn dh upload +< ovpn engines +< ovpn generating the root and host certificates +< ovpn ha +< ovpn hmac < ovpn mgmt in root range < ovpn mtu-disc < ovpn mtu-disc and mtu not 1500 diff --cc html/cgi-bin/ovpnmain.cgi index ceb63d4566,0c9e73d5b8..df5f9ece2a --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@@ -19,7 -19,7 +19,6 @@@ # # ############################################################################### ### - # Based on IPFireCore 76 -# Based on IPFireCore 77 ### use CGI; use CGI qw/:standard/; @@@ -1205,15 -1203,15 +1248,15 @@@ SETTINGS_ERROR } } while ($file = glob("${General::swroot}/ovpn/ca/*")) { - unlink $file + unlink $file; } while ($file = glob("${General::swroot}/ovpn/certs/*")) { - unlink $file + unlink $file; } while ($file = glob("${General::swroot}/ovpn/crls/*")) { - unlink $file + unlink $file; } - &cleanssldatabase(); + &cleanssldatabase(); if (open(FILE, ">${General::swroot}/ovpn/caconfig")) { print FILE ""; close FILE; @@@ -1254,7 -1254,7 +1299,8 @@@ + $Lang::tr{'capswarning'}: + $Lang::tr{'capswarning'}: $Lang::tr{'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections'} @@@ -2452,23 -2467,29 +2513,32 @@@ if ($confighash{$cgiparams{'KEY'}}[3] e # } ADV_ERROR: if ($cgiparams{'MAX_CLIENTS'} eq '') { - $cgiparams{'MAX_CLIENTS'} = '100'; + $cgiparams{'MAX_CLIENTS'} = '100'; } if ($cgiparams{'KEEPALIVE_1'} eq '') { - $cgiparams{'KEEPALIVE_1'} = '10'; + $cgiparams{'KEEPALIVE_1'} = '10'; } if ($cgiparams{'KEEPALIVE_2'} eq '') { - $cgiparams{'KEEPALIVE_2'} = '60'; + $cgiparams{'KEEPALIVE_2'} = '60'; } if ($cgiparams{'LOG_VERB'} eq '') { - $cgiparams{'LOG_VERB'} = '3'; + $cgiparams{'LOG_VERB'} = '3'; } if ($cgiparams{'PMTU_DISCOVERY'} eq '') { - $cgiparams{'PMTU_DISCOVERY'} = 'off'; + $cgiparams{'PMTU_DISCOVERY'} = 'off'; + } + if ($cgiparams{'DAUTH'} eq '') { + $cgiparams{'DAUTH'} = 'SHA1'; } + if ($cgiparams{'DAUTH'} eq '') { + $cgiparams{'DAUTH'} = 'SHA1'; + } + if ($cgiparams{'ENGINES'} eq '') { + $cgiparams{'ENGINES'} = 'disabled'; + } + if ($cgiparams{'TLSAUTH'} eq '') { + $cgiparams{'TLSAUTH'} = 'off'; + } $checked{'CLIENT2CLIENT'}{'off'} = ''; $checked{'CLIENT2CLIENT'}{'on'} = ''; $checked{'CLIENT2CLIENT'}{$cgiparams{'CLIENT2CLIENT'}} = 'CHECKED'; @@@ -2496,10 -2517,18 +2566,18 @@@ $selected{'DAUTH'}{'SHA512'} = ''; $selected{'DAUTH'}{'SHA384'} = ''; $selected{'DAUTH'}{'SHA256'} = ''; - $selected{'DAUTH'}{'ecdsa-with-SHA1'} = ''; $selected{'DAUTH'}{'SHA1'} = ''; $selected{'DAUTH'}{$cgiparams{'DAUTH'}} = 'SELECTED'; + $checked{'TLSAUTH'}{'off'} = ''; + $checked{'TLSAUTH'}{'on'} = ''; + $checked{'TLSAUTH'}{$cgiparams{'TLSAUTH'}} = 'CHECKED'; + $selected{'ENGINES'}{'cryptodev'} = ''; + $selected{'ENGINES'}{'dynamic'} = ''; + $selected{'ENGINES'}{'aesni'} = ''; + $selected{'ENGINES'}{'padlock'} = ''; + $selected{'ENGINES'}{'disabled'} = ''; + $selected{'ENGINES'}{$cgiparams{'ENGINES'}} = 'SELECTED'; - + &Header::showhttpheaders(); &Header::openpage($Lang::tr{'status ovpn'}, 1, ''); &Header::openbigbox('100%', 'LEFT', '', $errormessage); @@@ -2577,14 -2606,16 +2655,16 @@@ print < - + fragment
- - + + mssfix - + $Lang::tr{'openvpn default'}: off + + $Lang::tr{'ovpn mtu-disc'} $Lang::tr{'ovpn mtu-disc yes'} @@@ -2595,12 -2626,12 +2675,12 @@@
- +
- + - + @@@ -2641,8 -2669,33 +2718,31 @@@ -
$Lang::tr{'log-options'}$Lang::tr{'log-options'}
VERB Default: SHA1 (160 $Lang::tr{'bit'})
+ + + $Lang::tr{'ovpn engines'} + + + Default: $Lang::tr{'disabled'} + + + + + + + + + + + +
HMAC tls-auth
- - END if ( -e "/var/run/openvpn.pid"){ @@@ -2720,11 -2773,11 +2820,11 @@@ if ($cgiparams{'ACTION'} eq "edit") &Header::openbox('100%', 'LEFT', $Lang::tr{'ccd modify'}); - print < + print <
$Lang::tr{'ccd name'}: - $Lang::tr{'ccd subnet'}: + $Lang::tr{'ccd subnet'}:
@@@ -3180,8 -3233,8 +3280,9 @@@ EN my $complzoactive; my $mssfixactive; +my $authactive; my $n2nfragment; + my $authactive; my @n2nmtudisc = split(/ /, (grep { /^mtu-disc/ } @firen2nconf)[0]); my @n2nproto2 = split(/ /, (grep { /^proto/ } @firen2nconf)[0]); my @n2nproto = split(/-/, $n2nproto2[1]); @@@ -3296,10 -3350,12 +3398,11 @@@ foreach my $dkey (keys %confighash) $confighash{$key}[29] = $n2nport[1]; $confighash{$key}[30] = $complzoactive; $confighash{$key}[31] = $n2ntunmtu[1]; - $confighash{$key}[38] = $n2nmtudisc[1]; + $confighash{$key}[38] = $n2nmtudisc[1]; $confighash{$key}[39] = $n2nauth[1]; $confighash{$key}[40] = $n2ncipher[1]; + $confighash{$key}[41] = 'disabled'; - &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); N2N_ERROR: @@@ -3332,11 -3388,11 +3435,11 @@@ $Lang::tr{'protocol'}$confighash{$key}[28] $Lang::tr{'destination port'}:$confighash{$key}[29] $Lang::tr{'comp-lzo'}$confighash{$key}[30] - MSSFIX $confighash{$key}[23] - Fragment $confighash{$key}[24] + MSSFIX:$confighash{$key}[23] + Fragment:$confighash{$key}[24] $Lang::tr{'MTU'}$confighash{$key}[31] - $Lang::tr{'ovpn mtu-disc'}:$confighash{$key}[38] - Management Port:$confighash{$key}[22] + $Lang::tr{'ovpn mtu-disc'}$confighash{$key}[38] + Management Port $confighash{$key}[22] $Lang::tr{'ovpn hmac'}:$confighash{$key}[39] $Lang::tr{'cipher'}$confighash{$key}[40]    @@@ -4163,7 -4221,9 +4268,8 @@@ if ($cgiparams{'TYPE'} eq 'net') $confighash{$key}[38] = $cgiparams{'PMTU_DISCOVERY'}; $confighash{$key}[39] = $cgiparams{'DAUTH'}; $confighash{$key}[40] = $cgiparams{'DCIPHER'}; + $confighash{$key}[42] = $cgiparams{'ENGINES'}; - &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); if ($cgiparams{'CHECK1'} ){ @@@ -4418,7 -4502,9 +4545,6 @@@ } else { print ""; } - - - - print <    @@@ -4483,31 -4576,40 +4617,39 @@@ - $Lang::tr{'MTU'}  +
+ + Management Port ($Lang::tr{'openvpn default'}: $Lang::tr{'destination port'}):   + + + + $Lang::tr{'MTU'}  $Lang::tr{'openvpn default'}: udp/tcp 1500/1400 + - fragment:   + fragment   $Lang::tr{'openvpn default'}: 1300 + - mssfix:   + mssfix   $Lang::tr{'openvpn default'}: on - - $Lang::tr{'comp-lzo'}   - - $Lang::tr{'ovpn mtu-disc'}: - - $Lang::tr{'ovpn mtu-disc yes'} - $Lang::tr{'ovpn mtu-disc maybe'} - $Lang::tr{'ovpn mtu-disc no'} - $Lang::tr{'ovpn mtu-disc off'} - + $Lang::tr{'comp-lzo'}   + + $Lang::tr{'ovpn mtu-disc'} + + $Lang::tr{'ovpn mtu-disc yes'} + $Lang::tr{'ovpn mtu-disc maybe'} + $Lang::tr{'ovpn mtu-disc no'} + $Lang::tr{'ovpn mtu-disc off'} + + - END ; } @@@ -4821,22 -4923,19 +4963,25 @@@ EN #default setzen if ($cgiparams{'DCIPHER'} eq '') { - $cgiparams{'DCIPHER'} = 'AES-256-CBC'; + $cgiparams{'DCIPHER'} = 'AES-256-CBC'; } if ($cgiparams{'DDEST_PORT'} eq '') { - $cgiparams{'DDEST_PORT'} = '1194'; + $cgiparams{'DDEST_PORT'} = '1194'; } if ($cgiparams{'DMTU'} eq '') { - $cgiparams{'DMTU'} = '1400'; + $cgiparams{'DMTU'} = '1400'; + } + if ($cgiparams{'MSSFIX'} eq '') { + $cgiparams{'MSSFIX'} = 'off'; + } + if ($cgiparams{'DAUTH'} eq '') { + $cgiparams{'DAUTH'} = 'SHA1'; } + if ($cgiparams{'ENGINES'} eq '') { + $cgiparams{'ENGINES'} = 'disabled'; + } if ($cgiparams{'DOVPN_SUBNET'} eq '') { - $cgiparams{'DOVPN_SUBNET'} = '10.' . int(rand(256)) . '.' . int(rand(256)) . '.0/255.255.255.0'; + $cgiparams{'DOVPN_SUBNET'} = '10.' . int(rand(256)) . '.' . int(rand(256)) . '.0/255.255.255.0'; } $checked{'ENABLED'}{'off'} = ''; $checked{'ENABLED'}{'on'} = ''; diff --cc langs/de/cgi-bin/de.pl index ab12e9ead6,6a1f3f2863..6cf4dfcecb --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@@ -38,8 -40,7 +38,8 @@@ 'Local VPN IP' => 'Internes Netzwerk (GREEN)', 'MB read' => 'MB gelesen', 'MB written' => 'MB geschrieben', - 'MTU' => 'MTU Size', + 'MTU' => 'MTU Size:', +'Number of Countries for the pie chart' => 'Anzahl der angezeigten Länder im Diagramm', 'Number of IPs for the pie chart' => 'Anzahl der angezeigten IPs im Diagramm', 'Number of Ports for the pie chart' => 'Anzahl der angezeigten Ports im Diagramm', 'OVPN' => 'OpenVPN', @@@ -1653,12 -1641,12 +1654,12 @@@ 'outgoing traffic in bytes per second' => 'Abgehender Verkehr', 'override mtu' => 'Überschreibe Standard MTU', 'ovpn' => 'OpenVPN', -'ovpn crypt options' => 'Kryptografieoptionen', 'ovpn con stat' => 'OpenVPN Verbindungs-Statistik', 'ovpn config' => 'OVPN-Konfiguration', +'ovpn crypt options' => 'Kryptografieoptionen', - 'ovpn device' => 'OpenVPN-Gerät:', + 'ovpn device' => 'OpenVPN-Gerät', 'ovpn dh' => 'Diffie-Hellman Key Länge', - 'ovpn dh name' => 'Diffie-Hellman Key Name', + 'ovpn dh upload' => 'Upload Diffie-Hellman Key', 'ovpn dl' => 'OVPN-Konfiguration downloaden', 'ovpn engines' => 'Krypto Engine', 'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt', @@@ -1680,10 -1668,9 +1681,10 @@@ 'ovpn on orange' => 'OpenVPN auf ORANGE:', 'ovpn on red' => 'OpenVPN auf ROT:', 'ovpn port in root range' => 'Ein Port von 1024 oder höher ist erforderlich.', +'ovpn reneg sec' => 'Session Key Lifetime', 'ovpn routes push' => 'Routen (eine pro Zeile) z.b. 192.168.10.0/255.255.255.0 192.168.20.0/24', 'ovpn routes push options' => 'Route push Optionen', - 'ovpn server status' => 'OpenVPN-Server-Status:', + 'ovpn server status' => 'OpenVPN-Server-Status', 'ovpn subnet' => 'OpenVPN-Subnetz:', 'ovpn subnet is invalid' => 'Das OpenVPN-Subnetz ist ungültig.', 'ovpn subnet overlap' => 'OpenVPNSubnetz überschneidet sich mit ', diff --cc langs/en/cgi-bin/en.pl index a865fea452,99d905e41f..e1186323b6 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@@ -684,8 -684,6 +684,10 @@@ 'device' => 'Device', 'devices on blue' => 'Devices on BLUE', 'dh' => 'Diffie-Hellman Key', - 'dh key warn' => 'Keys with 1024 and 2048 bit takes up to several minutes, 3072 and 4096 bit might needs several hours. Please be patient.', ++'dh key move failed' => 'Diffie-Hellman key move failed.', ++'dh key warn' => 'Diffie-Hellman keys with 1024 and 2048 bit takes up to several minutes, 3072 and 4096 bit might needs several hours. Please be patient.', ++'dh key warn1' => 'For weak systems or systems with little entropy it is recommended to integrate long Diffie-Hellman Keys by usage of the upload function.', +'dh name is invalid' => 'Name is invalid, please use "dh1024.pem".', 'dhcp advopt add' => 'Add a DHCP option', 'dhcp advopt added' => 'DHCP option added', 'dhcp advopt blank value' => 'DHCP Option value cannot be empty.', @@@ -1686,11 -1674,11 +1688,11 @@@ 'ovpn con stat' => 'OpenVPN Connection Statistics', 'ovpn config' => 'OVPN-Config', 'ovpn crypt options' => 'Cryptographic options', -'ovpn engines' => 'Crypto engine', 'ovpn device' => 'OpenVPN device:', 'ovpn dh' => 'Diffie-Hellman key lenght', - 'ovpn dh name' => 'Diffie-Hellman key name', + 'ovpn dh upload' => 'Upload Diffie-Hellman Key', 'ovpn dl' => 'OVPN-Config Download', +'ovpn engines' => 'Crypto engine', 'ovpn errmsg green already pushed' => 'Route for green network is always set', 'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn generating the root and host certificates' => 'Generating the root and host certifictae can take a long time.', @@@ -1718,7 -1705,7 +1720,6 @@@ 'ovpn subnet is invalid' => 'OpenVPN subnet is invalid.', 'ovpn subnet overlap' => 'OpenVPN Subnet overlaps with : ', 'ovpn_fastio' => 'Fast-IO', - 'ovpn_fragment' => 'Fragmentsize', -'teovpn_fragment' => 'Fragmentsize', 'ovpn_mssfix' => 'MSSFIX Size', 'ovpn_mtudisc' => 'MTU-Discovery', 'ovpn_processprio' => 'Process priority', @@@ -2082,6 -2067,6 +2083,7 @@@ 'telephone not set' => 'Telephone not set.', 'template' => 'Preset', 'template warning' => 'You have two options to set up Qos. The First, you press the save button and generate the classes and rules on your own. The second, you press the preset button and classes and rules will be set up by a template.', ++'teovpn_fragment' => 'Fragmentsize', 'test' => 'test', 'test email could not be sent' => 'Could not sent Testemail', 'test email was sent' => 'Testemail was send successfully',