Browse Source

Merge pull request #2962 from TDT-AG/pr/20190802-luci-app-openvpn

luci-app-openvpn: replace tls_cipher and tls_ciphersuites with DynamicList
Jo-Philipp Wich 5 years ago
parent
commit
07aedbf129

+ 28 - 4
applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua

@@ -676,13 +676,37 @@ local knownParams = {
 			"key_method",
 			"key_method",
 			{ 1, 2 },
 			{ 1, 2 },
 			translate("Enable TLS and assume client role") },
 			translate("Enable TLS and assume client role") },
-		{ Value,
+		{ DynamicList,
 			"tls_cipher",
 			"tls_cipher",
-			"DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:AES256-SHA:EDH-RSA-DES-CBC3-SHA:EDH-DSS-DES-CBC3-SHA:DES-CBC3-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:AES128-SHA:RC4-SHA:RC4-MD5:EDH-RSA-DES-CBC-SHA:EDH-DSS-DES-CBC-SHA:DES-CBC-SHA:EXP-EDH-RSA-DES-CBC-SHA:EXP-EDH-DSS-DES-CBC-SHA:EXP-DES-CBC-SHA:EXP-RC2-CBC-MD5:EXP-RC4-MD5",
+			{
+				"DHE-RSA-AES256-SHA",
+				"DHE-DSS-AES256-SHA",
+				"AES256-SHA",
+				"EDH-RSA-DES-CBC3-SHA",
+				"EDH-DSS-DES-CBC3-SHA",
+				"DES-CBC3-SHA",
+				"DHE-RSA-AES128-SHA",
+				"DHE-DSS-AES128-SHA",
+				"AES128-SHA",
+				"RC4-SHA",
+				"RC4-MD5",
+				"EDH-RSA-DES-CBC-SHA",
+				"EDH-DSS-DES-CBC-SHA",
+				"DES-CBC-SHA",
+				"EXP-EDH-RSA-DES-CBC-SHA",
+				"EXP-EDH-DSS-DES-CBC-SHA",
+				"EXP-DES-CBC-SHA",
+				"EXP-RC2-CBC-MD5",
+				"EXP-RC4-MD5"
+			},
 			translate("TLS cipher") },
 			translate("TLS cipher") },
-		{ Value,
+		{ DynamicList,
 			"tls_ciphersuites",
 			"tls_ciphersuites",
-			"TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256",
+			{
+				"TLS_AES_256_GCM_SHA384",
+				"TLS_AES_128_GCM_SHA256",
+				"TLS_CHACHA20_POLY1305_SHA256"
+			},
 			translate("TLS 1.3 or newer cipher") },
 			translate("TLS 1.3 or newer cipher") },
 		{ Value,
 		{ Value,
 			"tls_timeout",
 			"tls_timeout",