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 348f1c36e8af87db1889cd602e93485d7e5e14d8..8aa723c53be9fef24224fa65534f3e1872df5d41 100644 (file)
--- 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 9053d44944f0ab1c4d5ef48e5125109b96e6b01f..e19a88f1249ef182e6e06c9366ad46d993c72253 100644 (file)
--- 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 d3021e564f1c443cd9995e0ae4252bb7aa7ce452..6fd50a633372285f70022d1d73d4acf6f93141fe 100644 (file)
--- 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 219559fb17ae8139deacc432314445cbfafa7bbc..748ad2787cf490e1280982500eb645ceb971bbd2 100644 (file)
--- 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 79307ddab9234ff086977b1cc26d550c59d1a986..fc4c16b8032de6190e5b98ac6f4758715522b093 100644 (file)
--- 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 c1d0c6f0576210a0781ab11c3ba78a56502f9a5f..db267a1bff82204ceef63b44275283750be93aea 100644 (file)
--- 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 0f8e964b7f9ad1c9df93838e961bdfaf6bf08932..f920da669c6dc223dc56d3ee87f22d32899737a1 100644 (file)
--- 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 9f17138f3134088f9be9ed4d2c79467bcea1ba1e..7651a77b695fd088d098c4b60d29bc27d005c891 100644 (file)
--- 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 e6b731de7ce103a732aabc14041ab35143a1af29..eb565bfba70314429566ba8a7fa94f5293c6cb9a 100644 (file)
--- 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 cd005f45ac2c4c9121b1a01d2307b4f0d7beb945..8aab09f6958a1c48d629dc400196a7c4cbbef1de 100644 (file)
--- 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 f3eb12ecd28ea4085245ac50d6f821ca500fb513..a80aaad79929b4f206b38bbe5876dcc3a12d25a1 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2586,9 +2586,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>
@@ -2611,30 +2637,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 ef7d75ce75cb43d31c57280d2c2179a2a333136e..03b48693847fff1b7b115729a288b0c038d85fd9 100644 (file)
--- 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. <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',