1 files changed, 7 insertions, 5 deletions
diff --git a/Swiften/TLS/ServerIdentityVerifier.cpp b/Swiften/TLS/ServerIdentityVerifier.cpp
index 226e94b..18ea2aa 100644
--- a/Swiften/TLS/ServerIdentityVerifier.cpp
+++ b/Swiften/TLS/ServerIdentityVerifier.cpp
@@ -12,7 +12,7 @@
 
 namespace Swift {
 
-ServerIdentityVerifier::ServerIdentityVerifier(const JID& jid, IDNConverter* idnConverter) : domainValid(false) {
+ServerIdentityVerifier::ServerIdentityVerifier(const JID& jid, IDNConverter* idnConverter, bool checkServer) : domainValid(false), checkServer_(checkServer) {
     domain = jid.getDomain();
     boost::optional<std::string> domainResult = idnConverter->getIDNAEncoded(domain);
     if (!!domainResult) {
@@ -36,12 +36,14 @@ bool ServerIdentityVerifier::certificateVerifies(Certificate::ref certificate) {
     }
     hasSAN |= !dnsNames.empty();
 
+    std::string prefix = (checkServer_) ? "_xmpp-server." : "_xmpp-client.";
+
     // SRV names
     std::vector<std::string> srvNames = certificate->getSRVNames();
     for (const auto& srvName : srvNames) {
         // Only match SRV names that begin with the service; this isn't required per
         // spec, but we're being purist about this.
-        if (boost::starts_with(srvName, "_xmpp-client.") && matchesDomain(srvName.substr(std::string("_xmpp-client.").size(), srvName.npos))) {
+        if (boost::starts_with(srvName, prefix) && matchesDomain(srvName.substr(prefix.size(), srvName.npos))) {
             return true;
         }
     }
@@ -80,15 +82,15 @@ bool ServerIdentityVerifier::matchesDomain(const std::string& s) const {
         if (dotIndex != matchDomain.npos) {
             matchDomain = matchDomain.substr(dotIndex + 1, matchDomain.npos);
         }
-        return matchString == matchDomain;
+        return boost::iequals(matchString, matchDomain);
     }
     else {
-        return s == encodedDomain;
+        return boost::iequals(s, encodedDomain);
     }
 }
 
 bool ServerIdentityVerifier::matchesAddress(const std::string& s) const {
-    return s == domain;
+    return boost::iequals(s, domain);
 }
 
 }