From e18117b8f9bffb05582ff610f0bd011d54a94c33 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 26 Jan 2017 14:18:30 +0100 Subject: util.sslconfig: Remvoe flag merging for 'verify' as this is more of a tri-state field than a set of options --- plugins/mod_http.lua | 6 +----- util/sslconfig.lua | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua index 2cde9341..a15e8cda 100644 --- a/plugins/mod_http.lua +++ b/plugins/mod_http.lua @@ -162,11 +162,7 @@ module:provides("net", { default_port = 5281; encryption = "ssl"; ssl_config = { - verify = { - peer = false, - client_once = false, - "none", - } + verify = "none"; }; multiplex = { pattern = "^[A-Z]"; diff --git a/util/sslconfig.lua b/util/sslconfig.lua index c849aa28..931502b9 100644 --- a/util/sslconfig.lua +++ b/util/sslconfig.lua @@ -36,7 +36,6 @@ function handlers.options(config, field, new) config[field] = options; end -handlers.verify = handlers.options; handlers.verifyext = handlers.options; -- finalisers take something produced by handlers and return what luasec @@ -53,7 +52,6 @@ function finalisers.options(options) return output; end -finalisers.verify = finalisers.options; finalisers.verifyext = finalisers.options; -- We allow ciphers to be a list -- cgit v1.2.3