7 files changed, 13 insertions, 18 deletions
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index bee9d5c..08289a5 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -8,6 +8,8 @@
 
 #include <Swiften/Client/CoreClient.h>
 
+#include <Swiften/Base/SafeString.h>
+
 namespace Swift {
 	class SoftwareVersionResponder;
 	class BlindCertificateTrustChecker;
diff --git a/Swiften/Client/ClientSession.cpp b/Swiften/Client/ClientSession.cpp
index 57d9c12..8945e9a 100644
--- a/Swiften/Client/ClientSession.cpp
+++ b/Swiften/Client/ClientSession.cpp
@@ -12,7 +12,6 @@
 #include <boost/uuid/uuid_generators.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
-#include <Swiften/Base/SafeString.h>
 #include <Swiften/Elements/ProtocolHeader.h>
 #include <Swiften/Elements/StreamFeatures.h>
 #include <Swiften/Elements/StreamError.h>
@@ -339,7 +338,7 @@ bool ClientSession::checkState(State state) {
 	return true;
 }
 
-void ClientSession::sendCredentials(const SafeString& password) {
+void ClientSession::sendCredentials(const SafeByteArray& password) {
 	assert(WaitingForCredentials);
 	state = Authenticating;
 	authenticator->setCredentials(localJID.getNode(), password);
diff --git a/Swiften/Client/ClientSession.h b/Swiften/Client/ClientSession.h
index 246388a..ace9868 100644
--- a/Swiften/Client/ClientSession.h
+++ b/Swiften/Client/ClientSession.h
@@ -21,7 +21,6 @@
 namespace Swift {
 	class ClientAuthenticator;
 	class CertificateTrustChecker;
-	class SafeString;
 
 	class ClientSession : public boost::enable_shared_from_this<ClientSession> {
 		public:
@@ -105,7 +104,7 @@ namespace Swift {
 				return getState() == Finished;
 			}
 
-			void sendCredentials(const SafeString& password);
+			void sendCredentials(const SafeByteArray& password);
 			void sendStanza(boost::shared_ptr<Stanza>);
 
 			void setCertificateTrustChecker(CertificateTrustChecker* checker) {
diff --git a/Swiften/Client/ClientXMLTracer.cpp b/Swiften/Client/ClientXMLTracer.cpp
index 441da9b..c1e398d 100644
--- a/Swiften/Client/ClientXMLTracer.cpp
+++ b/Swiften/Client/ClientXMLTracer.cpp
@@ -9,8 +9,6 @@
 #include <iostream>
 #include <boost/bind.hpp>
 
-#include <Swiften/Base/SafeString.h>
-
 namespace Swift {
 
 ClientXMLTracer::ClientXMLTracer(CoreClient* client) {
diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp
index 9eec7ca..a2708c5 100644
--- a/Swiften/Client/CoreClient.cpp
+++ b/Swiften/Client/CoreClient.cpp
@@ -28,7 +28,7 @@
 
 namespace Swift {
 
-CoreClient::CoreClient(const JID& jid, const SafeString& password, NetworkFactories* networkFactories) : jid_(jid), password_(password), networkFactories(networkFactories), disconnectRequested_(false), certificateTrustChecker(NULL) {
+CoreClient::CoreClient(const JID& jid, const SafeByteArray& password, NetworkFactories* networkFactories) : jid_(jid), password_(password), networkFactories(networkFactories), disconnectRequested_(false), certificateTrustChecker(NULL) {
 	stanzaChannel_ = new ClientSessionStanzaChannel();
 	stanzaChannel_->onMessageReceived.connect(boost::bind(&CoreClient::handleMessageReceived, this, _1));
 	stanzaChannel_->onPresenceReceived.connect(boost::bind(&CoreClient::handlePresenceReceived, this, _1));
@@ -101,7 +101,7 @@ void CoreClient::handleConnectorFinished(boost::shared_ptr<Connection> connectio
 		assert(!sessionStream_);
 		sessionStream_ = boost::make_shared<BasicSessionStream>(ClientStreamType, connection_, getPayloadParserFactories(), getPayloadSerializers(), tlsFactories->getTLSContextFactory(), networkFactories->getTimerFactory());
 		if (!certificate_.empty()) {
-			sessionStream_->setTLSCertificate(PKCS12Certificate(certificate_, password_.toString()));
+			sessionStream_->setTLSCertificate(PKCS12Certificate(certificate_, password_));
 		}
 		sessionStream_->onDataRead.connect(boost::bind(&CoreClient::handleDataRead, this, _1));
 		sessionStream_->onDataWritten.connect(boost::bind(&CoreClient::handleDataWritten, this, _1));
diff --git a/Swiften/Client/CoreClient.h b/Swiften/Client/CoreClient.h
index 841c32c..16813de 100644
--- a/Swiften/Client/CoreClient.h
+++ b/Swiften/Client/CoreClient.h
@@ -14,7 +14,6 @@
 #include <Swiften/JID/JID.h>
 #include <Swiften/Client/ClientError.h>
 #include <Swiften/Client/ClientOptions.h>
-#include <Swiften/Base/SafeString.h>
 #include <Swiften/Base/SafeByteArray.h>
 
 namespace Swift {
@@ -35,7 +34,6 @@ namespace Swift {
 	class CertificateTrustChecker;
 	class NetworkFactories;
 	class ClientSessionStanzaChannel;
-	class SafeString;
 
 	/** 
 	 * The central class for communicating with an XMPP server.
@@ -53,7 +51,7 @@ namespace Swift {
 			 * Constructs a client for the given JID with the given password.
 			 * The given eventLoop will be used to post events to.
 			 */
-			CoreClient(const JID& jid, const SafeString& password, NetworkFactories* networkFactories);
+			CoreClient(const JID& jid, const SafeByteArray& password, NetworkFactories* networkFactories);
 			~CoreClient();
 
 			void setCertificate(const std::string& certificate);
@@ -204,7 +202,7 @@ namespace Swift {
 
 		private:
 			JID jid_;
-			SafeString password_;
+			SafeByteArray password_;
 			NetworkFactories* networkFactories;
 			ClientSessionStanzaChannel* stanzaChannel_;
 			IQRouter* iqRouter_;
diff --git a/Swiften/Client/UnitTest/ClientSessionTest.cpp b/Swiften/Client/UnitTest/ClientSessionTest.cpp
index 6918be8..8fc869b 100644
--- a/Swiften/Client/UnitTest/ClientSessionTest.cpp
+++ b/Swiften/Client/UnitTest/ClientSessionTest.cpp
@@ -11,7 +11,6 @@
 #include <boost/optional.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
-#include <Swiften/Base/SafeString.h>
 #include <Swiften/Session/SessionStream.h>
 #include <Swiften/Client/ClientSession.h>
 #include <Swiften/Elements/Message.h>
@@ -182,7 +181,7 @@ class ClientSessionTest : public CppUnit::TestFixture {
 			server->sendStreamFeaturesWithPLAINAuthentication();
 			CPPUNIT_ASSERT(needCredentials);
 			CPPUNIT_ASSERT_EQUAL(ClientSession::WaitingForCredentials, session->getState());
-			session->sendCredentials("mypass");
+			session->sendCredentials(createSafeByteArray("mypass"));
 			server->receiveAuthRequest("PLAIN");
 			server->sendAuthSuccess();
 			server->receiveStreamStart();
@@ -198,7 +197,7 @@ class ClientSessionTest : public CppUnit::TestFixture {
 			server->sendStreamFeaturesWithPLAINAuthentication();
 			CPPUNIT_ASSERT(needCredentials);
 			CPPUNIT_ASSERT_EQUAL(ClientSession::WaitingForCredentials, session->getState());
-			session->sendCredentials("mypass");
+			session->sendCredentials(createSafeByteArray("mypass"));
 			server->receiveAuthRequest("PLAIN");
 			server->sendAuthFailure();
 
@@ -238,7 +237,7 @@ class ClientSessionTest : public CppUnit::TestFixture {
 			server->receiveStreamStart();
 			server->sendStreamStart();
 			server->sendStreamFeaturesWithPLAINAuthentication();
-			session->sendCredentials("mypass");
+			session->sendCredentials(createSafeByteArray("mypass"));
 			server->receiveAuthRequest("PLAIN");
 			server->sendAuthSuccess();
 			server->receiveStreamStart();
@@ -262,7 +261,7 @@ class ClientSessionTest : public CppUnit::TestFixture {
 			server->receiveStreamStart();
 			server->sendStreamStart();
 			server->sendStreamFeaturesWithPLAINAuthentication();
-			session->sendCredentials("mypass");
+			session->sendCredentials(createSafeByteArray("mypass"));
 			server->receiveAuthRequest("PLAIN");
 			server->sendAuthSuccess();
 			server->receiveStreamStart();
@@ -305,7 +304,7 @@ class ClientSessionTest : public CppUnit::TestFixture {
 			server->receiveStreamStart();
 			server->sendStreamStart();
 			server->sendStreamFeaturesWithPLAINAuthentication();
-			session->sendCredentials("mypass");
+			session->sendCredentials(createSafeByteArray("mypass"));
 			server->receiveAuthRequest("PLAIN");
 			server->sendAuthSuccess();
 			server->receiveStreamStart();