aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-10-28 17:17:07 +0100
committerKim Alvefur <zash@zash.se>2018-10-28 17:17:07 +0100
commit9d6cefcaeb41c6a4257a103c3f1745a7d1b10397 (patch)
treeaf3096423457e1ae0c3f73a919723bb0a21d3f5e /util
parent3899c7ac4b50242ccfc78edc6d5e3d6c3b954008 (diff)
parent38d8451b2955824f89722ef72a6ea147ee9e3f9a (diff)
downloadprosody-9d6cefcaeb41c6a4257a103c3f1745a7d1b10397.tar.gz
prosody-9d6cefcaeb41c6a4257a103c3f1745a7d1b10397.zip
Merge 0.11->trunk
Diffstat (limited to 'util')
-rw-r--r--util/sslconfig.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/sslconfig.lua b/util/sslconfig.lua
index 5c685f7d..a5827a76 100644
--- a/util/sslconfig.lua
+++ b/util/sslconfig.lua
@@ -70,7 +70,7 @@ finalisers.curveslist = finalisers.ciphers;
-- protocol = "x" should enable only that protocol
-- protocol = "x+" should enable x and later versions
-local protocols = { "sslv2", "sslv3", "tlsv1", "tlsv1_1", "tlsv1_2" };
+local protocols = { "sslv2", "sslv3", "tlsv1", "tlsv1_1", "tlsv1_2", "tlsv1_3" };
for i = 1, #protocols do protocols[protocols[i] .. "+"] = i - 1; end
-- this interacts with ssl.options as well to add no_x