diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-08-05 09:28:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-05 09:28:29 +0200 |
| commit | 07aedbf129823d06beeaef3aca8ee5a39c047abc (patch) | |
| tree | f2175e727795be044499021100db0c74ef7bfe91 | |
| parent | 07dbee37f858b93c10fe5114fbe55e36ddb0d654 (diff) | |
| parent | 6a847fea041075cc287008ce6a4963a179e6e3b0 (diff) | |
Merge pull request #2962 from TDT-AG/pr/20190802-luci-app-openvpn
luci-app-openvpn: replace tls_cipher and tls_ciphersuites with DynamicList
| -rw-r--r-- | applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua index 2bf36cb27..18b106c32 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua @@ -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", |