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 cf5bcd44b26e189448c0783302676d84a506822a..fbd7ef78ed08533d55ecd5051e788bfd9af19f55 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: quality of service = Quality of Service

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 1ce6acb943cd6cb333849ca2dfa4df9f95db5ea3..cf6f977e6631e781b87eff396b22409e8b9181c1 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1448,6 +1448,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 eb7c6c2d1c8bd5b0fadd106d55b930f1a9865f1e..f253a72984078e33a58e33699a401aaec79bd2cd 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1027,6 +1027,8 @@ WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: mdstat = Mdstat
 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: quality of service = Quality of Service
 WARNING: untranslated string: route config changed = unknown string

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 7a5957dfbeeca5465900822e4f193b233101b4bb..a28a7dd9c726b7dde0048c3fbae45525462e4541 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1031,6 +1031,8 @@ WARNING: untranslated string: malformed public key = Malformed Public Key
 WARNING: untranslated string: mdstat = Mdstat
 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 0a8ced54cb837beb84f8be2e91e499fa9de47112..ead791a2674c5f90dd8b558c917bc26b664d9b48 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1268,6 +1268,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 d884325756e31ff2fe728de6f9f0b800408547f9..6908af3cdc513a02d27b2d75cdde8468da38bf90 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1292,6 +1292,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 51bfd0b6638cb198850367eb365fbcad14c2066d..b95a8a127621e5fa80b7135466428632a8898bce 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1456,6 +1456,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 4979ae1a2bb910adc0efa6f4a39b5fbb085e6ead..561dfafb7ad80f053e42467421db9a5f870db7bd 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1451,6 +1451,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 5a646231e74bd2cf450452e3ba7c0dc57a3d5ec4..b8373e3d5855643e8de0b0320767fe0c5e5c29f9 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1181,6 +1181,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_issues.tw b/doc/language_issues.tw
index 92ef9269a807e8c1c64e36df2ebeb923da61eae9..320572ab7cba6ac8040983a4a0198158a627d8f6 100644 (file)
--- a/doc/language_issues.tw
+++ b/doc/language_issues.tw
@@ -30,6 +30,7 @@ WARNING: translation string unused: Existing Files
 WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP
+WARNING: translation string unused: OVPN
 WARNING: translation string unused: Pages
 WARNING: translation string unused: Ping
 WARNING: translation string unused: Queuelenght
@@ -206,6 +207,8 @@ WARNING: translation string unused: cpu frequency per
 WARNING: translation string unused: cpu usage per
 WARNING: translation string unused: create mask
 WARNING: translation string unused: create new backup
+WARNING: translation string unused: crypto error
+WARNING: translation string unused: crypto warning
 WARNING: translation string unused: cryptographic settings
 WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
@@ -632,6 +635,7 @@ WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
+WARNING: translation string unused: ovpn error md5
 WARNING: translation string unused: ovpn generating the root and host certificates
 WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn mtu-disc
@@ -642,6 +646,7 @@ WARNING: translation string unused: ovpn mtu-disc off
 WARNING: translation string unused: ovpn mtu-disc with mssfix or fragment
 WARNING: translation string unused: ovpn mtu-disc yes
 WARNING: translation string unused: ovpn reneg sec
+WARNING: translation string unused: ovpn warning rfc3280
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_mssfix
 WARNING: translation string unused: ovpn_mtudisc
@@ -723,6 +728,7 @@ WARNING: translation string unused: reset shares
 WARNING: translation string unused: resetglobals
 WARNING: translation string unused: resetpolicy
 WARNING: translation string unused: resetshares
+WARNING: translation string unused: restart ovpn server
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: restore settings
 WARNING: translation string unused: root
@@ -1029,6 +1035,8 @@ WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: max bandwidth = Maximum bandwidth
 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 confirm upgrades = Do you want to install all upgrades?
 WARNING: untranslated string: pakfire deps = Package dependencies:
 WARNING: untranslated string: pakfire errors = Errors occurred:

diff --git a/doc/language_issues.zh b/doc/language_issues.zh
index 92ef9269a807e8c1c64e36df2ebeb923da61eae9..320572ab7cba6ac8040983a4a0198158a627d8f6 100644 (file)
--- a/doc/language_issues.zh
+++ b/doc/language_issues.zh
@@ -30,6 +30,7 @@ WARNING: translation string unused: Existing Files
 WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP
+WARNING: translation string unused: OVPN
 WARNING: translation string unused: Pages
 WARNING: translation string unused: Ping
 WARNING: translation string unused: Queuelenght
@@ -206,6 +207,8 @@ WARNING: translation string unused: cpu frequency per
 WARNING: translation string unused: cpu usage per
 WARNING: translation string unused: create mask
 WARNING: translation string unused: create new backup
+WARNING: translation string unused: crypto error
+WARNING: translation string unused: crypto warning
 WARNING: translation string unused: cryptographic settings
 WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
@@ -632,6 +635,7 @@ WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
+WARNING: translation string unused: ovpn error md5
 WARNING: translation string unused: ovpn generating the root and host certificates
 WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn mtu-disc
@@ -642,6 +646,7 @@ WARNING: translation string unused: ovpn mtu-disc off
 WARNING: translation string unused: ovpn mtu-disc with mssfix or fragment
 WARNING: translation string unused: ovpn mtu-disc yes
 WARNING: translation string unused: ovpn reneg sec
+WARNING: translation string unused: ovpn warning rfc3280
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_mssfix
 WARNING: translation string unused: ovpn_mtudisc
@@ -723,6 +728,7 @@ WARNING: translation string unused: reset shares
 WARNING: translation string unused: resetglobals
 WARNING: translation string unused: resetpolicy
 WARNING: translation string unused: resetshares
+WARNING: translation string unused: restart ovpn server
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: restore settings
 WARNING: translation string unused: root
@@ -1029,6 +1035,8 @@ WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: max bandwidth = Maximum bandwidth
 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 confirm upgrades = Do you want to install all upgrades?
 WARNING: untranslated string: pakfire deps = Package dependencies:
 WARNING: untranslated string: pakfire errors = Errors occurred:

diff --git a/doc/language_missings b/doc/language_missings
index 31f0ffeda050457dd27d47ba3400ed283527fd1b..30a6e8f485ad8b69e6c7fb07ce2c62383ff27c64 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -83,6 +83,8 @@
 < okay
 < oops something went wrong
 < optional
+< ovpn fallback cipher
+< ovpn fallback cipher help
 < ovpn roadwarrior server
 < quality of service
 < quick control
@@ -132,6 +134,8 @@
 < indirect target selection
 < mdstat
 < online
+< ovpn fallback cipher
+< ovpn fallback cipher help
 < quality of service
 ############################################################################
 # Checking cgi-bin translations for language: fr                           #
@@ -175,6 +179,8 @@
 < mdstat
 < online
 < oops something went wrong
+< ovpn fallback cipher
+< ovpn fallback cipher help
 < ovpn roadwarrior server
 < password has quotation mark
 < processors
@@ -633,6 +639,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
@@ -1272,6 +1280,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
@@ -2230,6 +2240,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
@@ -3323,6 +3335,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
@@ -3918,6 +3932,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
@@ -4102,6 +4118,8 @@
 < indirect target selection
 < max bandwidth
 < online
+< ovpn fallback cipher
+< ovpn fallback cipher help
 < pakfire confirm upgrades
 < pakfire deps
 < pakfire errors
@@ -4125,6 +4143,8 @@
 < indirect target selection
 < max bandwidth
 < online
+< ovpn fallback cipher
+< ovpn fallback cipher help
 < pakfire confirm upgrades
 < pakfire deps
 < pakfire errors

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 a05b6056dbbc3fbe1681051c6b0195278578c2db..943b0ecd37a970f8716a6ddb17973c2fa09e76f5 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2044,6 +2044,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',