1 files changed, 3 insertions, 28 deletions
diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp
index 36bfe35..e2a8e5a 100644
--- a/Swiften/Client/CoreClient.cpp
+++ b/Swiften/Client/CoreClient.cpp
@@ -126,19 +126,6 @@ void CoreClient::bindSessionToStream() {
 	session_->start();
 }
 
-bool CoreClient::isCAPIURI() {
-#ifdef HAVE_SCHANNEL
-	if (!boost::iequals(certificate_.substr(0, 10), "certstore:")) {
-		return false;
-	}
-
-	return true;
-
-#else
-	return false;
-#endif
-}
-
 /**
  * Only called for TCP sessions. BOSH is handled inside the BOSHSessionStream.
  */
@@ -156,20 +143,8 @@ void CoreClient::handleConnectorFinished(boost::shared_ptr<Connection> connectio
 
 		assert(!sessionStream_);
 		sessionStream_ = boost::make_shared<BasicSessionStream>(ClientStreamType, connection_, getPayloadParserFactories(), getPayloadSerializers(), networkFactories->getTLSContextFactory(), networkFactories->getTimerFactory(), networkFactories->getXMLParserFactory());
-		if (!certificate_.empty()) {
-			CertificateWithKey* cert;
-
-#if defined(SWIFTEN_PLATFORM_WIN32)
-			if (isCAPIURI()) {
-				cert = new CAPICertificate(certificate_);
-			} else {
-				cert = new PKCS12Certificate(certificate_, password_);
-			}
-#else
-			cert = new PKCS12Certificate(certificate_, password_);
-#endif
-
-			sessionStream_->setTLSCertificate(cert);
+		if (certificate_ && !certificate_->isNull()) {
+			sessionStream_->setTLSCertificate(certificate_);
 		}
 		sessionStream_->onDataRead.connect(boost::bind(&CoreClient::handleDataRead, this, _1));
 		sessionStream_->onDataWritten.connect(boost::bind(&CoreClient::handleDataWritten, this, _1));
@@ -190,7 +165,7 @@ void CoreClient::disconnect() {
 	}
 }
 
-void CoreClient::setCertificate(const std::string& certificate) {
+void CoreClient::setCertificate(CertificateWithKey::ref certificate) {
 	certificate_ = certificate;
 }