prosody
6cc48b51d699
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 6612:6cc48b51d699

prosodyctl: Use ssl.loadcertificate instead of ssl.x509.load, as the ssl.x509 export dissapears in 97b1974 or 356e03a
author Kim Alvefur <zash@zash.se>
date Thu, 02 Apr 2015 14:31:41 +0200
parent 6611:65dd3770bcb0
child 6637:ecc039288edc
comparison
equal deleted inserted replaced
6611:65dd3770bcb0 6612:6cc48b51d699
1092 local cert_ok; 1092 local cert_ok;
1093 print"Checking certificates..." 1093 print"Checking certificates..."
1094 local x509_verify_identity = require"util.x509".verify_identity; 1094 local x509_verify_identity = require"util.x509".verify_identity;
1095 local ssl = dependencies.softreq"ssl"; 1095 local ssl = dependencies.softreq"ssl";
1096 -- local datetime_parse = require"util.datetime".parse_x509; 1096 -- local datetime_parse = require"util.datetime".parse_x509;
1097 local load_cert = ssl and ssl.x509 and ssl.x509.load; 1097 local load_cert = ssl and ssl.loadcertificate;
1098 -- or ssl.cert_from_pem 1098 -- or ssl.cert_from_pem
1099 if not ssl then 1099 if not ssl then
1100 print("LuaSec not available, can't perform certificate checks") 1100 print("LuaSec not available, can't perform certificate checks")
1101 if what == "certs" then cert_ok = false end 1101 if what == "certs" then cert_ok = false end
1102 elseif not load_cert then 1102 elseif not load_cert then