Merge 0.10->trunk

[prosody.git] / util / x509.lua

diff --git a/util/x509.lua b/util/x509.lua
index 1a4f5f38380021a241f06a413218af70e1d4d4ec..bf8d390661da35459434b16cee2b063b7849d8eb 100644 (file)
--- a/util/x509.lua
+++ b/util/x509.lua
@@ -22,10 +22,7 @@ local nameprep = require "util.encodings".stringprep.nameprep;
 local idna_to_ascii = require "util.encodings".idna.to_ascii;
 local base64 = require "util.encodings".base64;
 local log = require "util.logger".init("x509");
-local pairs, ipairs = pairs, ipairs;
 local s_format = string.format;
-local t_insert = table.insert;
-local t_concat = table.concat;
 
 module "x509"
 
@@ -151,6 +148,9 @@ local function compare_srvname(host, service, asserted_names)
 end
 
 function verify_identity(host, service, cert)
+       if cert.setencode then
+               cert:setencode("utf8");
+       end
        local ext = cert:extensions()
        if ext[oid_subjectaltname] then
                local sans = ext[oid_subjectaltname];