comparison util/sslconfig.lua @ 9586:44dbee2f173f

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Oct 2018 17:17:07 +0100
parents 2860f8dabf35
children c171b4c59bd1
comparison
equal deleted inserted replaced
9581:1be99aedb0b3 9586:44dbee2f173f
68 finalisers.curveslist = finalisers.ciphers; 68 finalisers.curveslist = finalisers.ciphers;
69 69
70 -- protocol = "x" should enable only that protocol 70 -- protocol = "x" should enable only that protocol
71 -- protocol = "x+" should enable x and later versions 71 -- protocol = "x+" should enable x and later versions
72 72
73 local protocols = { "sslv2", "sslv3", "tlsv1", "tlsv1_1", "tlsv1_2" }; 73 local protocols = { "sslv2", "sslv3", "tlsv1", "tlsv1_1", "tlsv1_2", "tlsv1_3" };
74 for i = 1, #protocols do protocols[protocols[i] .. "+"] = i - 1; end 74 for i = 1, #protocols do protocols[protocols[i] .. "+"] = i - 1; end
75 75
76 -- this interacts with ssl.options as well to add no_x 76 -- this interacts with ssl.options as well to add no_x
77 local function protocol(config) 77 local function protocol(config)
78 local min_protocol = protocols[config.protocol]; 78 local min_protocol = protocols[config.protocol];