1 files changed, 16 insertions, 2 deletions
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp
index 6b9d389..a3b7837 100644
--- a/Swift/QtUI/QtLoginWindow.cpp
+++ b/Swift/QtUI/QtLoginWindow.cpp
@@ -37,19 +37,21 @@
 #include <Swiften/Base/Paths.h>
 
 #include <QtAboutWidget.h>
 #include <QtSwiftUtil.h>
 #include <QtMainWindow.h>
 #include <QtUtilities.h>
 
 #ifdef HAVE_SCHANNEL
 #include "CAPICertificateSelector.h"
+#include <Swiften/TLS/CAPICertificate.h>
 #endif
+#include <Swiften/TLS/PKCS12Certificate.h>
 
 namespace Swift{
 
 QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream, SettingsProvider* settings) : QMainWindow(), settings_(settings) {
 	uiEventStream_ = uiEventStream;
 
 	setWindowTitle("Swift");
 #ifndef Q_WS_MAC
 	setWindowIcon(QIcon(":/logo-icon-16.png"));
@@ -339,36 +341,48 @@ void QtLoginWindow::loginClicked() {
 			msgBox.setWindowTitle(tr("Confirm terms of use"));
 			msgBox.setText("");
 			msgBox.setInformativeText(P2QSTRING(banner));
 			msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
 			msgBox.setDefaultButton(QMessageBox::No);
 			if (msgBox.exec() != QMessageBox::Yes) {
 				return;
 			}
 		}
-		onLoginRequest(Q2PSTRING(username_->currentText()), Q2PSTRING(password_->text()), Q2PSTRING(certificateFile_), remember_->isChecked(), loginAutomatically_->isChecked());
+		CertificateWithKey::ref certificate;
+		std::string certificateString = Q2PSTRING(certificateFile_);
+#if defined(HAVE_SCHANNEL)
+		if (isCAPIURI(certificateString)) {
+			certificate = boost::make_shared<CAPICertificate>(certificateString);
+		} else {
+			certificate = boost::make_shared<PKCS12Certificate>(certificateString, createSafeByteArray(Q2PSTRING(password_->text())));
+		}
+#else
+		certificate = boost::make_shared<PKCS12Certificate>(certificateString, createSafeByteArray(Q2PSTRING(password_->text())));
+#endif
+
+		onLoginRequest(Q2PSTRING(username_->currentText()), Q2PSTRING(password_->text()), certificateString, certificate, remember_->isChecked(), loginAutomatically_->isChecked());
 		if (settings_->getSetting(SettingConstants::FORGET_PASSWORDS)) { /* Mustn't remember logins */
 			username_->clearEditText();
 			password_->setText("");
 		}
 	} else {
 		onCancelLoginRequest();
 	}
 }
 
 void QtLoginWindow::setLoginAutomatically(bool loginAutomatically) {
 	loginAutomatically_->setChecked(loginAutomatically);
 }
 
 void QtLoginWindow::handleCertficateChecked(bool checked) {
 	if (checked) {
 #ifdef HAVE_SCHANNEL
-		certificateFile_ = selectCAPICertificate();
+		certificateFile_ = P2QSTRING(selectCAPICertificate());
 		if (certificateFile_.isEmpty()) {
 			certificateButton_->setChecked(false);
 		}
 #else
 		certificateFile_ = QFileDialog::getOpenFileName(this, tr("Select an authentication certificate"), QString(), QString("*.cert;*.p12;*.pfx"));
 		if (certificateFile_.isEmpty()) {
 			certificateButton_->setChecked(false);
 		}
 #endif