aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-26 19:47:33 +0100
committerKim Alvefur <zash@zash.se>2017-01-26 19:47:33 +0100
commit7e1a61f76b04981306d02759f4a8c07c8af9ea86 (patch)
treed70f10039b1ee0bdec5f010014db2fd1fe0b7b83 /util
parenta845ca47015583bf7b41f20362fd210c037639f3 (diff)
parente18117b8f9bffb05582ff610f0bd011d54a94c33 (diff)
downloadprosody-7e1a61f76b04981306d02759f4a8c07c8af9ea86.tar.gz
prosody-7e1a61f76b04981306d02759f4a8c07c8af9ea86.zip
Merge 0.10->trunk
Diffstat (limited to 'util')
-rw-r--r--util/sslconfig.lua2
1 files changed, 0 insertions, 2 deletions
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