4 files changed, 26 insertions, 3 deletions
diff --git a/Swift/QtUI/CAPICertificateSelector.cpp b/Swift/QtUI/CAPICertificateSelector.cpp
index 44f5793..aa41d70 100644
--- a/Swift/QtUI/CAPICertificateSelector.cpp
+++ b/Swift/QtUI/CAPICertificateSelector.cpp
@@ -6,12 +6,14 @@
 
 #include <string>
 
+#include "CAPICertificateSelector.h"
+
 #define SECURITY_WIN32
 #include <Windows.h>
 #include <WinCrypt.h>
 #include <cryptuiapi.h>
 
-#include "CAPICertificateSelector.h"
+#include <boost/algorithm/string.hpp>
 
 namespace Swift {
 
@@ -134,5 +136,8 @@ std::string selectCAPICertificate() {
 	}
 }
 
+bool isCAPIURI(std::string uri) {
+	return (boost::iequals(uri.substr(0, 10), "certstore:"));
+}
 
 }
diff --git a/Swift/QtUI/CAPICertificateSelector.h b/Swift/QtUI/CAPICertificateSelector.h
index 9a0ee92..714f1c5 100644
--- a/Swift/QtUI/CAPICertificateSelector.h
+++ b/Swift/QtUI/CAPICertificateSelector.h
@@ -10,4 +10,5 @@
 
 namespace Swift {
 	std::string selectCAPICertificate();
+	bool isCAPIURI(std::string uri);
 }
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
@@ -43,7 +43,9 @@
 
 #ifdef HAVE_SCHANNEL
 #include "CAPICertificateSelector.h"
+#include <Swiften/TLS/CAPICertificate.h>
 #endif
+#include <Swiften/TLS/PKCS12Certificate.h>
 
 namespace Swift{
 
@@ -345,7 +347,19 @@ void QtLoginWindow::loginClicked() {
 				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("");
@@ -362,7 +376,7 @@ void QtLoginWindow::setLoginAutomatically(bool loginAutomatically) {
 void QtLoginWindow::handleCertficateChecked(bool checked) {
 	if (checked) {
 #ifdef HAVE_SCHANNEL
-		certificateFile_ = selectCAPICertificate();
+		certificateFile_ = P2QSTRING(selectCAPICertificate());
 		if (certificateFile_.isEmpty()) {
 			certificateButton_->setChecked(false);
 		}
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index a8b8c78..95c4305 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -57,6 +57,9 @@ if env["PLATFORM"] == "win32" :
   myenv.Append(LIBS = "qtmain")
   if myenv.get("HAVE_SCHANNEL", 0) :
     myenv.Append(LIBS = "Cryptui")
+    myenv.Append(CPPDEFINES = "HAVE_SCHANNEL")
+    if env["debug"] :
+      myenv.Append(LINKFLAGS = ["/NODEFAULTLIB:msvcrt"])
 
 myenv.WriteVal("DefaultTheme.qrc", myenv.Value(generateDefaultTheme(myenv.Dir("#/Swift/resources/themes/Default"))))