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 2faa4d6166e7ffdc6114e095222b4674acabea6e..df162e9ddfe02cef706fb171654ce72e586ab1a4 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -1007,6 +1007,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 22ff1a43d0c0fe406e4f34876be1924871ca3c56..b0d1b876ea18005579375a5a07ada96e6b5dd291 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1426,6 +1426,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 cb86d2b1936cc539bc75b2cf5a02cd75652009be..ebb3f186a851319ea32dfc78abbc6f6bfb96e435 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1070,6 +1070,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 410b3b39470039e105a7f182d8cc3eb59b6efe84..51b27980e6d50b22bfd740f75e5c718b2fddc9be 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1018,6 +1018,8 @@ WARNING: untranslated string: ips throughput = Throughput
 WARNING: untranslated string: last updated = Last Updated
 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 c902fe882acfcd066c06774478691ed024b112ec..43930f2a7d6fc7926c1d87a97c81f78fb8273751 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1254,6 +1254,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 48261666ec9f0128d3f715b56cce4b27a4fd11e6..28ff28336d6901bd9901e3044b3beeccdcf0c6db 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1279,6 +1279,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 d30afb737d7e6efa77cc9675537fa9d6c4f5ed9a..b24d5aab0941a9c584749d2b94ccd19e68832e10 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1443,6 +1443,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 37acd83c7c0ad5b7914d6e350ae4cb5a703762d8..1b6855831c8b9790b0db99d91d6c369e9f1a326b 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1438,6 +1438,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 a2c418f9fd4ef4bbbde624b75ecd3d8f54d7f2b8..74c44ed3f0a88d77da6bc6934e095bcaa8e83baa 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1168,6 +1168,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 2a2333d948abe4013861bbd99d49e4f493d3f352..236c49bd5f02881b2705922e5a900fd33ce10d76 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
@@ -149,6 +151,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
@@ -192,6 +196,8 @@
 < last updated
 < load average
 < oops something went wrong
+< ovpn fallback cipher
+< ovpn fallback cipher help
 < ovpn roadwarrior server
 < processors
 < reg_file_data_sampling
@@ -579,6 +585,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
@@ -1147,6 +1155,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
@@ -2035,6 +2045,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
@@ -3057,6 +3069,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
@@ -3581,6 +3595,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 6c28f9de6ca6d86e132afe47c0b5cf49c44e001e..4e09b1ea2ff00832bbd5f0a076ace967783ede11 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 5c8da52be2b64b708dc74e70241d3c7212521ea5..21792475e4d297279c0a1cbafffb2d1d7cd36f0f 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2026,6 +2026,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',