ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: CryptAcquireCertificatePrivateKey should look up certificate in the user's store if not linked to a provider. 

Under Windows passing to CryptAcquireCertificatePrivateKey() a certificate
retrieved from the key container using CryptGetKeyParam(KP_CERTIFICATE) +
CertCreateCertificateContext() works although such a certificate doesn't
have assigned properties at all. In order for this to work Windows probably
looks up an original certificate in the user's private store.

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Dmitry Timoshkov 2019-02-06 15:25:49 +08:00 committed by Alexandre Julliard
parent d917f0ef09
commit 23f97773ee
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/crypt32/cert.c
View File

@ -886,6 +886,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert,
PCRYPT_KEY_PROV_INFO info = NULL; PCRYPT_KEY_PROV_INFO info = NULL;
CERT_KEY_CONTEXT keyContext; CERT_KEY_CONTEXT keyContext;
DWORD size; DWORD size;
PCCERT_CONTEXT cert_in_store = NULL;
TRACE("(%p, %08x, %p, %p, %p, %p)\n", pCert, dwFlags, pvReserved, TRACE("(%p, %08x, %p, %p, %p, %p)\n", pCert, dwFlags, pvReserved,
phCryptProv, pdwKeySpec, pfCallerFreeProv); phCryptProv, pdwKeySpec, pfCallerFreeProv);
@ -896,6 +897,34 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert,
ret = CertGetCertificateContextProperty(pCert, ret = CertGetCertificateContextProperty(pCert,
CERT_KEY_PROV_INFO_PROP_ID, 0, &size); CERT_KEY_PROV_INFO_PROP_ID, 0, &size);
if (!ret)
{
static const WCHAR myW[] = { 'M','y',0 };
HCERTSTORE hstore;
hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0,
CERT_SYSTEM_STORE_CURRENT_USER, myW);
if (hstore)
{
cert_in_store = CertFindCertificateInStore(hstore, pCert->dwCertEncodingType, 0,
CERT_FIND_EXISTING, pCert, NULL);
if (cert_in_store)
{
ret = CertGetCertificateContextProperty(cert_in_store, CERT_KEY_PROV_INFO_PROP_ID, 0, &size);
if (ret)
pCert = cert_in_store;
else
{
CertFreeCertificateContext(cert_in_store);
cert_in_store = NULL;
}
}
CertCloseStore(hstore, 0);
}
}
if (ret) if (ret)
{ {
info = HeapAlloc(GetProcessHeap(), 0, size); info = HeapAlloc(GetProcessHeap(), 0, size);
@ -949,6 +978,8 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert,
} }
} }
HeapFree(GetProcessHeap(), 0, info); HeapFree(GetProcessHeap(), 0, info);
if (cert_in_store)
CertFreeCertificateContext(cert_in_store);
return ret; return ret;
} }