From: Michael Tremer Date: Tue, 19 Mar 2024 17:26:27 +0000 (+0100) Subject: ovpnmain.cgi: Rename cipher selection to fallback cipher X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=263c88001cf9e4bd05a1e481fc8fa896761747c1;p=people%2Fms%2Fipfire-2.x.git ovpnmain.cgi: Rename cipher selection to fallback cipher This is to keep ancient clients and clients that have NCP disabled happy. Signed-off-by: Michael Tremer --- diff --git a/doc/language_issues.de b/doc/language_issues.de index 348f1c36e..8aa723c53 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -1006,6 +1006,8 @@ WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Dae WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: oops something went wrong = Oops, something went wrong... WARNING: untranslated string: optional = Optional +WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher +WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation. WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server WARNING: untranslated string: pakfire invalid tree = Invalid repository selected WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS) diff --git a/doc/language_issues.en b/doc/language_issues.en index 9053d4494..e19a88f12 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1445,6 +1445,8 @@ WARNING: untranslated string: ovpn connection name = Connection Name WARNING: untranslated string: ovpn crypt options = Cryptographic options WARNING: untranslated string: ovpn errmsg green already pushed = Route for green network is always set WARNING: untranslated string: ovpn errmsg invalid ip or mask = Invalid network-address or subnetmask +WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher +WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation. WARNING: untranslated string: ovpn ha = Hash algorithm WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required. WARNING: untranslated string: ovpn no connections = No active OpenVPN connections diff --git a/doc/language_issues.es b/doc/language_issues.es index d3021e564..6fd50a633 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1026,6 +1026,8 @@ WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: no data = unknown string WARNING: untranslated string: online = Online +WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher +WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation. WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 219559fb1..748ad2787 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1030,6 +1030,8 @@ WARNING: untranslated string: malformed private key = Malformed Private Key WARNING: untranslated string: malformed public key = Malformed Public Key WARNING: untranslated string: online = Online WARNING: untranslated string: oops something went wrong = Oops, something went wrong... +WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher +WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation. WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: password has quotation mark = Password contains an illegal double quotation mark. diff --git a/doc/language_issues.it b/doc/language_issues.it index 79307ddab..fc4c16b80 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1267,6 +1267,8 @@ WARNING: untranslated string: outgoing compression in bytes per second = Outgoin WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead WARNING: untranslated string: ovpn add conf = Additional configuration WARNING: untranslated string: ovpn connection name = Connection Name +WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher +WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation. WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: diff --git a/doc/language_issues.nl b/doc/language_issues.nl index c1d0c6f05..db267a1bf 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1291,6 +1291,8 @@ WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing O WARNING: untranslated string: ovpn add conf = Additional configuration WARNING: untranslated string: ovpn connection name = Connection Name WARNING: untranslated string: ovpn crypt options = Cryptographic options +WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher +WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation. WARNING: untranslated string: ovpn ha = Hash algorithm WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 0f8e964b7..f920da669 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1455,6 +1455,8 @@ WARNING: untranslated string: ovpn connection name = Connection Name WARNING: untranslated string: ovpn crypt options = Cryptographic options WARNING: untranslated string: ovpn errmsg green already pushed = Route for green network is always set WARNING: untranslated string: ovpn errmsg invalid ip or mask = Invalid network-address or subnetmask +WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher +WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation. WARNING: untranslated string: ovpn ha = Hash algorithm WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required. WARNING: untranslated string: ovpn no connections = No active OpenVPN connections diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 9f17138f3..7651a77b6 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1450,6 +1450,8 @@ WARNING: untranslated string: outgoing traffic in bytes per second = Outgoing Tr WARNING: untranslated string: ovpn add conf = Additional configuration WARNING: untranslated string: ovpn connection name = Connection Name WARNING: untranslated string: ovpn crypt options = Cryptographic options +WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher +WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation. WARNING: untranslated string: ovpn ha = Hash algorithm WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required. WARNING: untranslated string: ovpn no connections = No active OpenVPN connections diff --git a/doc/language_issues.tr b/doc/language_issues.tr index e6b731de7..eb565bfba 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1180,6 +1180,8 @@ WARNING: untranslated string: openvpn cert has expired = Expired WARNING: untranslated string: optional = Optional WARNING: untranslated string: otp qrcode = OTP QRCode WARNING: untranslated string: ovpn connection name = Connection Name +WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher +WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation. WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: diff --git a/doc/language_missings b/doc/language_missings index cd005f45a..8aab09f69 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -82,6 +82,8 @@ < okay < oops something went wrong < optional +< ovpn fallback cipher +< ovpn fallback cipher help < ovpn roadwarrior server < quick control < random number generator daemon @@ -128,6 +130,8 @@ < dns servers < ids provider eol < online +< ovpn fallback cipher +< ovpn fallback cipher help ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ @@ -168,6 +172,8 @@ < malformed public key < online < oops something went wrong +< ovpn fallback cipher +< ovpn fallback cipher help < ovpn roadwarrior server < password has quotation mark < processors @@ -623,6 +629,8 @@ < ovpn add conf < ovpn connection name < ovpn error md5 +< ovpn fallback cipher +< ovpn fallback cipher help < ovpn roadwarrior server < ovpn rw connection log < ovpn tls auth @@ -1259,6 +1267,8 @@ < ovpn crypt options < ovpn engines < ovpn error md5 +< ovpn fallback cipher +< ovpn fallback cipher help < ovpn generating the root and host certificates < ovpn ha < ovpn reneg sec @@ -2214,6 +2224,8 @@ < ovpn errmsg green already pushed < ovpn errmsg invalid ip or mask < ovpn error md5 +< ovpn fallback cipher +< ovpn fallback cipher help < ovpn generating the root and host certificates < ovpn ha < ovpn mgmt in root range @@ -3304,6 +3316,8 @@ < ovpn crypt options < ovpn engines < ovpn error md5 +< ovpn fallback cipher +< ovpn fallback cipher help < ovpn generating the root and host certificates < ovpn ha < ovpn mgmt in root range @@ -3896,6 +3910,8 @@ < otp qrcode < ovpn connection name < ovpn error md5 +< ovpn fallback cipher +< ovpn fallback cipher help < ovpn roadwarrior server < ovpn rw connection log < ovpn tls auth diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index f3eb12ecd..a80aaad79 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2586,9 +2586,35 @@ ADV_ERROR: + + + $Lang::tr{'ovpn ha'} + + + + + + + + + + $Lang::tr{'ovpn tls auth'} + + + + + + + - $Lang::tr{'cipher'} + $Lang::tr{'ovpn fallback cipher'} @@ -2611,30 +2637,10 @@ ADV_ERROR: - - - - $Lang::tr{'ovpn ha'} - - - - - - - + - $Lang::tr{'ovpn tls auth'} - - - - + $Lang::tr{'ovpn fallback cipher help'} diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index ef7d75ce7..03b486938 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2042,6 +2042,8 @@ 'ovpn errmsg green already pushed' => 'Route for green network is always set', 'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn error md5' => 'You host certificate uses MD5 for the signature which is not accepted anymore.
Please update to the latest IPFire version and generate a new root and host certificate.

All OpenVPN clients needs then to be renewed!
', +'ovpn fallback cipher' => 'Fallback Cipher', +'ovpn fallback cipher help' => 'This cipher is being used by clients that do not support cipher negotiation.', 'ovpn generating the root and host certificates' => 'Generating the root and host certificate can take a long time.', 'ovpn ha' => 'Hash algorithm', 'ovpn log' => 'OVPN-Log',