aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-03-26 20:17:59 +0000
committerMatthew Wild <mwild1@gmail.com>2016-03-26 20:17:59 +0000
commitde9765e47979b869c15302e9b7ebb69cc4f9503c (patch)
tree3cab508593e54c925311eb26dca38f0bc86ee3d4
parent4173551bfe86132de4392086b91988ee91c46cd0 (diff)
parent71b31dde2564da080341c4b72500e3832afbfe60 (diff)
downloadprosody-de9765e47979b869c15302e9b7ebb69cc4f9503c.tar.gz
prosody-de9765e47979b869c15302e9b7ebb69cc4f9503c.zip
Merge 0.10->trunk
-rw-r--r--core/certmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index a4c9d891..29a5a6c8 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -36,7 +36,7 @@ local resolve_path = require"util.paths".resolve_relative_path;
local config_path = prosody.paths.config;
local luasec_major, luasec_minor = ssl._VERSION:match("^(%d+)%.(%d+)");
-local luasec_version = luasec_major * 100 + luasec_minor;
+local luasec_version = tonumber(luasec_major) * 100 + tonumber(luasec_minor);
local luasec_has = {
-- TODO If LuaSec ever starts exposing these things itself, use that instead
cipher_server_preference = luasec_version >= 2;