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
commit4c6a84a00ef37846e432ba76e3771087d23cceb1 (patch)
treed70f10039b1ee0bdec5f010014db2fd1fe0b7b83 /util
parent0c22ed35793dc8b751dea8c89e418986efd8aa08 (diff)
parenta67d0bfb97f2c2e0b2cd7a303accd70c95911275 (diff)
downloadprosody-4c6a84a00ef37846e432ba76e3771087d23cceb1.tar.gz
prosody-4c6a84a00ef37846e432ba76e3771087d23cceb1.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