4 files changed, 8 insertions, 8 deletions
diff --git a/Swiften/Server/ServerFromClientSession.cpp b/Swiften/Server/ServerFromClientSession.cpp
index b047f69..dbe9745 100644
--- a/Swiften/Server/ServerFromClientSession.cpp
+++ b/Swiften/Server/ServerFromClientSession.cpp
@@ -51,7 +51,7 @@ void ServerFromClientSession::handleElement(boost::shared_ptr<Element> element)
 						getXMPPLayer()->resetParser();
 				}
 				else {
-					PLAINMessage plainMessage(authRequest->getMessage() ? *authRequest->getMessage() : createByteArray(""));
+					PLAINMessage plainMessage(authRequest->getMessage() ? *authRequest->getMessage() : createSafeByteArray(""));
 					if (userRegistry_->isValidUserPassword(JID(plainMessage.getAuthenticationID(), getLocalJID().getDomain()), plainMessage.getPassword())) {
 						getXMPPLayer()->writeElement(boost::shared_ptr<AuthSuccess>(new AuthSuccess()));
 						user_ = plainMessage.getAuthenticationID();
diff --git a/Swiften/Server/SimpleUserRegistry.cpp b/Swiften/Server/SimpleUserRegistry.cpp
index 9930a39..a519ac2 100644
--- a/Swiften/Server/SimpleUserRegistry.cpp
+++ b/Swiften/Server/SimpleUserRegistry.cpp
@@ -11,13 +11,13 @@ namespace Swift {
 SimpleUserRegistry::SimpleUserRegistry() {
 }
 
-bool SimpleUserRegistry::isValidUserPassword(const JID& user, const std::string& password) const {
-	std::map<JID,std::string>::const_iterator i = users.find(user);
+bool SimpleUserRegistry::isValidUserPassword(const JID& user, const SafeByteArray& password) const {
+	std::map<JID,SafeByteArray>::const_iterator i = users.find(user);
 	return i != users.end() ? i->second == password : false;
 }
 
 void SimpleUserRegistry::addUser(const JID& user, const std::string& password) {
-	users.insert(std::make_pair(user, password));
+	users.insert(std::make_pair(user, createSafeByteArray(password)));
 }
 
 }
diff --git a/Swiften/Server/SimpleUserRegistry.h b/Swiften/Server/SimpleUserRegistry.h
index ad1791b..324c099 100644
--- a/Swiften/Server/SimpleUserRegistry.h
+++ b/Swiften/Server/SimpleUserRegistry.h
@@ -19,10 +19,10 @@ namespace Swift {
 		public:
 			SimpleUserRegistry();
 
-			virtual bool isValidUserPassword(const JID& user, const std::string& password) const;
+			virtual bool isValidUserPassword(const JID& user, const SafeByteArray& password) const;
 			void addUser(const JID& user, const std::string& password);
 
 		private:
-			std::map<JID, std::string> users;
+			std::map<JID, SafeByteArray> users;
 	};
 }
diff --git a/Swiften/Server/UserRegistry.h b/Swiften/Server/UserRegistry.h
index c021fc4..9584a7e 100644
--- a/Swiften/Server/UserRegistry.h
+++ b/Swiften/Server/UserRegistry.h
@@ -7,15 +7,15 @@
 #pragma once
 
 #include <string>
+#include <Swiften/Base/SafeByteArray.h>
 
 namespace Swift {
-	
 	class JID;
 
 	class UserRegistry {
 		public:
 			virtual ~UserRegistry();
 
-			virtual bool isValidUserPassword(const JID& user, const std::string& password) const = 0;
+			virtual bool isValidUserPassword(const JID& user, const SafeByteArray& password) const = 0;
 	};
 }