2 files changed, 164 insertions, 164 deletions
diff --git a/Swiften/TLS/UnitTest/CertificateTest.cpp b/Swiften/TLS/UnitTest/CertificateTest.cpp
index 8e9c205..2483dae 100644
--- a/Swiften/TLS/UnitTest/CertificateTest.cpp
+++ b/Swiften/TLS/UnitTest/CertificateTest.cpp
@@ -1,34 +1,34 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include <Swiften/Base/ByteArray.h>
+#include <memory>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
-#include <boost/smart_ptr/make_shared.hpp>
 
-#include <Swiften/TLS/Certificate.h>
-#include <Swiften/TLS/SimpleCertificate.h>
+#include <Swiften/Base/ByteArray.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Crypto/PlatformCryptoProvider.h>
+#include <Swiften/TLS/Certificate.h>
+#include <Swiften/TLS/SimpleCertificate.h>
 
 using namespace Swift;
 
 class CertificateTest : public CppUnit::TestFixture {
-		CPPUNIT_TEST_SUITE(CertificateTest);
-		CPPUNIT_TEST(testGetSHA1Fingerprint);
-		CPPUNIT_TEST_SUITE_END();
+        CPPUNIT_TEST_SUITE(CertificateTest);
+        CPPUNIT_TEST(testGetSHA1Fingerprint);
+        CPPUNIT_TEST_SUITE_END();
 
-	public:
-		void testGetSHA1Fingerprint() {
-			SimpleCertificate::ref testling = boost::make_shared<SimpleCertificate>();
-			testling->setDER(createByteArray("abcdefg"));
+    public:
+        void testGetSHA1Fingerprint() {
+            SimpleCertificate::ref testling = std::make_shared<SimpleCertificate>();
+            testling->setDER(createByteArray("abcdefg"));
 
-			CPPUNIT_ASSERT_EQUAL(std::string("2f:b5:e1:34:19:fc:89:24:68:65:e7:a3:24:f4:76:ec:62:4e:87:40"), Certificate::getSHA1Fingerprint(testling, boost::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create()).get()));
-		}
+            CPPUNIT_ASSERT_EQUAL(std::string("2f:b5:e1:34:19:fc:89:24:68:65:e7:a3:24:f4:76:ec:62:4e:87:40"), Certificate::getSHA1Fingerprint(testling, std::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create()).get()));
+        }
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(CertificateTest);
diff --git a/Swiften/TLS/UnitTest/ServerIdentityVerifierTest.cpp b/Swiften/TLS/UnitTest/ServerIdentityVerifierTest.cpp
index a82cd2e..30fe423 100644
--- a/Swiften/TLS/UnitTest/ServerIdentityVerifierTest.cpp
+++ b/Swiften/TLS/UnitTest/ServerIdentityVerifierTest.cpp
@@ -1,178 +1,178 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include <Swiften/Base/ByteArray.h>
+#include <vector>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
-#include <vector>
 
-#include <Swiften/TLS/ServerIdentityVerifier.h>
-#include <Swiften/TLS/SimpleCertificate.h>
+#include <Swiften/Base/ByteArray.h>
 #include <Swiften/IDN/IDNConverter.h>
 #include <Swiften/IDN/PlatformIDNConverter.h>
+#include <Swiften/TLS/ServerIdentityVerifier.h>
+#include <Swiften/TLS/SimpleCertificate.h>
 
 using namespace Swift;
 
 class ServerIdentityVerifierTest : public CppUnit::TestFixture {
-		CPPUNIT_TEST_SUITE(ServerIdentityVerifierTest);
-		CPPUNIT_TEST(testCertificateVerifies_WithoutMatchingDNSName);
-		CPPUNIT_TEST(testCertificateVerifies_WithMatchingDNSName);
-		CPPUNIT_TEST(testCertificateVerifies_WithSecondMatchingDNSName);
-		CPPUNIT_TEST(testCertificateVerifies_WithMatchingInternationalDNSName);
-		CPPUNIT_TEST(testCertificateVerifies_WithMatchingDNSNameWithWildcard);
-		CPPUNIT_TEST(testCertificateVerifies_WithMatchingDNSNameWithWildcardMatchingNoComponents);
-		CPPUNIT_TEST(testCertificateVerifies_WithDNSNameWithWildcardMatchingTwoComponents);
-		CPPUNIT_TEST(testCertificateVerifies_WithMatchingSRVNameWithoutService);
-		CPPUNIT_TEST(testCertificateVerifies_WithMatchingSRVNameWithService);
-		CPPUNIT_TEST(testCertificateVerifies_WithMatchingSRVNameWithServiceAndWildcard);
-		CPPUNIT_TEST(testCertificateVerifies_WithMatchingSRVNameWithDifferentService);
-		CPPUNIT_TEST(testCertificateVerifies_WithMatchingXmppAddr);
-		CPPUNIT_TEST(testCertificateVerifies_WithMatchingXmppAddrWithWildcard);
-		CPPUNIT_TEST(testCertificateVerifies_WithMatchingInternationalXmppAddr);
-		CPPUNIT_TEST(testCertificateVerifies_WithMatchingCNWithoutSAN);
-		CPPUNIT_TEST(testCertificateVerifies_WithMatchingCNWithSAN);
-		CPPUNIT_TEST_SUITE_END();
-
-	public:
-		void setUp() {
-			idnConverter = boost::shared_ptr<IDNConverter>(PlatformIDNConverter::create());
-		}
-
-		void testCertificateVerifies_WithoutMatchingDNSName() {
-			ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
-			SimpleCertificate::ref certificate(new SimpleCertificate());
-			certificate->addDNSName("foo.com");
-
-			CPPUNIT_ASSERT(!testling.certificateVerifies(certificate));
-		}
-
-		void testCertificateVerifies_WithMatchingDNSName() {
-			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");
-
-			CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
-		}
-
-		void testCertificateVerifies_WithMatchingInternationalDNSName() {
-			ServerIdentityVerifier testling(JID("foo@tron\xc3\xa7on.com/baz"), idnConverter.get());
-			SimpleCertificate::ref certificate(new SimpleCertificate());
-			certificate->addDNSName("xn--tronon-zua.com");
-
-			CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
-		}
-
-		void testCertificateVerifies_WithMatchingDNSNameWithWildcard() {
-			ServerIdentityVerifier testling(JID("foo@im.bar.com/baz"), idnConverter.get());
-			SimpleCertificate::ref certificate(new SimpleCertificate());
-			certificate->addDNSName("*.bar.com");
-
-			CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
-		}
-
-		void testCertificateVerifies_WithMatchingDNSNameWithWildcardMatchingNoComponents() {
-			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_WithDNSNameWithWildcardMatchingTwoComponents() {
-			ServerIdentityVerifier testling(JID("foo@xmpp.im.bar.com/baz"), idnConverter.get());
-			SimpleCertificate::ref certificate(new SimpleCertificate());
-			certificate->addDNSName("*.bar.com");
-
-			CPPUNIT_ASSERT(!testling.certificateVerifies(certificate));
-		}
-
-		void testCertificateVerifies_WithMatchingSRVNameWithoutService() {
-			ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
-			SimpleCertificate::ref certificate(new SimpleCertificate());
-			certificate->addSRVName("bar.com");
-
-			CPPUNIT_ASSERT(!testling.certificateVerifies(certificate));
-		}
-
-		void testCertificateVerifies_WithMatchingSRVNameWithService() {
-			ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
-			SimpleCertificate::ref certificate(new SimpleCertificate());
-			certificate->addSRVName("_xmpp-client.bar.com");
-
-			CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
-		}
-
-		void testCertificateVerifies_WithMatchingSRVNameWithServiceAndWildcard() {
-			ServerIdentityVerifier testling(JID("foo@im.bar.com/baz"), idnConverter.get());
-			SimpleCertificate::ref certificate(new SimpleCertificate());
-			certificate->addSRVName("_xmpp-client.*.bar.com");
-
-			CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
-		}
-
-		void testCertificateVerifies_WithMatchingSRVNameWithDifferentService() {
-			ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
-			SimpleCertificate::ref certificate(new SimpleCertificate());
-			certificate->addSRVName("_xmpp-server.bar.com");
-
-			CPPUNIT_ASSERT(!testling.certificateVerifies(certificate));
-		}
-
-		void testCertificateVerifies_WithMatchingXmppAddr() {
-			ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
-			SimpleCertificate::ref certificate(new SimpleCertificate());
-			certificate->addXMPPAddress("bar.com");
+        CPPUNIT_TEST_SUITE(ServerIdentityVerifierTest);
+        CPPUNIT_TEST(testCertificateVerifies_WithoutMatchingDNSName);
+        CPPUNIT_TEST(testCertificateVerifies_WithMatchingDNSName);
+        CPPUNIT_TEST(testCertificateVerifies_WithSecondMatchingDNSName);
+        CPPUNIT_TEST(testCertificateVerifies_WithMatchingInternationalDNSName);
+        CPPUNIT_TEST(testCertificateVerifies_WithMatchingDNSNameWithWildcard);
+        CPPUNIT_TEST(testCertificateVerifies_WithMatchingDNSNameWithWildcardMatchingNoComponents);
+        CPPUNIT_TEST(testCertificateVerifies_WithDNSNameWithWildcardMatchingTwoComponents);
+        CPPUNIT_TEST(testCertificateVerifies_WithMatchingSRVNameWithoutService);
+        CPPUNIT_TEST(testCertificateVerifies_WithMatchingSRVNameWithService);
+        CPPUNIT_TEST(testCertificateVerifies_WithMatchingSRVNameWithServiceAndWildcard);
+        CPPUNIT_TEST(testCertificateVerifies_WithMatchingSRVNameWithDifferentService);
+        CPPUNIT_TEST(testCertificateVerifies_WithMatchingXmppAddr);
+        CPPUNIT_TEST(testCertificateVerifies_WithMatchingXmppAddrWithWildcard);
+        CPPUNIT_TEST(testCertificateVerifies_WithMatchingInternationalXmppAddr);
+        CPPUNIT_TEST(testCertificateVerifies_WithMatchingCNWithoutSAN);
+        CPPUNIT_TEST(testCertificateVerifies_WithMatchingCNWithSAN);
+        CPPUNIT_TEST_SUITE_END();
+
+    public:
+        void setUp() {
+            idnConverter = std::shared_ptr<IDNConverter>(PlatformIDNConverter::create());
+        }
+
+        void testCertificateVerifies_WithoutMatchingDNSName() {
+            ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addDNSName("foo.com");
+
+            CPPUNIT_ASSERT(!testling.certificateVerifies(certificate));
+        }
+
+        void testCertificateVerifies_WithMatchingDNSName() {
+            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");
+
+            CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
+        }
+
+        void testCertificateVerifies_WithMatchingInternationalDNSName() {
+            ServerIdentityVerifier testling(JID("foo@tron\xc3\xa7on.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addDNSName("xn--tronon-zua.com");
+
+            CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
+        }
+
+        void testCertificateVerifies_WithMatchingDNSNameWithWildcard() {
+            ServerIdentityVerifier testling(JID("foo@im.bar.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addDNSName("*.bar.com");
+
+            CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
+        }
+
+        void testCertificateVerifies_WithMatchingDNSNameWithWildcardMatchingNoComponents() {
+            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_WithDNSNameWithWildcardMatchingTwoComponents() {
+            ServerIdentityVerifier testling(JID("foo@xmpp.im.bar.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addDNSName("*.bar.com");
+
+            CPPUNIT_ASSERT(!testling.certificateVerifies(certificate));
+        }
+
+        void testCertificateVerifies_WithMatchingSRVNameWithoutService() {
+            ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addSRVName("bar.com");
+
+            CPPUNIT_ASSERT(!testling.certificateVerifies(certificate));
+        }
+
+        void testCertificateVerifies_WithMatchingSRVNameWithService() {
+            ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addSRVName("_xmpp-client.bar.com");
+
+            CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
+        }
+
+        void testCertificateVerifies_WithMatchingSRVNameWithServiceAndWildcard() {
+            ServerIdentityVerifier testling(JID("foo@im.bar.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addSRVName("_xmpp-client.*.bar.com");
+
+            CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
+        }
+
+        void testCertificateVerifies_WithMatchingSRVNameWithDifferentService() {
+            ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addSRVName("_xmpp-server.bar.com");
+
+            CPPUNIT_ASSERT(!testling.certificateVerifies(certificate));
+        }
+
+        void testCertificateVerifies_WithMatchingXmppAddr() {
+            ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addXMPPAddress("bar.com");
 
-			CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
-		}
+            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");
+        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));
-		}
+            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");
+        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));
-		}
+            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");
+        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));
-		}
+            CPPUNIT_ASSERT(testling.certificateVerifies(certificate));
+        }
 
-		void testCertificateVerifies_WithMatchingCNWithSAN() {
-			ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
-			SimpleCertificate::ref certificate(new SimpleCertificate());
-			certificate->addSRVName("foo.com");
-			certificate->addCommonName("bar.com");
+        void testCertificateVerifies_WithMatchingCNWithSAN() {
+            ServerIdentityVerifier testling(JID("foo@bar.com/baz"), idnConverter.get());
+            SimpleCertificate::ref certificate(new SimpleCertificate());
+            certificate->addSRVName("foo.com");
+            certificate->addCommonName("bar.com");
 
-			CPPUNIT_ASSERT(!testling.certificateVerifies(certificate));
-		}
+            CPPUNIT_ASSERT(!testling.certificateVerifies(certificate));
+        }
 
-		boost::shared_ptr<IDNConverter> idnConverter;
+        std::shared_ptr<IDNConverter> idnConverter;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ServerIdentityVerifierTest);