aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-26 14:18:30 +0100
committerKim Alvefur <zash@zash.se>2017-01-26 14:18:30 +0100
commite18117b8f9bffb05582ff610f0bd011d54a94c33 (patch)
treea4c91095c2477d2b1781716866622e13089c34df
parent428d7cda1a6bd1c8b0313375d297c6a09880f423 (diff)
downloadprosody-e18117b8f9bffb05582ff610f0bd011d54a94c33.tar.gz
prosody-e18117b8f9bffb05582ff610f0bd011d54a94c33.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.lua6
-rw-r--r--util/sslconfig.lua2
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