From fb81e6d3009106bd88f1064ff9c8fa5fdec3a19f Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Sun, 18 Nov 2012 15:20:49 +0000
Subject: [PATCH] =?utf8?q?PR:=202880=20Submitted=20by:=20"Florian=20R?=
=?utf8?q?=C3=83=C2=BCchel"=20<florian.ruechel@ruhr-uni-bochum.de>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Correctly handle local machine keys in the capi ENGINE.
---
engines/e_capi.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/engines/e_capi.c b/engines/e_capi.c
index fa0624f145..8b7e25815c 100644
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -1431,10 +1431,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();
--
2.25.1