Merge 0.9 -> 0.10

[prosody.git] / util / x509.lua

diff --git a/util/x509.lua b/util/x509.lua
index d3c55bb40b9376e3db03f9814690a1d687a9706a..857f02a409087e3dc8716ca2e4c8ba6f91ae9d82 100644 (file)
--- a/util/x509.lua
+++ b/util/x509.lua
@@ -21,6 +21,10 @@
 local nameprep = require "util.encodings".stringprep.nameprep;
 local idna_to_ascii = require "util.encodings".idna.to_ascii;
 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"
 
@@ -157,7 +161,9 @@ function verify_identity(host, service, cert)
 
                if sans[oid_xmppaddr] then
                        had_supported_altnames = true
-                       if compare_xmppaddr(host, sans[oid_xmppaddr]) then return true end
+                       if service == "_xmpp-client" or service == "_xmpp-server" then
+                               if compare_xmppaddr(host, sans[oid_xmppaddr]) then return true end
+                       end
                end
 
                if sans[oid_dnssrv] then