diff options
author | Kim Alvefur <zash@zash.se> | 2018-10-28 17:17:07 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-10-28 17:17:07 +0100 |
commit | 5d8bd2a789a52a5c927bc9a8a97c941870437fdd (patch) | |
tree | af3096423457e1ae0c3f73a919723bb0a21d3f5e /util | |
parent | 031dc2e2a0450b25e16bbc534b29522e0ee52793 (diff) | |
parent | 1477498c413786a7c2b85492299833aa3a6c75b3 (diff) | |
download | prosody-5d8bd2a789a52a5c927bc9a8a97c941870437fdd.tar.gz prosody-5d8bd2a789a52a5c927bc9a8a97c941870437fdd.zip |
Merge 0.11->trunk
Diffstat (limited to 'util')
-rw-r--r-- | util/sslconfig.lua | 2 |
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 |