From mboxrd@z Thu Jan  1 00:00:00 1970
From: IT Superhack <itsuperhack@web.de>
To: development@lists.ipfire.org
Subject: [PATCH] Mark recommended ciphers/algorithms
Date: Fri, 18 Dec 2015 17:12:18 +0100
Message-ID: <56743062.6040807@web.de>
In-Reply-To: <1449767773.31655.108.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7106719814826676542=="
List-Id: <development.lists.ipfire.org>

--===============7106719814826676542==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This marks AES-CBC (256 bits) as "recommended" on the OpenVPN main cgi, which=
 is also set as default already.
Furthermore, SHA1 is marked as "weak" on the "advanced options" page in the O=
penVPN cgi.

All translations for "recommended" and "weak" are still missing, except the g=
erman one.

Signed-off-by: Timmothy Wilson <itsuperhack(a)web.de>
---
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 62af54e..cd85a9e 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -4687,7 +4687,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
 				<option value=3D'CAMELLIA-256-CBC'	$selected{'DCIPHER'}{'CAMELLIA-256-CB=
C'}>CAMELLIA-CBC (256 $Lang::tr{'bit'})</option>
 				<option value=3D'CAMELLIA-192-CBC'	$selected{'DCIPHER'}{'CAMELLIA-192-CB=
C'}>CAMELLIA-CBC (192 $Lang::tr{'bit'})</option>
 				<option value=3D'CAMELLIA-128-CBC'	$selected{'DCIPHER'}{'CAMELLIA-128-CB=
C'}>CAMELLIA-CBC (128 $Lang::tr{'bit'})</option>
-				<option value=3D'AES-256-CBC' 	 	$selected{'DCIPHER'}{'AES-256-CBC'}>AES=
-CBC (256 $Lang::tr{'bit'}, $Lang::tr{'default'})</option>
+				<option value=3D'AES-256-CBC' 	 	$selected{'DCIPHER'}{'AES-256-CBC'}>AES=
-CBC (256 $Lang::tr{'bit'}, $Lang::tr{'default'}) ($Lang::tr{'recommended'})<=
/option>
 				<option value=3D'AES-192-CBC' 	 	$selected{'DCIPHER'}{'AES-192-CBC'}>AES=
-CBC (192 $Lang::tr{'bit'})</option>
 				<option value=3D'AES-128-CBC' 	 	$selected{'DCIPHER'}{'AES-128-CBC'}>AES=
-CBC (128 $Lang::tr{'bit'})</option>
 				<option value=3D'DES-EDE3-CBC'	 	$selected{'DCIPHER'}{'DES-EDE3-CBC'}>DE=
S-EDE3-CBC (192 $Lang::tr{'bit'})</option>
@@ -4705,7 +4705,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
 				<option value=3D'SHA512'			$selected{'DAUTH'}{'SHA512'}>SHA2 (512 $Lang:=
:tr{'bit'})</option>
 				<option value=3D'SHA384'			$selected{'DAUTH'}{'SHA384'}>SHA2 (384 $Lang:=
:tr{'bit'})</option>
 				<option value=3D'SHA256'			$selected{'DAUTH'}{'SHA256'}>SHA2 (256 $Lang:=
:tr{'bit'})</option>
-				<option value=3D'SHA1'			$selected{'DAUTH'}{'SHA1'}>SHA1 (160 $Lang::tr{=
'bit'} Default)</option>
+				<option value=3D'SHA1'			$selected{'DAUTH'}{'SHA1'}>SHA1 (160 $Lang::tr{=
'bit'} Default) ($Lang::tr{'weak'})</option>
 			</select>
 		</td>
 	</tr>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 2bca854..1d1705b 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1912,6 +1912,7 @@
 'reboot sure' =3D> 'Sind Sie sicher, dass Sie neustarten wollen?',
 'rebooting' =3D> 'Starte neu ...',
 'rebooting ipfire' =3D> 'Starte IPFire neu',
+'recommended' =3D> 'empfohlen',
 'reconnect' =3D> 'Neu Verbinden',
 'reconnection' =3D> 'Wiederverbindung',
 'red' =3D> 'Internet',
@@ -2631,6 +2632,7 @@
 'warn when traffic reaches' =3D> 'Warnen wenn Traffic x % erreicht',
 'warning messages' =3D> 'Warnhinweise',
 'was deleted' =3D> 'wurde gel=C3=B6scht',
+'weak' =3D> 'schwach',
 'web hits' =3D> 'Gesamtanzahl der Websites zum ausgew=C3=A4hlten Kriterium',
 'web proxy' =3D> 'Web-Proxy',
 'web proxy configuration' =3D> 'Web-Proxy-Konfiguration',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 4c52392..32911a3 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1945,6 +1945,7 @@
 'reboot sure' =3D> 'Are you sure that you want to reboot?',
 'rebooting' =3D> 'Rebooting',
 'rebooting ipfire' =3D> 'Rebooting IPFire',
+'recommended' =3D> 'recommended',
 'reconnect' =3D> 'Reconnect',
 'reconnection' =3D> 'Reconnection',
 'red' =3D> 'Internet',
@@ -2675,6 +2676,7 @@
 'warn when traffic reaches' =3D> 'Warn when traffic reaches x %',
 'warning messages' =3D> 'Warning messages',
 'was deleted' =3D> 'was deleted',
+'weak' =3D> 'weak',
 'web hits' =3D> 'Total number of websites matching selected criteria for',
 'web proxy' =3D> 'Web Proxy',
 'web proxy configuration' =3D> 'Web proxy configuration',



--===============7106719814826676542==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRRWNCQUVCQ2dBR0JRSldkREJpQUFvSkVP
eUxhMUM1RWF6cjRLZ0gvMGVKWGhRTHU3dWxUb1BVbGExOHFCZGcKa3pJQzcvQ24vN0Z3L3cwVGpR
elNrZjJTYXZsUGdoRUVUZEczakZrSGdnQkJQV0JWeDZnSXNlYlZqRFpEaE5PSApHaVZaekNCekhC
dmI0UjFoNkhhUCs5L05mdFY5T2hqM2xZeWFmdjJvZjZ3VE53eTBiQzhvZFUrZGF6MTlmVWw2CkdT
MHh1dUN2TG9iSzdXSkk2V0lpSzRjRGhyMVZwZE1hQWlUTVZPR2J6UlhTSitCWlBqSzlVbExKZEZC
OVpFYnkKY3p6NGZCemR4OGduNlFFd29LcEh1WTJuK2xHQUFDUmFsWVZ1VGR1blJxcGNnZ0p2NVpv
a0lIMS9iRXJaRkFxdgpVZnlCNjNyODFIYVQxUFFEbnJWOEMydEgwakZ2VDVscHkyOVU1b0VxbWxJ
SXVsWlpQMGV1MWNmbzVwYzRmcjA9Cj1FMVQ2Ci0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo=

--===============7106719814826676542==--