1 files changed, 9 insertions, 3 deletions
diff --git a/Swiften/Client/CoreClient.h b/Swiften/Client/CoreClient.h
index 6712e03..1b875d2 100644
--- a/Swiften/Client/CoreClient.h
+++ b/Swiften/Client/CoreClient.h
@@ -1,91 +1,97 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2012 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
 #include <string>
 #include <boost/shared_ptr.hpp>
 #include <Swiften/Base/boost_bsignals.h>
 
 #include <Swiften/Entity/Entity.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Client/ClientError.h>
 #include <Swiften/Client/ClientOptions.h>
 #include <Swiften/Base/SafeByteArray.h>
+#include <Swiften/TLS/CertificateWithKey.h>
 
 namespace Swift {
 	class ChainedConnector;
 	class Message;
 	class Presence;
 	class Error;
 	class IQRouter;
 	class TLSContextFactory;
 	class ConnectionFactory;
 	class Connection;
 	class TimerFactory;
 	class ClientSession;
 	class StanzaChannel;
 	class Stanza;
 	class SessionStream;
 	class CertificateTrustChecker;
 	class NetworkFactories;
 	class ClientSessionStanzaChannel;
 
 	/** 
 	 * The central class for communicating with an XMPP server.
 	 *
 	 * This class is responsible for setting up the connection with the XMPP
 	 * server, authenticating, and initializing the session.
 	 *
 	 * This class can be used directly in your application, although the Client
 	 * subclass provides more functionality and interfaces, and is better suited
 	 * for most needs.
 	 */
 	class CoreClient : public Entity {
 		public: 
 			/**
 			 * 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 SafeByteArray& password, NetworkFactories* networkFactories);
 			~CoreClient();
 
-			void setCertificate(const std::string& certificate);
+			/**
+			 * Set a client certificate to use for strong authentication with the server.
+			 * Ensure that it is of the correct type for the TLS engine in use.
+			 * This means, largely, PKCS12Certificate for OpenSSL and CAPICertificate for CAPI.
+			 */
+			void setCertificate(CertificateWithKey::ref certificate);
 
 			/**
 			 * Connects the client to the server.
 			 *
 			 * After the connection is established, the client will set 
 			 * initialize the stream and authenticate.
 			 */
 			void connect(const ClientOptions& = ClientOptions());
 
 			/**
 			 * Disconnects the client from the server.
 			 */
 			void disconnect();
 
 			void connect(const std::string& host);
 			
 			/**
 			 * Sends a message.
 			 */
 			void sendMessage(boost::shared_ptr<Message>);
 
 			/**
 			 * Sends a presence stanza.
 			 */
 			void sendPresence(boost::shared_ptr<Presence>);
 
 			/**
 			 * Sends raw, unchecked data.
 			 */
 			void sendData(const std::string& data);
 
 			/**
 			 * Returns the IQ router for this client.
 			 */
 			IQRouter* getIQRouter() const {
@@ -195,40 +201,40 @@ namespace Swift {
 			 * Called before onConnected signal is emmitted.
 			 */
 			virtual void handleConnected() {};
 
 			bool isCAPIURI();
 
 		private:
 			void handleConnectorFinished(boost::shared_ptr<Connection>);
 			void handleStanzaChannelAvailableChanged(bool available);
 			void handleSessionFinished(boost::shared_ptr<Error>);
 			void handleNeedCredentials();
 			void handleDataRead(const SafeByteArray&);
 			void handleDataWritten(const SafeByteArray&);
 			void handlePresenceReceived(boost::shared_ptr<Presence>);
 			void handleMessageReceived(boost::shared_ptr<Message>);
 			void handleStanzaAcked(boost::shared_ptr<Stanza>);
 			void purgePassword();
 			void bindSessionToStream();
 
 			void resetConnector();
 			void resetSession();
 			void forceReset();
 
 		private:
 			JID jid_;
 			SafeByteArray password_;
 			NetworkFactories* networkFactories;
 			ClientSessionStanzaChannel* stanzaChannel_;
 			IQRouter* iqRouter_;
 			ClientOptions options;
 			boost::shared_ptr<ChainedConnector> connector_;
 			std::vector<ConnectionFactory*> proxyConnectionFactories;
 			boost::shared_ptr<Connection> connection_;
 			boost::shared_ptr<SessionStream> sessionStream_;
 			boost::shared_ptr<ClientSession> session_;
-			std::string certificate_;
+			CertificateWithKey::ref certificate_;
 			bool disconnectRequested_;
 			CertificateTrustChecker* certificateTrustChecker;
 	};
 }