diff options
| author | Kim Alvefur <zash@zash.se> | 2017-01-26 14:18:30 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-01-26 14:18:30 +0100 |
| commit | a67d0bfb97f2c2e0b2cd7a303accd70c95911275 (patch) | |
| tree | a4c91095c2477d2b1781716866622e13089c34df | |
| parent | befdc64576117b053b635602993b66fde4bfdc0a (diff) | |
| download | prosody-a67d0bfb97f2c2e0b2cd7a303accd70c95911275.tar.gz prosody-a67d0bfb97f2c2e0b2cd7a303accd70c95911275.zip | |
util.sslconfig: Remvoe flag merging for 'verify' as this is more of a tri-state field than a set of options
| -rw-r--r-- | plugins/mod_http.lua | 6 | ||||
| -rw-r--r-- | util/sslconfig.lua | 2 |
2 files changed, 1 insertions, 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 |