Software / code / prosody
Diff
util/x509.lua @ 6777:5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 21 Feb 2015 10:36:37 +0100 |
| parent | 6708:d2beb98ece29 |
| child | 8555:4f0f5b49bb03 |
line wrap: on
line diff
--- a/util/x509.lua Mon Aug 10 22:16:05 2015 +0200 +++ b/util/x509.lua Sat Feb 21 10:36:37 2015 +0100 @@ -24,7 +24,7 @@ local log = require "util.logger".init("x509"); local s_format = string.format; -module "x509" +local _ENV = nil; local oid_commonname = "2.5.4.3"; -- [LDAP] 2.3 local oid_subjectaltname = "2.5.29.17"; -- [PKIX] 4.2.1.6 @@ -147,7 +147,7 @@ return false end -function verify_identity(host, service, cert) +local function verify_identity(host, service, cert) if cert.setencode then cert:setencode("utf8"); end @@ -218,7 +218,7 @@ local pat = "%-%-%-%-%-BEGIN ([A-Z ]+)%-%-%-%-%-\r?\n".. "([0-9A-Za-z+/=\r\n]*)\r?\n%-%-%-%-%-END %1%-%-%-%-%-"; -function pem2der(pem) +local function pem2der(pem) local typ, data = pem:match(pat); if typ and data then return base64.decode(data), typ; @@ -228,10 +228,14 @@ local wrap = ('.'):rep(64); local envelope = "-----BEGIN %s-----\n%s\n-----END %s-----\n" -function der2pem(data, typ) +local function der2pem(data, typ) typ = typ and typ:upper() or "CERTIFICATE"; data = base64.encode(data); return s_format(envelope, typ, data:gsub(wrap, '%0\n', (#data-1)/64), typ); end -return _M; +return { + verify_identity = verify_identity; + pem2der = pem2der; + der2pem = der2pem; +};
