From cbcd09284ee63d235b036261ad0d81ece452f0d1 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 19 Mar 2024 18:26:27 +0100 Subject: [PATCH] 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 --- doc/language_issues.de | 2 ++ doc/language_issues.en | 2 ++ doc/language_issues.es | 2 ++ doc/language_issues.fr | 2 ++ doc/language_issues.it | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 2 ++ doc/language_issues.ru | 2 ++ doc/language_issues.tr | 2 ++ doc/language_missings | 16 ++++++++++++ html/cgi-bin/ovpnmain.cgi | 52 ++++++++++++++++++++++----------------- langs/en/cgi-bin/en.pl | 2 ++ 12 files changed, 65 insertions(+), 23 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index fcd65d09b..e8d5a2e08 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -983,6 +983,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 123d24a8e..c9e9cd89a 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1441,6 +1441,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 d294cf395..76f665847 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1044,6 +1044,8 @@ WARNING: untranslated string: no data = unknown string WARNING: untranslated string: oops something went wrong = Oops, something went wrong... WARNING: untranslated string: openvpn cert expires soon = Expires Soon WARNING: untranslated string: openvpn cert has expired = Expired +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: processors = Processors diff --git a/doc/language_issues.fr b/doc/language_issues.fr index eefaf659c..4691add7b 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -990,6 +990,8 @@ WARNING: untranslated string: hostile networks total = Total Hostile Networks WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: load average = Load Average 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: processors = Processors diff --git a/doc/language_issues.it b/doc/language_issues.it index d21fd46f5..ef92c6853 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1230,6 +1230,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 108287b51..9a699f696 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1255,6 +1255,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 f4ac72200..14982746c 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1419,6 +1419,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 7c2653ddd..39616a331 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1414,6 +1414,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 3dfe4fce5..6b42b8f80 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1144,6 +1144,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 f3d945c5b..2cf480620 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -80,6 +80,8 @@ < okay < oops something went wrong < optional +< ovpn fallback cipher +< ovpn fallback cipher help < ovpn roadwarrior server < quick control < random number generator daemon @@ -144,6 +146,8 @@ < oops something went wrong < openvpn cert expires soon < openvpn cert has expired +< ovpn fallback cipher +< ovpn fallback cipher help < ovpn roadwarrior server < processors < regenerate host certificate @@ -179,6 +183,8 @@ < ids unsupported provider < load average < oops something went wrong +< ovpn fallback cipher +< ovpn fallback cipher help < ovpn roadwarrior server < processors < reg_file_data_sampling @@ -558,6 +564,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 @@ -1118,6 +1126,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 @@ -1998,6 +2008,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 @@ -3012,6 +3024,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 @@ -3528,6 +3542,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 f2b74ea86..0d238b6b7 100755 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2585,9 +2585,35 @@ ADV_ERROR: + + + $Lang::tr{'ovpn ha'} + + + + + + + + + + $Lang::tr{'ovpn tls auth'} + + + + + + + - $Lang::tr{'cipher'} + $Lang::tr{'ovpn fallback cipher'} @@ -2610,30 +2636,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 79b493cd0..dfec9a880 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2029,6 +2029,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', -- 2.39.5