13 files changed, 51 insertions, 38 deletions
diff --git a/Swiften/Component/Component.cpp b/Swiften/Component/Component.cpp
index af378a7..a53f514 100644
--- a/Swiften/Component/Component.cpp
+++ b/Swiften/Component/Component.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -10,7 +10,7 @@
 
 namespace Swift {
 
-Component::Component(EventLoop* eventLoop, NetworkFactories* networkFactories, const JID& jid, const std::string& secret) : CoreComponent(eventLoop, networkFactories, jid, secret) {
+Component::Component(const JID& jid, const std::string& secret, NetworkFactories* networkFactories) : CoreComponent(jid, secret, networkFactories) {
 	softwareVersionResponder = new SoftwareVersionResponder(getIQRouter());
 	softwareVersionResponder->start();
 }
diff --git a/Swiften/Component/Component.h b/Swiften/Component/Component.h
index f3ae9e8..3ead1a5 100644
--- a/Swiften/Component/Component.h
+++ b/Swiften/Component/Component.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -20,7 +20,7 @@ namespace Swift {
 	 */
 	class SWIFTEN_API Component : public CoreComponent {
 		public:
-			Component(EventLoop* eventLoop, NetworkFactories* networkFactories, const JID& jid, const std::string& secret);
+			Component(const JID& jid, const std::string& secret, NetworkFactories* networkFactories);
 			~Component();
 
 			/**
diff --git a/Swiften/Component/ComponentConnector.cpp b/Swiften/Component/ComponentConnector.cpp
index b7bdd34..0dd8e82 100644
--- a/Swiften/Component/ComponentConnector.cpp
+++ b/Swiften/Component/ComponentConnector.cpp
@@ -104,4 +104,4 @@ void ComponentConnector::handleTimeout() {
 	finish(boost::shared_ptr<Connection>());
 }
 
-};
+}
diff --git a/Swiften/Component/ComponentConnector.h b/Swiften/Component/ComponentConnector.h
index 549457b..0e35ab2 100644
--- a/Swiften/Component/ComponentConnector.h
+++ b/Swiften/Component/ComponentConnector.h
@@ -62,4 +62,4 @@ namespace Swift {
 			std::deque<HostAddress> addressQueryResults;
 			boost::shared_ptr<Connection> currentConnection;
 	};
-};
+}
diff --git a/Swiften/Component/ComponentError.h b/Swiften/Component/ComponentError.h
index 928af2a..9c54b53 100644
--- a/Swiften/Component/ComponentError.h
+++ b/Swiften/Component/ComponentError.h
@@ -16,7 +16,7 @@ namespace Swift {
 				ConnectionWriteError,
 				XMLError,
 				AuthenticationFailedError,
-				UnexpectedElementError,
+				UnexpectedElementError
 			};
 
 			ComponentError(Type type = UnknownError) : type_(type) {}
diff --git a/Swiften/Component/ComponentHandshakeGenerator.cpp b/Swiften/Component/ComponentHandshakeGenerator.cpp
index 79ba9b3..495d530 100644
--- a/Swiften/Component/ComponentHandshakeGenerator.cpp
+++ b/Swiften/Component/ComponentHandshakeGenerator.cpp
@@ -6,19 +6,19 @@
 
 #include <Swiften/Component/ComponentHandshakeGenerator.h>
 #include <Swiften/StringCodecs/Hexify.h>
-#include <Swiften/StringCodecs/SHA1.h>
 #include <Swiften/Base/String.h>
+#include <Swiften/Crypto/CryptoProvider.h>
 
 namespace Swift {
 
-std::string ComponentHandshakeGenerator::getHandshake(const std::string& streamID, const std::string& secret) {
+std::string ComponentHandshakeGenerator::getHandshake(const std::string& streamID, const std::string& secret, CryptoProvider* crypto) {
 	std::string concatenatedString = streamID + secret;
 	String::replaceAll(concatenatedString, '&', "&amp;");
 	String::replaceAll(concatenatedString, '<', "&lt;");
 	String::replaceAll(concatenatedString, '>', "&gt;");
 	String::replaceAll(concatenatedString, '\'', "&apos;");
 	String::replaceAll(concatenatedString, '"', "&quot;");
-	return Hexify::hexify(SHA1::getHash(createByteArray(concatenatedString)));
+	return Hexify::hexify(crypto->getSHA1Hash(createByteArray(concatenatedString)));
 }
 
 }
diff --git a/Swiften/Component/ComponentHandshakeGenerator.h b/Swiften/Component/ComponentHandshakeGenerator.h
index c897fdc..e0e3ef8 100644
--- a/Swiften/Component/ComponentHandshakeGenerator.h
+++ b/Swiften/Component/ComponentHandshakeGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -11,9 +11,11 @@
 #include <Swiften/Base/API.h>
 
 namespace Swift {
+	class CryptoProvider;
+
 	class SWIFTEN_API ComponentHandshakeGenerator {
 		public:
-			static std::string getHandshake(const std::string& streamID, const std::string& secret);
+			static std::string getHandshake(const std::string& streamID, const std::string& secret, CryptoProvider* crypto);
 	};
 
 }
diff --git a/Swiften/Component/ComponentSession.cpp b/Swiften/Component/ComponentSession.cpp
index 3269f23..7925b23 100644
--- a/Swiften/Component/ComponentSession.cpp
+++ b/Swiften/Component/ComponentSession.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -17,7 +17,7 @@
 
 namespace Swift {
 
-ComponentSession::ComponentSession(const JID& jid, const std::string& secret, boost::shared_ptr<SessionStream> stream) : jid(jid), secret(secret), stream(stream), state(Initial) {
+ComponentSession::ComponentSession(const JID& jid, const std::string& secret, boost::shared_ptr<SessionStream> stream, CryptoProvider* crypto) : jid(jid), secret(secret), stream(stream), crypto(crypto), state(Initial) {
 }
 
 ComponentSession::~ComponentSession() {
@@ -46,7 +46,7 @@ void ComponentSession::sendStanza(boost::shared_ptr<Stanza> stanza) {
 void ComponentSession::handleStreamStart(const ProtocolHeader& header) {
 	checkState(WaitingForStreamStart);
 	state = Authenticating;
-	stream->writeElement(ComponentHandshake::ref(new ComponentHandshake(ComponentHandshakeGenerator::getHandshake(header.getID(), secret))));
+	stream->writeElement(ComponentHandshake::ref(new ComponentHandshake(ComponentHandshakeGenerator::getHandshake(header.getID(), secret, crypto))));
 }
 
 void ComponentSession::handleElement(boost::shared_ptr<Element> element) {
diff --git a/Swiften/Component/ComponentSession.h b/Swiften/Component/ComponentSession.h
index 073c3f4..3103335 100644
--- a/Swiften/Component/ComponentSession.h
+++ b/Swiften/Component/ComponentSession.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -20,6 +20,7 @@
 
 namespace Swift {
 	class ComponentAuthenticator;
+	class CryptoProvider;
 
 	class SWIFTEN_API ComponentSession : public boost::enable_shared_from_this<ComponentSession> {
 		public:
@@ -35,15 +36,15 @@ namespace Swift {
 			struct Error : public Swift::Error {
 				enum Type {
 					AuthenticationFailedError,
-					UnexpectedElementError,
+					UnexpectedElementError
 				} type;
 				Error(Type type) : type(type) {}
 			};
 
 			~ComponentSession();
 
-			static boost::shared_ptr<ComponentSession> create(const JID& jid, const std::string& secret, boost::shared_ptr<SessionStream> stream) {
-				return boost::shared_ptr<ComponentSession>(new ComponentSession(jid, secret, stream));
+			static boost::shared_ptr<ComponentSession> create(const JID& jid, const std::string& secret, boost::shared_ptr<SessionStream> stream, CryptoProvider* crypto) {
+				return boost::shared_ptr<ComponentSession>(new ComponentSession(jid, secret, stream, crypto));
 			}
 
 			State getState() const {
@@ -61,7 +62,7 @@ namespace Swift {
 			boost::signal<void (boost::shared_ptr<Stanza>)> onStanzaReceived;
 		
 		private:
-			ComponentSession(const JID& jid, const std::string& secret, boost::shared_ptr<SessionStream>);
+			ComponentSession(const JID& jid, const std::string& secret, boost::shared_ptr<SessionStream>, CryptoProvider*);
 
 			void finishSession(Error::Type error);
 			void finishSession(boost::shared_ptr<Swift::Error> error);
@@ -78,6 +79,7 @@ namespace Swift {
 			JID jid;
 			std::string secret;
 			boost::shared_ptr<SessionStream> stream;
+			CryptoProvider* crypto;
 			boost::shared_ptr<Swift::Error> error;
 			State state;
 	};
diff --git a/Swiften/Component/CoreComponent.cpp b/Swiften/Component/CoreComponent.cpp
index e11d2b0..d2cc7aa 100644
--- a/Swiften/Component/CoreComponent.cpp
+++ b/Swiften/Component/CoreComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -20,7 +20,7 @@
 
 namespace Swift {
 
-CoreComponent::CoreComponent(EventLoop* eventLoop, NetworkFactories* networkFactories, const JID& jid, const std::string& secret) : eventLoop(eventLoop), networkFactories(networkFactories), resolver_(eventLoop), jid_(jid), secret_(secret), disconnectRequested_(false) {
+CoreComponent::CoreComponent(const JID& jid, const std::string& secret, NetworkFactories* networkFactories) : networkFactories(networkFactories), jid_(jid), secret_(secret), disconnectRequested_(false) {
 	stanzaChannel_ = new ComponentSessionStanzaChannel();
 	stanzaChannel_->onMessageReceived.connect(boost::ref(onMessageReceived));
 	stanzaChannel_->onPresenceReceived.connect(boost::ref(onPresenceReceived));
@@ -44,7 +44,7 @@ CoreComponent::~CoreComponent() {
 
 void CoreComponent::connect(const std::string& host, int port) {
 	assert(!connector_);
-	connector_ = ComponentConnector::create(host, port, &resolver_, networkFactories->getConnectionFactory(), networkFactories->getTimerFactory());
+	connector_ = ComponentConnector::create(host, port, networkFactories->getDomainNameResolver(), networkFactories->getConnectionFactory(), networkFactories->getTimerFactory());
 	connector_->onConnectFinished.connect(boost::bind(&CoreComponent::handleConnectorFinished, this, _1));
 	connector_->setTimeoutMilliseconds(60*1000);
 	connector_->start();
@@ -67,7 +67,7 @@ void CoreComponent::handleConnectorFinished(boost::shared_ptr<Connection> connec
 		sessionStream_->onDataRead.connect(boost::bind(&CoreComponent::handleDataRead, this, _1));
 		sessionStream_->onDataWritten.connect(boost::bind(&CoreComponent::handleDataWritten, this, _1));
 
-		session_ = ComponentSession::create(jid_, secret_, sessionStream_);
+		session_ = ComponentSession::create(jid_, secret_, sessionStream_, networkFactories->getCryptoProvider());
 		stanzaChannel_->setSession(session_);
 		session_->onFinished.connect(boost::bind(&CoreComponent::handleSessionFinished, this, _1));
 		session_->start();
@@ -85,9 +85,9 @@ void CoreComponent::disconnect() {
 		connector_->stop();
 		assert(!session_);
 	}
-	assert(!session_);
-	assert(!sessionStream_);
-	assert(!connector_);
+	//assert(!session_); /* commenting out until we have time to refactor to be like CoreClient */
+	//assert(!sessionStream_);
+	//assert(!connector_);
 	disconnectRequested_ = false;
 }
 
diff --git a/Swiften/Component/CoreComponent.h b/Swiften/Component/CoreComponent.h
index 4f39ffd..63b68f6 100644
--- a/Swiften/Component/CoreComponent.h
+++ b/Swiften/Component/CoreComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -11,7 +11,6 @@
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Base/Error.h>
-#include <Swiften/Network/PlatformDomainNameResolver.h>
 #include <Swiften/Component/ComponentConnector.h>
 #include <Swiften/Component/ComponentSession.h>
 #include <Swiften/Component/ComponentError.h>
@@ -26,6 +25,7 @@
 #include <Swiften/Base/SafeByteArray.h>
 
 namespace Swift {
+	class EventLoop;
 	class IQRouter;
 	class NetworkFactories;
 	class ComponentSession;
@@ -43,7 +43,7 @@ namespace Swift {
 	 */
 	class SWIFTEN_API CoreComponent : public Entity {
 		public:
-			CoreComponent(EventLoop* eventLoop, NetworkFactories* networkFactories, const JID& jid, const std::string& secret);
+			CoreComponent(const JID& jid, const std::string& secret, NetworkFactories* networkFactories);
 			~CoreComponent();
 
 			void connect(const std::string& host, int port);
@@ -88,9 +88,7 @@ namespace Swift {
 			void handleDataWritten(const SafeByteArray&);
 
 		private:
-			EventLoop* eventLoop;
 			NetworkFactories* networkFactories;
-			PlatformDomainNameResolver resolver_;
 			JID jid_;
 			std::string secret_;
 			ComponentSessionStanzaChannel* stanzaChannel_;
diff --git a/Swiften/Component/UnitTest/ComponentHandshakeGeneratorTest.cpp b/Swiften/Component/UnitTest/ComponentHandshakeGeneratorTest.cpp
index fd8f6fc..280e46e 100644
--- a/Swiften/Component/UnitTest/ComponentHandshakeGeneratorTest.cpp
+++ b/Swiften/Component/UnitTest/ComponentHandshakeGeneratorTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -8,6 +8,8 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include <Swiften/Component/ComponentHandshakeGenerator.h>
+#include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/Crypto/PlatformCryptoProvider.h>
 
 using namespace Swift;
 
@@ -18,16 +20,22 @@ class ComponentHandshakeGeneratorTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
+		void setUp() {
+			crypto = boost::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
+		}
+
 		void testGetHandshake() {
-			std::string result = ComponentHandshakeGenerator::getHandshake("myid", "mysecret");
+			std::string result = ComponentHandshakeGenerator::getHandshake("myid", "mysecret", crypto.get());
 			CPPUNIT_ASSERT_EQUAL(std::string("4011cd31f9b99ac089a0cd7ce297da7323fa2525"), result);
 		}
 
 		void testGetHandshake_SpecialChars() {
-			std::string result = ComponentHandshakeGenerator::getHandshake("&<", ">'\"");
+			std::string result = ComponentHandshakeGenerator::getHandshake("&<", ">'\"", crypto.get());
 			CPPUNIT_ASSERT_EQUAL(std::string("33631b3e0aaeb2a11c4994c917919324028873fe"), result);
 		}
 
+	private:
+		boost::shared_ptr<CryptoProvider> crypto;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ComponentHandshakeGeneratorTest);
diff --git a/Swiften/Component/UnitTest/ComponentSessionTest.cpp b/Swiften/Component/UnitTest/ComponentSessionTest.cpp
index 238d0b0..0533645 100644
--- a/Swiften/Component/UnitTest/ComponentSessionTest.cpp
+++ b/Swiften/Component/UnitTest/ComponentSessionTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -14,6 +14,8 @@
 #include <Swiften/Component/ComponentSession.h>
 #include <Swiften/Elements/ComponentHandshake.h>
 #include <Swiften/Elements/AuthFailure.h>
+#include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/Crypto/PlatformCryptoProvider.h>
 
 using namespace Swift;
 
@@ -28,6 +30,7 @@ class ComponentSessionTest : public CppUnit::TestFixture {
 		void setUp() {
 			server = boost::make_shared<MockSessionStream>();
 			sessionFinishedReceived = false;
+			crypto = boost::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
 		}
 
 		void testStart() {
@@ -70,7 +73,7 @@ class ComponentSessionTest : public CppUnit::TestFixture {
 
 	private:
 		boost::shared_ptr<ComponentSession> createSession() {
-			boost::shared_ptr<ComponentSession> session = ComponentSession::create(JID("service.foo.com"), "servicesecret", server);
+			boost::shared_ptr<ComponentSession> session = ComponentSession::create(JID("service.foo.com"), "servicesecret", server, crypto.get());
 			session->onFinished.connect(boost::bind(&ComponentSessionTest::handleSessionFinished, this, _1));
 			return session;
 		}
@@ -210,8 +213,8 @@ class ComponentSessionTest : public CppUnit::TestFixture {
 
 		boost::shared_ptr<MockSessionStream> server;
 		bool sessionFinishedReceived;
-		bool needCredentials;
 		boost::shared_ptr<Error> sessionFinishedError;
+		boost::shared_ptr<CryptoProvider> crypto;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ComponentSessionTest);