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 <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index fcd65d09b238601e127debe23a1df839a04c80fa..e8d5a2e0879d580d97e2c3d5406763514ffe1f18 100644 (file)
--- 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 123d24a8e7ce9fc9daa3f2f7b74d6eb8941d370a..c9e9cd89a2697c5c9e131bf4c12e552a12722027 100644 (file)
--- 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 d294cf395d5d27bf7364586751458d40e2e0261a..76f66584771e2535955f9ff77f9de213efb4b32e 100644 (file)
--- 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 eefaf659cc76af6c5d7ed75d661bfffb3d647ce7..4691add7b724bd81aaa60c228f31659a9bff712f 100644 (file)
--- 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 d21fd46f5eefb7ca373ade644ed306b59cbc9a59..ef92c6853e1fe7f370655f952d21560fa883a9e5 100644 (file)
--- 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 108287b5190459a3fe0208d8dae7be8da5ebab69..9a699f6960bb638af3dde5fd5c16a6e8823ffad2 100644 (file)
--- 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 f4ac72200b09ba711541069c5931ef8daf8f73a2..14982746cb49f0b8e46d945975fb319a6ecd1c2d 100644 (file)
--- 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 7c2653ddd46eb68ecb77f7b21722351178d81448..39616a331faff8ca079f2596ee78f3c7383efa77 100644 (file)
--- 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 3dfe4fce54eecc9df0c23c8773e02d1a7a67cd32..6b42b8f80c527a715b83bfde4308aabefd41b9a8 100644 (file)
--- 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 f3d945c5b3dabf2b6e46a267f3e4257adab58ec9..2cf48062066741de7a1c4053d67e7931018b16c1 100644 (file)
--- 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 f2b74ea86b2ce0b6dda3dffafb62aa12882e94d3..0d238b6b75e636bccba7790ccd01488c1fdc1946 100755 (executable)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2585,9 +2585,35 @@ ADV_ERROR:
                                        </td>
                                </tr>
 
+                               <tr>
+                                       <td>
+                                               $Lang::tr{'ovpn ha'}
+                                       </td>
+
+                                       <td>
+                                               <select name='DAUTH'>
+                                                       <option value='whirlpool'               $selected{'DAUTH'}{'whirlpool'}>Whirlpool (512 $Lang::tr{'bit'})</option>
+                                                       <option value='SHA512'                  $selected{'DAUTH'}{'SHA512'}>SHA2 (512 $Lang::tr{'bit'})</option>
+                                                       <option value='SHA384'                  $selected{'DAUTH'}{'SHA384'}>SHA2 (384 $Lang::tr{'bit'})</option>
+                                                       <option value='SHA256'                  $selected{'DAUTH'}{'SHA256'}>SHA2 (256 $Lang::tr{'bit'})</option>
+                                                       <option value='SHA1'                    $selected{'DAUTH'}{'SHA1'}>SHA1 (160 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
+                                               </select>
+                                       </td>
+                               </tr>
+
+                               <tr>
+                                       <td>
+                                               $Lang::tr{'ovpn tls auth'}
+                                       </td>
+
+                                       <td>
+                                               <input type='checkbox' name='TLSAUTH' $checked{'TLSAUTH'}{'on'} />
+                                       </td>
+                               </tr>
+
                                <tr>
                                        <td width="25%">
-                                               $Lang::tr{'cipher'}
+                                               $Lang::tr{'ovpn fallback cipher'}
                                        </td>
 
                                        <td>
@@ -2610,30 +2636,10 @@ ADV_ERROR:
                                                </select>
                                        </td>
                                </tr>
-
-                               <tr>
-                                       <td>
-                                               $Lang::tr{'ovpn ha'}
-                                       </td>
-
-                                       <td>
-                                               <select name='DAUTH'>
-                                                       <option value='whirlpool'               $selected{'DAUTH'}{'whirlpool'}>Whirlpool (512 $Lang::tr{'bit'})</option>
-                                                       <option value='SHA512'                  $selected{'DAUTH'}{'SHA512'}>SHA2 (512 $Lang::tr{'bit'})</option>
-                                                       <option value='SHA384'                  $selected{'DAUTH'}{'SHA384'}>SHA2 (384 $Lang::tr{'bit'})</option>
-                                                       <option value='SHA256'                  $selected{'DAUTH'}{'SHA256'}>SHA2 (256 $Lang::tr{'bit'})</option>
-                                                       <option value='SHA1'                    $selected{'DAUTH'}{'SHA1'}>SHA1 (160 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
-                                               </select>
-                                       </td>
-                               </tr>
-
                                <tr>
+                                       <td></td>
                                        <td>
-                                               $Lang::tr{'ovpn tls auth'}
-                                       </td>
-
-                                       <td>
-                                               <input type='checkbox' name='TLSAUTH' $checked{'TLSAUTH'}{'on'} />
+                                               $Lang::tr{'ovpn fallback cipher help'}
                                        </td>
                                </tr>
 

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 79b493cd0ca52085fa0905663d782a3fda0b6ea5..dfec9a880db0579101177c9c00be5186bef9bb97 100644 (file)
--- 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. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>',
+'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',