ovpnmain.cgi: Show a warning for deprecated, legacy ciphers

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.en b/doc/language_issues.en
index e2f59dd7fde416ce0bca42f842b54d315389bf6e..e40571450c51cccf7c93757c5b20180edcd93e59 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1459,6 +1459,8 @@ 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 fqdn = FQDN
 WARNING: untranslated string: ovpn ha = Hash algorithm
+WARNING: untranslated string: ovpn legacy auth used = You are using a legacy hash which will not be supported in OpenVPN clients of version 2.6 or later
+WARNING: untranslated string: ovpn legacy cipher used = You are using a legacy cipher which will not be supported in OpenVPN clients of version 2.6 or later
 WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required.
 WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
@@ -2144,6 +2146,7 @@ WARNING: untranslated string: vpn altname syntax = SubjectAltName is a comma sep
 WARNING: untranslated string: vpn auth-dn = Peer is identified by either IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field
 WARNING: untranslated string: vpn broken = Broken
 WARNING: untranslated string: vpn connecting = CONNECTING
+WARNING: untranslated string: vpn deprecated = Deprecated
 WARNING: untranslated string: vpn force mobike = Force using MOBIKE (only IKEv2)
 WARNING: untranslated string: vpn inactivity timeout = Inactivity Timeout
 WARNING: untranslated string: vpn keyexchange = Keyexchange

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 91a2c6b0ce4f2dfa5763cf2aa06996ca5c54a93f..ffb077eb042d065e437201984e1b2957a153b3e3 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1087,6 +1087,8 @@ WARNING: untranslated string: ovpn errmsg invalid route = Invalid route
 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 fqdn = FQDN
+WARNING: untranslated string: ovpn legacy auth used = You are using a legacy hash which will not be supported in OpenVPN clients of version 2.6 or later
+WARNING: untranslated string: ovpn legacy cipher used = You are using a legacy cipher which will not be supported in OpenVPN clients of version 2.6 or later
 WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn protocol settings = Protocol Settings
@@ -1105,6 +1107,7 @@ WARNING: untranslated string: rss = RSS
 WARNING: untranslated string: rss long = Resident Set Size
 WARNING: untranslated string: smt not implemented = Not Implemented
 WARNING: untranslated string: transient sheduler attacks = Transient sheduler attacks
+WARNING: untranslated string: vpn deprecated = Deprecated
 WARNING: untranslated string: wio = unknown string
 WARNING: untranslated string: wio checked = unknown string
 WARNING: untranslated string: wio cron = unknown string

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 0f5b04275ae1a465ab5a1afae8aec634c305d76e..2dbaeb3bcfbb718276821fd4ba9a6bbc089124ad 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1089,6 +1089,8 @@ WARNING: untranslated string: ovpn errmsg invalid route = Invalid route
 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 fqdn = FQDN
+WARNING: untranslated string: ovpn legacy auth used = You are using a legacy hash which will not be supported in OpenVPN clients of version 2.6 or later
+WARNING: untranslated string: ovpn legacy cipher used = You are using a legacy cipher which will not be supported in OpenVPN clients of version 2.6 or later
 WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn protocol settings = Protocol Settings
@@ -1118,6 +1120,7 @@ WARNING: untranslated string: system time = System Time (as of last page load)
 WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z
 WARNING: untranslated string: total = Total
 WARNING: untranslated string: transient sheduler attacks = Transient sheduler attacks
+WARNING: untranslated string: vpn deprecated = Deprecated
 WARNING: untranslated string: warning = Warning
 WARNING: untranslated string: wg client pool = Client Pool
 WARNING: untranslated string: wg create host-to-net peer = Create A New Host-To-Net Peer

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 410237c814180011cbd9f44787b0e11040253c25..4b168598686b33a519337e58ef5dba4261466cc2 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1322,6 +1322,8 @@ WARNING: untranslated string: ovpn errmsg invalid route = Invalid route
 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 fqdn = FQDN
+WARNING: untranslated string: ovpn legacy auth used = You are using a legacy hash which will not be supported in OpenVPN clients of version 2.6 or later
+WARNING: untranslated string: ovpn legacy cipher used = You are using a legacy cipher which will not be supported in OpenVPN clients of version 2.6 or later
 WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn protocol settings = Protocol Settings
@@ -1437,6 +1439,7 @@ WARNING: untranslated string: user management = User Management
 WARNING: untranslated string: version = Version
 WARNING: untranslated string: vpn broken = Broken
 WARNING: untranslated string: vpn connecting = CONNECTING
+WARNING: untranslated string: vpn deprecated = Deprecated
 WARNING: untranslated string: vpn force mobike = Force using MOBIKE (only IKEv2)
 WARNING: untranslated string: vpn inactivity timeout = Inactivity Timeout
 WARNING: untranslated string: vpn on-demand = ON-DEMAND

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index a74cb9c91255725cae14f08c1323bfdbe61e505e..0857c00ce9f7127eb6b519731135ab272d790ee0 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1346,6 +1346,8 @@ 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 fqdn = FQDN
 WARNING: untranslated string: ovpn ha = Hash algorithm
+WARNING: untranslated string: ovpn legacy auth used = You are using a legacy hash which will not be supported in OpenVPN clients of version 2.6 or later
+WARNING: untranslated string: ovpn legacy cipher used = You are using a legacy cipher which will not be supported in OpenVPN clients of version 2.6 or later
 WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn protocol settings = Protocol Settings
@@ -1457,6 +1459,7 @@ WARNING: untranslated string: user management = User Management
 WARNING: untranslated string: vendor = Vendor
 WARNING: untranslated string: vpn broken = Broken
 WARNING: untranslated string: vpn connecting = CONNECTING
+WARNING: untranslated string: vpn deprecated = Deprecated
 WARNING: untranslated string: vpn force mobike = Force using MOBIKE (only IKEv2)
 WARNING: untranslated string: vpn inactivity timeout = Inactivity Timeout
 WARNING: untranslated string: vpn on-demand = ON-DEMAND

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index df1d6d60ca2d6d6ac8d8ea71a122966c6f8862c5..b005b9946bf3ce2b37bfc6ee6b9af843a3043825 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1490,6 +1490,8 @@ 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 fqdn = FQDN
 WARNING: untranslated string: ovpn ha = Hash algorithm
+WARNING: untranslated string: ovpn legacy auth used = You are using a legacy hash which will not be supported in OpenVPN clients of version 2.6 or later
+WARNING: untranslated string: ovpn legacy cipher used = You are using a legacy cipher which will not be supported in OpenVPN clients of version 2.6 or later
 WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required.
 WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
@@ -1675,6 +1677,7 @@ WARNING: untranslated string: version = Version
 WARNING: untranslated string: visit us at = Visit us at
 WARNING: untranslated string: vpn broken = Broken
 WARNING: untranslated string: vpn connecting = CONNECTING
+WARNING: untranslated string: vpn deprecated = Deprecated
 WARNING: untranslated string: vpn force mobike = Force using MOBIKE (only IKEv2)
 WARNING: untranslated string: vpn inactivity timeout = Inactivity Timeout
 WARNING: untranslated string: vpn keyexchange = Keyexchange

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 79592b1cb6ad7aad6e65d18b1cd948f03369050e..46aa8120f45e2a47ea511592e16c773b7fb92b1f 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1490,6 +1490,8 @@ 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 fqdn = FQDN
 WARNING: untranslated string: ovpn ha = Hash algorithm
+WARNING: untranslated string: ovpn legacy auth used = You are using a legacy hash which will not be supported in OpenVPN clients of version 2.6 or later
+WARNING: untranslated string: ovpn legacy cipher used = You are using a legacy cipher which will not be supported in OpenVPN clients of version 2.6 or later
 WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required.
 WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
@@ -1674,6 +1676,7 @@ WARNING: untranslated string: version = Version
 WARNING: untranslated string: visit us at = Visit us at
 WARNING: untranslated string: vpn broken = Broken
 WARNING: untranslated string: vpn connecting = CONNECTING
+WARNING: untranslated string: vpn deprecated = Deprecated
 WARNING: untranslated string: vpn force mobike = Force using MOBIKE (only IKEv2)
 WARNING: untranslated string: vpn inactivity timeout = Inactivity Timeout
 WARNING: untranslated string: vpn keyexchange = Keyexchange

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index fe18c0cf089579e1d2d4bb46eb6edf0865df9e9d..8e3eb45cbe5aca5bdc8bfb5776fac128d930462c 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1238,6 +1238,8 @@ WARNING: untranslated string: ovpn errmsg invalid route = Invalid route
 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 fqdn = FQDN
+WARNING: untranslated string: ovpn legacy auth used = You are using a legacy hash which will not be supported in OpenVPN clients of version 2.6 or later
+WARNING: untranslated string: ovpn legacy cipher used = You are using a legacy cipher which will not be supported in OpenVPN clients of version 2.6 or later
 WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn protocol settings = Protocol Settings
@@ -1332,6 +1334,7 @@ WARNING: untranslated string: transport mode does not support vti = VTI is not s
 WARNING: untranslated string: updxlrtr passive mode = Delivery only/no download mode
 WARNING: untranslated string: user management = User Management
 WARNING: untranslated string: version = Version
+WARNING: untranslated string: vpn deprecated = Deprecated
 WARNING: untranslated string: vpn start action add = Wait for connection initiation
 WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING

diff --git a/doc/language_issues.tw b/doc/language_issues.tw
index 1573bb74f7f198ad7ce7591ee08c88b3576d29af..2a058e7205fe070cde8f86843c64ec050803a7ac 100644 (file)
--- a/doc/language_issues.tw
+++ b/doc/language_issues.tw
@@ -1095,6 +1095,8 @@ WARNING: untranslated string: ovpn errmsg invalid route = Invalid route
 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 fqdn = FQDN
+WARNING: untranslated string: ovpn legacy auth used = You are using a legacy hash which will not be supported in OpenVPN clients of version 2.6 or later
+WARNING: untranslated string: ovpn legacy cipher used = You are using a legacy cipher which will not be supported in OpenVPN clients of version 2.6 or later
 WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn protocol settings = Protocol Settings
@@ -1123,6 +1125,7 @@ WARNING: untranslated string: rss = RSS
 WARNING: untranslated string: rss long = Resident Set Size
 WARNING: untranslated string: smt not implemented = Not Implemented
 WARNING: untranslated string: transient sheduler attacks = Transient sheduler attacks
+WARNING: untranslated string: vpn deprecated = Deprecated
 WARNING: untranslated string: wio = unknown string
 WARNING: untranslated string: wio checked = unknown string
 WARNING: untranslated string: wio cron = unknown string

diff --git a/doc/language_issues.zh b/doc/language_issues.zh
index 1573bb74f7f198ad7ce7591ee08c88b3576d29af..2a058e7205fe070cde8f86843c64ec050803a7ac 100644 (file)
--- a/doc/language_issues.zh
+++ b/doc/language_issues.zh
@@ -1095,6 +1095,8 @@ WARNING: untranslated string: ovpn errmsg invalid route = Invalid route
 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 fqdn = FQDN
+WARNING: untranslated string: ovpn legacy auth used = You are using a legacy hash which will not be supported in OpenVPN clients of version 2.6 or later
+WARNING: untranslated string: ovpn legacy cipher used = You are using a legacy cipher which will not be supported in OpenVPN clients of version 2.6 or later
 WARNING: untranslated string: ovpn misc settings = Miscellaneous Settings
 WARNING: untranslated string: ovpn no cipher selected = No cipher selected
 WARNING: untranslated string: ovpn protocol settings = Protocol Settings
@@ -1123,6 +1125,7 @@ WARNING: untranslated string: rss = RSS
 WARNING: untranslated string: rss long = Resident Set Size
 WARNING: untranslated string: smt not implemented = Not Implemented
 WARNING: untranslated string: transient sheduler attacks = Transient sheduler attacks
+WARNING: untranslated string: vpn deprecated = Deprecated
 WARNING: untranslated string: wio = unknown string
 WARNING: untranslated string: wio checked = unknown string
 WARNING: untranslated string: wio cron = unknown string

diff --git a/doc/language_missings b/doc/language_missings
index 6575e17ea2d1f017262c8d1e4f8c8fb0931b4917..24602b7d193730a2c28311b916b59ed446c8561d 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -190,6 +190,8 @@
 < ovpn fallback cipher
 < ovpn fallback cipher help
 < ovpn fqdn
+< ovpn legacy auth used
+< ovpn legacy cipher used
 < ovpn misc settings
 < ovpn no cipher selected
 < ovpn protocol settings
@@ -204,6 +206,7 @@
 < rss long
 < smt not implemented
 < transient sheduler attacks
+< vpn deprecated
 < wlanap 802.11ac
 < wlanap 802.11ac 160mhz
 < wlanap 802.11ac 20mhz
@@ -302,6 +305,8 @@
 < ovpn fallback cipher
 < ovpn fallback cipher help
 < ovpn fqdn
+< ovpn legacy auth used
+< ovpn legacy cipher used
 < ovpn misc settings
 < ovpn no cipher selected
 < ovpn protocol settings
@@ -330,6 +335,7 @@
 < total
 < transient sheduler attacks
 < upload fcdsl.o
+< vpn deprecated
 < warning
 < wg
 < wg client configuration file
@@ -828,6 +834,8 @@
 < ovpn fallback cipher
 < ovpn fallback cipher help
 < ovpn fqdn
+< ovpn legacy auth used
+< ovpn legacy cipher used
 < ovpn misc settings
 < ovpn no cipher selected
 < ovpn protocol settings
@@ -946,6 +954,7 @@
 < version
 < vpn broken
 < vpn connecting
+< vpn deprecated
 < vpn force mobike
 < vpn inactivity timeout
 < vpn on-demand
@@ -1537,6 +1546,8 @@
 < ovpn fqdn
 < ovpn generating the root and host certificates
 < ovpn ha
+< ovpn legacy auth used
+< ovpn legacy cipher used
 < ovpn misc settings
 < ovpn no cipher selected
 < ovpn protocol settings
@@ -1653,6 +1664,7 @@
 < vendor
 < vpn broken
 < vpn connecting
+< vpn deprecated
 < vpn force mobike
 < vpn inactivity timeout
 < vpn on-demand
@@ -2562,6 +2574,8 @@
 < ovpn fqdn
 < ovpn generating the root and host certificates
 < ovpn ha
+< ovpn legacy auth used
+< ovpn legacy cipher used
 < ovpn mgmt in root range
 < ovpn misc settings
 < ovpn mtu-disc
@@ -2773,6 +2787,7 @@
 < visit us at
 < vpn broken
 < vpn connecting
+< vpn deprecated
 < vpn force mobike
 < vpn inactivity timeout
 < vpn keyexchange
@@ -3721,6 +3736,8 @@
 < ovpn fqdn
 < ovpn generating the root and host certificates
 < ovpn ha
+< ovpn legacy auth used
+< ovpn legacy cipher used
 < ovpn mgmt in root range
 < ovpn misc settings
 < ovpn mtu-disc
@@ -3931,6 +3948,7 @@
 < visit us at
 < vpn broken
 < vpn connecting
+< vpn deprecated
 < vpn force mobike
 < vpn inactivity timeout
 < vpn keyexchange
@@ -4383,6 +4401,8 @@
 < ovpn fallback cipher
 < ovpn fallback cipher help
 < ovpn fqdn
+< ovpn legacy auth used
+< ovpn legacy cipher used
 < ovpn misc settings
 < ovpn no cipher selected
 < ovpn protocol settings
@@ -4480,6 +4500,7 @@
 < updxlrtr passive mode
 < user management
 < version
+< vpn deprecated
 < vpn start action add
 < vpn subjectaltname missing
 < vpn wait
@@ -4636,6 +4657,8 @@
 < ovpn fallback cipher
 < ovpn fallback cipher help
 < ovpn fqdn
+< ovpn legacy auth used
+< ovpn legacy cipher used
 < ovpn misc settings
 < ovpn no cipher selected
 < ovpn protocol settings
@@ -4661,6 +4684,7 @@
 < rss long
 < smt not implemented
 < transient sheduler attacks
+< vpn deprecated
 < wlanap 802.11ac
 < wlanap 802.11ac 160mhz
 < wlanap 802.11ac 20mhz
@@ -4728,6 +4752,8 @@
 < ovpn fallback cipher
 < ovpn fallback cipher help
 < ovpn fqdn
+< ovpn legacy auth used
+< ovpn legacy cipher used
 < ovpn misc settings
 < ovpn no cipher selected
 < ovpn protocol settings
@@ -4753,6 +4779,7 @@
 < rss long
 < smt not implemented
 < transient sheduler attacks
+< vpn deprecated
 < wlanap 802.11ac
 < wlanap 802.11ac 160mhz
 < wlanap 802.11ac 20mhz

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index f1506165456cd7c444575d9b6d53b3f71d068976..ec86a218be7e98e473d28093958dff3b6cb4986c 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2847,7 +2847,7 @@ END
 
                                        <td>
                                                <select name='DAUTH'>
-                                                       <option value='whirlpool'               $selected{'DAUTH'}{'whirlpool'}>Whirlpool (512 $Lang::tr{'bit'})</option>
+                                                       <option value='whirlpool'               $selected{'DAUTH'}{'whirlpool'}>Whirlpool (512 $Lang::tr{'bit'}, $Lang::tr{'vpn deprecated'})</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>
@@ -2883,12 +2883,12 @@ END
                                                        <option value='AES-256-CBC' $selected{'DCIPHER'}{'AES-256-CBC'}>AES-CBC (256 $Lang::tr{'bit'})</option>
                                                        <option value='AES-192-CBC' $selected{'DCIPHER'}{'AES-192-CBC'}>AES-CBC (192 $Lang::tr{'bit'})</option>
                                                        <option value='AES-128-CBC' $selected{'DCIPHER'}{'AES-128-CBC'}>AES-CBC (128 $Lang::tr{'bit'})</option>
-                                                       <option value='SEED-CBC' $selected{'DCIPHER'}{'SEED-CBC'}>SEED-CBC (128 $Lang::tr{'bit'})</option>
-                                                       <option value='DES-EDE3-CBC' $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC (192 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
-                                                       <option value='DESX-CBC' $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC (192 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
-                                                       <option value='DES-EDE-CBC' $selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
-                                                       <option value='BF-CBC' $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
-                                                       <option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
+                                                       <option value='SEED-CBC' $selected{'DCIPHER'}{'SEED-CBC'}>SEED-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn deprecated'})</option>
+                                                       <option value='DES-EDE3-CBC' $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC (192 $Lang::tr{'bit'}, $Lang::tr{'vpn deprecated'})</option>
+                                                       <option value='DESX-CBC' $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC (192 $Lang::tr{'bit'}, $Lang::tr{'vpn deprecated'})</option>
+                                                       <option value='DES-EDE-CBC' $selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn deprecated'})</option>
+                                                       <option value='BF-CBC' $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn deprecated'})</option>
+                                                       <option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn deprecated'})</option>
                                                </select>
                                        </td>
                                </tr>
@@ -5115,6 +5115,18 @@ END
     &Header::openpage($Lang::tr{'status ovpn'}, 1, '');
     &Header::openbigbox('100%', 'LEFT', '', $errormessage);
 
+       my @warnings = ();
+
+       # Check if a legacy cipher is being used
+       if (&is_legacy_cipher($vpnsettings{'DCIPHER'})) {
+               push(@warnings, $Lang::tr{'ovpn legacy cipher used'});
+       }
+
+       # Check if a legacy auth algorithm is being used
+       if (&is_legacy_auth($vpnsettings{'DAUTH'})) {
+               push(@warnings, $Lang::tr{'ovpn legacy auth used'});
+       }
+
        # Show any errors and warnings
        &Header::errorbox($errormessage);
 
@@ -5128,6 +5140,8 @@ END
                exit 0;
        }
 
+       &Header::warningbox(@warnings);
+
     &Header::openbox('100%', 'LEFT', $Lang::tr{'ovpn roadwarrior settings'});
 
        # Show the service status

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index b93f5413e28615bbdb76e4ba591feee030c27aa1..55804a89726663db751258a0de763db91b04bf67 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1993,6 +1993,8 @@
 'ovpn error md5' => 'Das Host Zertifikat nutzt einen MD5 Algorithmus welcher nicht mehr akzeptiert wird. <br>Bitte IPFire auf die neueste Version updaten und generieren sie ein neues Root und Host Zertifikate.</br><br>Es müssen dann alle OpenVPN clients erneuert werden!</br>',
 'ovpn generating the root and host certificates' => 'Die Erzeugung der Root- und Host-Zertifikate kann lange Zeit dauern.',
 'ovpn ha' => 'Hash-Algorithmus',
+'ovpn legacy auth used' => 'Sie verwenden einen veralteten Hash, der in OpenVPN-Clients ab Version 2.6 nicht mehr unterstützt wird',
+'ovpn legacy cipher used' => 'Sie verwenden eine veraltete Verschlüsselung, die in OpenVPN-Clients ab Version 2.6 nicht mehr unterstützt wird',
 'ovpn log' => 'OVPN-Protokoll',
 'ovpn mgmt in root range' => 'Ein Port von 1024 oder höher ist erforderlich.',
 'ovpn mtu-disc' => 'Path MTU Discovery',
@@ -2931,6 +2933,7 @@
 'vpn connecting' => 'VERBINDUNGSAUFBAU',
 'vpn delayed start' => 'Verzögerung, bevor VPN gestartet wird (in Sekunden)',
 'vpn delayed start help' => 'Falls notwendig, kann diese Verzögerung dazu verwendet werden, um Dynamic-DNS-Updates ordnungsgemäß anzuwenden. 60 ist ein gängiger Wert, wenn ROT (RED) eine dynamische IP Adresse ist.',
+'vpn deprecated' => 'Veraltet',
 'vpn force mobike' => 'MOBIKE erzwingen (nur IKEv2)',
 'vpn inactivity timeout' => 'Inaktivitätstimeout',
 'vpn incompatible use of defaultroute' => 'Hostname=%defaultroute nicht zulässig',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index acdfe4679f543f2c988cbc676e4d44a6f0f99515..08967bc8457f71f435e1e602a0c42cd0130e303a 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2073,6 +2073,8 @@
 'ovpn fqdn' => 'FQDN',
 'ovpn generating the root and host certificates' => 'Generating the root and host certificate can take a long time.',
 'ovpn ha' => 'Hash algorithm',
+'ovpn legacy auth used' => 'You are using a legacy hash which will not be supported in OpenVPN clients of version 2.6 or later',
+'ovpn legacy cipher used' => 'You are using a legacy cipher which will not be supported in OpenVPN clients of version 2.6 or later',
 'ovpn log' => 'OVPN-Log',
 'ovpn mgmt in root range' => 'A port number of 1024 or higher is required.',
 'ovpn misc settings' => 'Miscellaneous Settings',
@@ -3044,6 +3046,7 @@
 'vpn connecting' => 'CONNECTING',
 'vpn delayed start' => 'Delay before launching VPN (seconds)',
 'vpn delayed start help' => 'If required, this delay can be used to allow dynamic DNS updates to propagate properly. 60 is a common value when RED is a dynamic IP.',
+'vpn deprecated' => 'Deprecated',
 'vpn force mobike' => 'Force using MOBIKE (only IKEv2)',
 'vpn inactivity timeout' => 'Inactivity Timeout',
 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed',