From 7880a9276b3c0ce41df77ea3c5ff6c2e63e45463 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 2 Aug 2019 15:28:30 +0200 Subject: [PATCH 1/2] luci-app-openvpn: use DynamicList for tls_cipher Signed-off-by: Florian Eckert --- .../luasrc/model/cbi/openvpn-advanced.lua | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 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 2bf36cb278..f6a6849a5e 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua @@ -676,9 +676,29 @@ 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, "tls_ciphersuites", From 6a847fea041075cc287008ce6a4963a179e6e3b0 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 2 Aug 2019 15:32:04 +0200 Subject: [PATCH 2/2] luci-app-openvpn: use DynamicList for tls_ciphersuites Signed-off-by: Florian Eckert --- .../luasrc/model/cbi/openvpn-advanced.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 f6a6849a5e..18b106c32e 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua @@ -700,9 +700,13 @@ local knownParams = { "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",