From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 18 Nov 2012 15:20:40 +0000 (+0000)
Subject: PR: 2880
X-Git-Tag: OpenSSL_0_9_8y~32
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=34b5ba3b6010f792e66cf347fbd350cd2674bd29;p=oweals%2Fopenssl.git

PR: 2880
Submitted by: "Florian Rüchel" <florian.ruechel@ruhr-uni-bochum.de>

Correctly handle local machine keys in the capi ENGINE.
---

diff --git a/engines/e_capi.c b/engines/e_capi.c
index 9f38af3b22..e332fb84ee 100644
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -1409,10 +1409,13 @@ static PCCERT_CONTEXT capi_find_cert(CAPI_CTX *ctx, const char *id, HCERTSTORE h
 static CAPI_KEY *capi_get_key(CAPI_CTX *ctx, const char *contname, char *provname, DWORD ptype, DWORD keyspec)
 	{
 	CAPI_KEY *key;
+    DWORD dwFlags = 0; 
 	key = OPENSSL_malloc(sizeof(CAPI_KEY));
 	CAPI_trace(ctx, "capi_get_key, contname=%s, provname=%s, type=%d\n", 
 						contname, provname, ptype);
-	if (!CryptAcquireContextA(&key->hprov, contname, provname, ptype, 0))
+    if(ctx->store_flags & CERT_SYSTEM_STORE_LOCAL_MACHINE)
+        dwFlags = CRYPT_MACHINE_KEYSET;
+    if (!CryptAcquireContextA(&key->hprov, contname, provname, ptype, dwFlags)) 
 		{
 		CAPIerr(CAPI_F_CAPI_GET_KEY, CAPI_R_CRYPTACQUIRECONTEXT_ERROR);
 		capi_addlasterror();