Commit c4fc1722 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2880 

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

Correctly handle local machine keys in the capi ENGINE.
parent d88926f1

engines/e_capi.c

+4 −1
Original line number Diff line number Diff line
@@ -1460,6 +1460,7 @@ static PCCERT_CONTEXT capi_find_cert(CAPI_CTX *ctx, const char *id, HCERTSTORE h 
static CAPI_KEY *capi_get_key(CAPI_CTX *ctx, const TCHAR *contname, TCHAR *provname, DWORD ptype, DWORD keyspec)

	{

	CAPI_KEY *key;

	DWORD dwFlags = 0; 

	key = OPENSSL_malloc(sizeof(CAPI_KEY));

	if (sizeof(TCHAR)==sizeof(char))

		CAPI_trace(ctx, "capi_get_key, contname=%s, provname=%s, type=%d\n",
@@ -1475,7 +1476,9 @@ static CAPI_KEY *capi_get_key(CAPI_CTX *ctx, const TCHAR *contname, TCHAR *provn 
		if (_provname) OPENSSL_free(_provname);

		if (_contname) OPENSSL_free(_contname);

		}

	if (!CryptAcquireContext(&key->hprov, contname, provname, ptype, 0))

	if(ctx->store_flags & CERT_SYSTEM_STORE_LOCAL_MACHINE)

		dwFlags = CRYPT_MACHINE_KEYSET;

	if (!CryptAcquireContext(&key->hprov, contname, provname, ptype, dwflags))

		{

		CAPIerr(CAPI_F_CAPI_GET_KEY, CAPI_R_CRYPTACQUIRECONTEXT_ERROR);

		capi_addlasterror();