8 files changed, 351 insertions, 19 deletions
diff --git a/Swiften/TLS/CAPICertificate.h b/Swiften/TLS/CAPICertificate.h
new file mode 100644
index 0000000..fcdb4c2
--- /dev/null
+++ b/Swiften/TLS/CAPICertificate.h
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2012 Isode Limited, London, England.
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Base/SafeByteArray.h>
+#include <Swiften/TLS/CertificateWithKey.h>
+
+#include <boost/algorithm/string/predicate.hpp>
+
+#define SECURITY_WIN32
+#include <WinCrypt.h>
+
+namespace Swift {
+	class CAPICertificate : public Swift::CertificateWithKey {
+		public:
+			CAPICertificate(const std::string& capiUri)
+			    : valid_(false), uri_(capiUri), cert_store_handle_(0), cert_store_(NULL), cert_name_(NULL) {
+				setUri(capiUri);
+			}
+
+			virtual ~CAPICertificate() {
+				if (cert_store_handle_ != NULL)
+				{
+					CertCloseStore(cert_store_handle_, 0);
+				}
+			}
+
+			virtual bool isNull() const {
+				return uri_.empty() || !valid_;
+			}
+
+			virtual bool isPrivateKeyExportable() const {
+				/* We can check with CAPI, but for now the answer is "no" */
+				return false;
+			}
+
+			virtual const std::string& getCertStoreName() const {
+			    return cert_store_;
+			}
+
+			virtual const std::string& getCertName() const {
+			    return cert_name_;
+			}
+
+			const ByteArray& getData() const {
+////Might need to throw an exception here, or really generate PKCS12 blob from CAPI data?
+				assert(0);
+			}
+
+			void setData(const ByteArray& data) {
+				assert(0);
+			}
+
+			const SafeByteArray& getPassword() const {
+/////Can't pass NULL to createSafeByteArray!
+/////Should this throw an exception instead?
+				return createSafeByteArray("");
+			}
+
+		protected:
+			void setUri (const std::string& capiUri) {
+
+				valid_ = false;
+
+				/* Syntax: "certstore:" [<cert_store> ":"] <cert_id> */
+
+				if (!boost::iequals(capiUri.substr(0, 10), "certstore:")) {
+					return;
+				}
+
+				/* Substring of subject: uses "storename" */
+				std::string capi_identity = capiUri.substr(10);
+				std::string new_cert_store_name;
+				size_t pos = capi_identity.find_first_of (':');
+
+				if (pos == std::string::npos) {
+					/* Using the default certificate store */
+					new_cert_store_name = "MY";
+					cert_name_ = capi_identity;
+				} else {
+					new_cert_store_name = capi_identity.substr(0, pos);
+					cert_name_ = capi_identity.substr(pos + 1);
+				}
+
+				PCCERT_CONTEXT pCertContext = NULL;
+
+				if (cert_store_handle_ != NULL)
+				{
+					if (new_cert_store_name != cert_store_) {
+						CertCloseStore(cert_store_handle_, 0);
+						cert_store_handle_ = NULL;
+					}
+				}
+
+				if (cert_store_handle_ == NULL)
+				{
+					cert_store_handle_ = CertOpenSystemStore(0, cert_store_.c_str());
+					if (!cert_store_handle_)
+					{
+						return;
+					}
+				}
+
+				cert_store_ = new_cert_store_name;
+
+				/* NB: This might have to change, depending on how we locate certificates */
+
+				// Find client certificate. Note that this sample just searches for a 
+				// certificate that contains the user name somewhere in the subject name.
+				pCertContext = CertFindCertificateInStore(cert_store_handle_,
+					X509_ASN_ENCODING,
+					0,				// dwFindFlags
+					CERT_FIND_SUBJECT_STR_A,
+					cert_name_.c_str(),		// *pvFindPara
+					NULL );				// pPrevCertContext
+
+				if (pCertContext == NULL)
+				{
+					return;
+				}
+
+
+				/* Now verify that we can have access to the corresponding private key */
+
+				DWORD len;
+				CRYPT_KEY_PROV_INFO *pinfo;
+				HCRYPTPROV hprov;
+				HCRYPTKEY key;
+
+				if (!CertGetCertificateContextProperty(pCertContext,
+								       CERT_KEY_PROV_INFO_PROP_ID,
+								       NULL,
+								       &len))
+				{
+					CertFreeCertificateContext(pCertContext);
+					return;
+				}
+
+				pinfo = static_cast<CRYPT_KEY_PROV_INFO *>(malloc(len));
+				if (!pinfo) {
+					CertFreeCertificateContext(pCertContext);
+					return;
+				}
+
+				if (!CertGetCertificateContextProperty(pCertContext,
+								       CERT_KEY_PROV_INFO_PROP_ID,
+								       pinfo,
+								       &len))
+				{
+					CertFreeCertificateContext(pCertContext);
+					free(pinfo);
+					return;
+				}
+
+				CertFreeCertificateContext(pCertContext);
+
+				// Now verify if we have access to the private key
+				if (!CryptAcquireContextW(&hprov,
+							  pinfo->pwszContainerName,
+							  pinfo->pwszProvName,
+							  pinfo->dwProvType,
+							  0))
+				{
+					free(pinfo);
+					return;
+				}
+
+				if (!CryptGetUserKey(hprov, pinfo->dwKeySpec, &key))
+				{
+					CryptReleaseContext(hprov, 0);
+					free(pinfo);
+					return;
+				}
+
+				CryptDestroyKey(key);
+				CryptReleaseContext(hprov, 0);
+				free(pinfo);
+
+				valid_ = true;
+			}
+
+		private:
+			bool valid_;
+			std::string uri_;
+
+			HCERTSTORE cert_store_handle_;
+
+			/* Parsed components of the uri_ */
+			std::string cert_store_;
+			std::string cert_name_;
+	};
+}
diff --git a/Swiften/TLS/CertificateWithKey.h b/Swiften/TLS/CertificateWithKey.h
new file mode 100644
index 0000000..6f6ea39
--- /dev/null
+++ b/Swiften/TLS/CertificateWithKey.h
@@ -0,0 +1,32 @@
+/*
+ * 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 <Swiften/Base/SafeByteArray.h>
+
+namespace Swift {
+	class CertificateWithKey {
+		public:
+			CertificateWithKey() {}
+
+			virtual ~CertificateWithKey() {}
+
+			virtual bool isNull() const = 0;
+
+			virtual bool isPrivateKeyExportable() const = 0;
+
+			virtual const std::string& getCertStoreName() const = 0;
+
+			virtual const std::string& getCertName() const = 0;
+
+			virtual const ByteArray& getData() const = 0;
+
+			virtual void setData(const ByteArray& data) = 0;
+
+			virtual const SafeByteArray& getPassword() const = 0;
+	};
+}
diff --git a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
index 220e7f9..dd3462f 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
+++ b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
@@ -21,7 +21,7 @@
 
 #include <Swiften/TLS/OpenSSL/OpenSSLContext.h>
 #include <Swiften/TLS/OpenSSL/OpenSSLCertificate.h>
-#include <Swiften/TLS/PKCS12Certificate.h>
+#include <Swiften/TLS/CertificateWithKey.h>
 
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 
@@ -185,14 +185,18 @@ void OpenSSLContext::sendPendingDataToApplication() {
 	}
 }
 
-bool OpenSSLContext::setClientCertificate(const PKCS12Certificate& certificate) {
-	if (certificate.isNull()) {
+bool OpenSSLContext::setClientCertificate(CertificateWithKey * certificate) {
+	if (!certificate || certificate->isNull()) {
+		return false;
+	}
+
+	if (!certificate->isPrivateKeyExportable()) {
 		return false;
 	}
 
 	// Create a PKCS12 structure
 	BIO* bio = BIO_new(BIO_s_mem());
-	BIO_write(bio, vecptr(certificate.getData()), certificate.getData().size());
+	BIO_write(bio, vecptr(certificate->getData()), certificate->getData().size());
 	boost::shared_ptr<PKCS12> pkcs12(d2i_PKCS12_bio(bio, NULL), PKCS12_free);
 	BIO_free(bio);
 	if (!pkcs12) {
@@ -203,7 +207,7 @@ bool OpenSSLContext::setClientCertificate(const PKCS12Certificate& certificate)
 	X509 *certPtr = 0;
 	EVP_PKEY* privateKeyPtr = 0;
 	STACK_OF(X509)* caCertsPtr = 0;
-	int result = PKCS12_parse(pkcs12.get(), reinterpret_cast<const char*>(vecptr(certificate.getPassword())), &privateKeyPtr, &certPtr, &caCertsPtr);
+	int result = PKCS12_parse(pkcs12.get(), reinterpret_cast<const char*>(vecptr(certificate->getPassword())), &privateKeyPtr, &certPtr, &caCertsPtr);
 	if (result != 1) { 
 		return false;
 	}
diff --git a/Swiften/TLS/OpenSSL/OpenSSLContext.h b/Swiften/TLS/OpenSSL/OpenSSLContext.h
index 04693a3..b53e715 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLContext.h
+++ b/Swiften/TLS/OpenSSL/OpenSSLContext.h
@@ -14,7 +14,7 @@
 #include <Swiften/Base/ByteArray.h>
 
 namespace Swift {
-	class PKCS12Certificate;
+	class CertificateWithKey;
 
 	class OpenSSLContext : public TLSContext, boost::noncopyable {
 		public:
@@ -22,7 +22,7 @@ namespace Swift {
 			~OpenSSLContext();
 
 			void connect();
-			bool setClientCertificate(const PKCS12Certificate& cert);
+			bool setClientCertificate(CertificateWithKey * cert);
 
 			void handleDataFromNetwork(const SafeByteArray&);
 			void handleDataFromApplication(const SafeByteArray&);
diff --git a/Swiften/TLS/PKCS12Certificate.h b/Swiften/TLS/PKCS12Certificate.h
index c0e01d0..2f70456 100644
--- a/Swiften/TLS/PKCS12Certificate.h
+++ b/Swiften/TLS/PKCS12Certificate.h
@@ -7,9 +7,10 @@
 #pragma once
 
 #include <Swiften/Base/SafeByteArray.h>
+#include <Swiften/TLS/CertificateWithKey.h>
 
 namespace Swift {
-	class PKCS12Certificate {
+	class PKCS12Certificate : public Swift::CertificateWithKey {
 		public:
 			PKCS12Certificate() {}
 
@@ -17,11 +18,29 @@ namespace Swift {
 				readByteArrayFromFile(data_, filename);
 			}
 
-			bool isNull() const {
+			virtual ~PKCS12Certificate() {}
+
+			virtual bool isNull() const {
 				return data_.empty();
 			}
 
-			const ByteArray& getData() const {
+			virtual bool isPrivateKeyExportable() const {
+/////Hopefully a PKCS12 is never missing a private key
+				return true;
+			}
+
+			virtual const std::string& getCertStoreName() const {
+/////				assert(0);
+				throw std::exception();
+			}
+
+			virtual const std::string& getCertName() const {
+				/* We can return the original filename instead, if we care */
+/////				assert(0);
+				throw std::exception();
+			}
+
+			virtual const ByteArray& getData() const {
 				return data_;
 			}
 
@@ -29,7 +48,7 @@ namespace Swift {
 				data_ = data;
 			}
 
-			const SafeByteArray& getPassword() const {
+			virtual const SafeByteArray& getPassword() const {
 				return password_;
 			}
 
diff --git a/Swiften/TLS/Schannel/SchannelContext.cpp b/Swiften/TLS/Schannel/SchannelContext.cpp
index 6771d4a..6f50b3a 100644
--- a/Swiften/TLS/Schannel/SchannelContext.cpp
+++ b/Swiften/TLS/Schannel/SchannelContext.cpp
@@ -15,6 +15,9 @@ SchannelContext::SchannelContext()
 : m_state(Start)
 , m_secContext(0)
 , m_verificationError(CertificateVerificationError::UnknownError)
+, m_my_cert_store(NULL)
+, m_cert_store_name("MY")
+, m_cert_name(NULL)
 {
 	m_ctxtFlags = ISC_REQ_ALLOCATE_MEMORY | 
 				  ISC_REQ_CONFIDENTIALITY |
@@ -30,6 +33,13 @@ SchannelContext::SchannelContext()
 
 //------------------------------------------------------------------------
 
+SchannelContext::~SchannelContext()
+{
+	if (m_my_cert_store) CertCloseStore(m_my_cert_store, 0);
+}
+
+//------------------------------------------------------------------------
+
 void SchannelContext::determineStreamSizes()
 {
 	QueryContextAttributes(m_ctxtHandle, SECPKG_ATTR_STREAM_SIZES, &m_streamSizes);
@@ -39,17 +49,65 @@ void SchannelContext::determineStreamSizes()
 
 void SchannelContext::connect() 
 {
+	PCCERT_CONTEXT   pCertContext = NULL;
+
 	m_state = Connecting;
 
+	// If a user name is specified, then attempt to find a client
+	// certificate. Otherwise, just create a NULL credential.
+	if (!m_cert_name.empty())
+	{
+		if (m_my_cert_store == NULL)
+		{
+			m_my_cert_store = CertOpenSystemStore(0, m_cert_store_name.c_str());
+			if (!m_my_cert_store)
+			{
+/////			printf( "**** Error 0x%x returned by CertOpenSystemStore\n", GetLastError() );
+				indicateError();
+				return;
+			}
+		}
+
+		// Find client certificate. Note that this sample just searches for a 
+		// certificate that contains the user name somewhere in the subject name.
+		pCertContext = CertFindCertificateInStore( m_my_cert_store,
+			X509_ASN_ENCODING,
+			0,				// dwFindFlags
+			CERT_FIND_SUBJECT_STR_A,
+			m_cert_name.c_str(),		// *pvFindPara
+			NULL );				// pPrevCertContext
+
+		if (pCertContext == NULL)
+		{
+/////		printf("**** Error 0x%x returned by CertFindCertificateInStore\n", GetLastError());
+			indicateError();
+			return;
+		}
+	}
+
 	// We use an empty list for client certificates
 	PCCERT_CONTEXT clientCerts[1] = {0};
 
 	SCHANNEL_CRED sc = {0};
 	sc.dwVersion = SCHANNEL_CRED_VERSION;
-	sc.cCreds = 0; // Let Crypto API find the appropriate certificate for us
-	sc.paCred = clientCerts;
+
+/////SSL3?
 	sc.grbitEnabledProtocols = SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT;
-	sc.dwFlags = SCH_CRED_AUTO_CRED_VALIDATION | /*SCH_CRED_NO_DEFAULT_CREDS*/ SCH_CRED_USE_DEFAULT_CREDS | SCH_CRED_REVOCATION_CHECK_CHAIN;
+/////Check SCH_CRED_REVOCATION_CHECK_CHAIN
+	sc.dwFlags = SCH_CRED_AUTO_CRED_VALIDATION | SCH_CRED_REVOCATION_CHECK_CHAIN;
+
+	if (pCertContext)
+	{
+		sc.cCreds = 1;
+		sc.paCred = &pCertContext;
+		sc.dwFlags |= SCH_CRED_NO_DEFAULT_CREDS;
+	}
+	else
+	{
+		sc.cCreds = 0; // Let Crypto API find the appropriate certificate for us
+		sc.paCred = clientCerts;
+		sc.dwFlags |= SCH_CRED_USE_DEFAULT_CREDS;
+	}
 
 	// Swiften performs the server name check for us
 	sc.dwFlags |= SCH_CRED_NO_SERVERNAME_CHECK;
@@ -65,6 +123,9 @@ void SchannelContext::connect()
 		m_credHandle.Reset(),
 		NULL);
 
+	// cleanup: Free the certificate context. Schannel has already made its own copy.
+	if (pCertContext) CertFreeCertificateContext(pCertContext);
+
 	if (status != SEC_E_OK) 
 	{
 		// We failed to obtain the credentials handle
@@ -456,8 +517,21 @@ void SchannelContext::encryptAndSendData(const SafeByteArray& data)
 
 //------------------------------------------------------------------------
 
-bool SchannelContext::setClientCertificate(const PKCS12Certificate& certificate) 
+bool SchannelContext::setClientCertificate(CertificateWithKey * certificate)
 {
+	if (!certificate || certificate->isNull()) {
+		return false;
+	}
+
+	if (!certificate->isPrivateKeyExportable()) {
+		// We assume that the Certificate Store Name/Certificate Name
+		// are valid at this point
+		m_cert_store_name = certificate->getCertStoreName();
+		m_cert_name = certificate->getCertName();
+
+		return true;
+	}
+
 	return false;
 }
 
diff --git a/Swiften/TLS/Schannel/SchannelContext.h b/Swiften/TLS/Schannel/SchannelContext.h
index 66467fe..0cdb3d7 100644
--- a/Swiften/TLS/Schannel/SchannelContext.h
+++ b/Swiften/TLS/Schannel/SchannelContext.h
@@ -10,6 +10,7 @@
 
 #include "Swiften/TLS/TLSContext.h"
 #include "Swiften/TLS/Schannel/SchannelUtil.h"
+#include <Swiften/TLS/CertificateWithKey.h>
 #include "Swiften/Base/ByteArray.h"
 
 #define SECURITY_WIN32
@@ -28,13 +29,15 @@ namespace Swift
 		typedef boost::shared_ptr<SchannelContext> sp_t;
 
 	public:
-						SchannelContext();
+		SchannelContext();
+
+		~SchannelContext();
 
 		//
 		// TLSContext
 		//
 		virtual void	connect();
-		virtual bool	setClientCertificate(const PKCS12Certificate&);
+		virtual bool	setClientCertificate(CertificateWithKey * cert);
 
 		virtual void	handleDataFromNetwork(const SafeByteArray& data);
 		virtual void	handleDataFromApplication(const SafeByteArray& data);
@@ -77,5 +80,9 @@ namespace Swift
 		SecPkgContext_StreamSizes m_streamSizes;
 
 		std::vector<char>	m_receivedData;
+
+		HCERTSTORE		m_my_cert_store;
+		std::string		m_cert_store_name;
+		std::string		m_cert_name;
 	};
 }
diff --git a/Swiften/TLS/TLSContext.h b/Swiften/TLS/TLSContext.h
index 1538863..ada813a 100644
--- a/Swiften/TLS/TLSContext.h
+++ b/Swiften/TLS/TLSContext.h
@@ -14,7 +14,7 @@
 #include <Swiften/TLS/CertificateVerificationError.h>
 
 namespace Swift {
-	class PKCS12Certificate;
+	class CertificateWithKey;
 
 	class TLSContext {
 		public:
@@ -22,7 +22,7 @@ namespace Swift {
 
 			virtual void connect() = 0;
 
-			virtual bool setClientCertificate(const PKCS12Certificate& cert) = 0;
+			virtual bool setClientCertificate(CertificateWithKey * cert) = 0;
 
 			virtual void handleDataFromNetwork(const SafeByteArray&) = 0;
 			virtual void handleDataFromApplication(const SafeByteArray&) = 0;