2 files changed, 35 insertions, 3 deletions
diff --git a/Swiften/TLS/ServerIdentityVerifier.cpp b/Swiften/TLS/ServerIdentityVerifier.cpp
index da116e5..18ea2aa 100644
--- a/Swiften/TLS/ServerIdentityVerifier.cpp
+++ b/Swiften/TLS/ServerIdentityVerifier.cpp
@@ -79,18 +79,18 @@ bool ServerIdentityVerifier::matchesDomain(const std::string& s) const {
         std::string matchString(s.substr(2, s.npos));
         std::string matchDomain = encodedDomain;
         size_t dotIndex = matchDomain.find('.');
         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);
 }
 
 }
diff --git a/Swiften/TLS/UnitTest/ServerIdentityVerifierTest.cpp b/Swiften/TLS/UnitTest/ServerIdentityVerifierTest.cpp
index 7379b69..47f3db2 100644
--- a/Swiften/TLS/UnitTest/ServerIdentityVerifierTest.cpp
+++ b/Swiften/TLS/UnitTest/ServerIdentityVerifierTest.cpp
@@ -57,12 +57,20 @@ class ServerIdentityVerifierTest : public CppUnit::TestFixture {
             SimpleCertificate::ref certificate(new SimpleCertificate());
             certificate->addDNSName("bar.com");
 
             CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
         }
 
+        void testCertificateVerifies_WithMatchingDNSNameMixedCase() {
+            ServerIdentityVerifier testling(JID("foo@baR.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addDNSName("Bar.com");
+
+            CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
+        }
+
         void testCertificateVerifies_WithSecondMatchingDNSName() {
             ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
             SimpleCertificate::ref certificate(new SimpleCertificate());
             certificate->addDNSName("foo.com");
             certificate->addDNSName("bar.com");
 
@@ -156,28 +164,52 @@ class ServerIdentityVerifierTest : public CppUnit::TestFixture {
             SimpleCertificate::ref certificate(new SimpleCertificate());
             certificate->addXMPPAddress("bar.com");
 
             CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
         }
 
+        void testCertificateVerifies_WithMatchingXmppAddrMixedCase() {
+            ServerIdentityVerifier testling(JID("foo@baR.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addXMPPAddress("bAr.com");
+
+            CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
+        }
+
         void testCertificateVerifies_WithMatchingXmppAddrWithWildcard() {
             ServerIdentityVerifier testling(JID("foo@im.bar.com/baz"), idnConverter.get());
             SimpleCertificate::ref certificate(new SimpleCertificate());
             certificate->addXMPPAddress("*.bar.com");
 
             CPPUNIT_ASSERT(!testling.certificateVerifies(certificate));
         }
 
+        void testCertificateVerifies_WithMatchingXmppAddrWithWildcardMixedCase() {
+            ServerIdentityVerifier testling(JID("foo@im.bAr.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addXMPPAddress("*.baR.com");
+
+            CPPUNIT_ASSERT(!testling.certificateVerifies(certificate));
+        }
+
         void testCertificateVerifies_WithMatchingInternationalXmppAddr() {
             ServerIdentityVerifier testling(JID("foo@tron\xc3\xa7.com/baz"), idnConverter.get());
             SimpleCertificate::ref certificate(new SimpleCertificate());
             certificate->addXMPPAddress("tron\xc3\xa7.com");
 
             CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
         }
 
+        void testCertificateVerifies_WithMatchingInternationalXmppAddrMixedCase() {
+            ServerIdentityVerifier testling(JID("foo@tRon\xc3\xa7.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addXMPPAddress("trOn\xc3\xa7.com");
+
+            CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
+        }
+
         void testCertificateVerifies_WithMatchingCNWithoutSAN() {
             ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
             SimpleCertificate::ref certificate(new SimpleCertificate());
             certificate->addCommonName("bar.com");
 
             CPPUNIT_ASSERT(testling.certificateVerifies(certificate));