Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
luci-app-openvpn: replace tls_cipher and tls_ciphersuites with DynamicList
This commit is contained in:
Jo-Philipp Wich 2019-08-05 09:28:29 +02:00 committed by GitHub
commit 07aedbf129
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
View file

@ -676,13 +676,37 @@ local knownParams = {
"key_method",
{ 1, 2 },
translate("Enable TLS and assume client role") },
{ Value,
{ DynamicList,
"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") },
{ Value,
{ DynamicList,
"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") },
{ Value,
"tls_timeout",