projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
41e88b6
)
Merge 0.10->trunk
author
Matthew Wild
<mwild1@gmail.com>
Sat, 26 Mar 2016 20:17:59 +0000
(20:17 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Sat, 26 Mar 2016 20:17:59 +0000
(20:17 +0000)
core/certmanager.lua
patch
|
blob
|
history
diff --git
a/core/certmanager.lua
b/core/certmanager.lua
index a4c9d891cbc2424003bdfb07681a5b8d1cb1a08b..29a5a6c8403906428bddec299950a79efaf5f506 100644
(file)
--- 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;