summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2017-10-10 17:55:50 +0300
committerGitHub <noreply@github.com>2017-10-10 17:55:50 +0300
commitab9d1cf066d742f4aa6193a9dac23dadffcf0f95 (patch)
treeaa627112b1383a716e683d8972bf5ac134e0ee7e
parent2d011a5e9794ddb7e001e7bc2bda15c2942b0db5 (diff)
parentbd7eff9a6386be5b04fa8fb98ac50bcbb033ce63 (diff)
Merge pull request #1387 from Wedmer/app_openvpn_tls_crypt_support
[luci-app-openvpn] Added support for tls-crypt option.
-rw-r--r--applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua4
-rw-r--r--applications/luci-app-openvpn/po/en/openvpn.po3
-rw-r--r--applications/luci-app-openvpn/po/ru/openvpn.po3
-rw-r--r--applications/luci-app-openvpn/po/templates/openvpn.pot3
4 files changed, 13 insertions, 0 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 7865881cb6..dc7718217c 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
@@ -685,6 +685,10 @@ local knownParams = {
"tls_auth",
"/etc/openvpn/tlsauth.key",
translate("Additional authentication over TLS") },
+ { Value,
+ "tls_crypt",
+ "/etc/openvpn/tlscrypt.key",
+ translate("Encrypt and authenticate all control channel packets with the key") },
-- { Value,
-- "askpass",
-- "[file]",
diff --git a/applications/luci-app-openvpn/po/en/openvpn.po b/applications/luci-app-openvpn/po/en/openvpn.po
index a5994dc292..f22f0f2379 100644
--- a/applications/luci-app-openvpn/po/en/openvpn.po
+++ b/applications/luci-app-openvpn/po/en/openvpn.po
@@ -31,6 +31,9 @@ msgstr "Add route after establishing connection"
msgid "Additional authentication over TLS"
msgstr "Additional authentication over TLS"
+msgid "Encrypt and authenticate all control channel packets with the key"
+msgstr "Encrypt and authenticate all control channel packets with the key"
+
msgid "Allow client-to-client traffic"
msgstr "Allow client-to-client traffic"
diff --git a/applications/luci-app-openvpn/po/ru/openvpn.po b/applications/luci-app-openvpn/po/ru/openvpn.po
index 00e585c374..8c15b826ba 100644
--- a/applications/luci-app-openvpn/po/ru/openvpn.po
+++ b/applications/luci-app-openvpn/po/ru/openvpn.po
@@ -33,6 +33,9 @@ msgstr "Добавить маршрут после установки соеди
msgid "Additional authentication over TLS"
msgstr "Дополнительная аутентификация через TLS"
+msgid "Encrypt and authenticate all control channel packets with the key"
+msgstr "Шифровать и аутентифициоровать ключом все пакеты канала управления"
+
msgid "Allow client-to-client traffic"
msgstr "Разрешить общение клиентов друг с другом"
diff --git a/applications/luci-app-openvpn/po/templates/openvpn.pot b/applications/luci-app-openvpn/po/templates/openvpn.pot
index f2e4011662..1b6b4b1bd7 100644
--- a/applications/luci-app-openvpn/po/templates/openvpn.pot
+++ b/applications/luci-app-openvpn/po/templates/openvpn.pot
@@ -19,6 +19,9 @@ msgstr ""
msgid "Additional authentication over TLS"
msgstr ""
+msgid "Encrypt and authenticate all control channel packets with the key"
+msgstr ""
+
msgid "Allow client-to-client traffic"
msgstr ""