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

cryptui: Save private key in temporary store when exporting it.

This commit is contained in:
Juan Lang 2009-02-06 12:17:45 -08:00 committed by Alexandre Julliard
parent af87814ac6
commit ccc2be7470
1 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
dlls/cryptui/main.c
View File

@ -6499,7 +6499,8 @@ static BOOL save_serialized_store(HANDLE file, HCERTSTORE store)
} }
static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo,
PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO pContextInfo) PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO pContextInfo,
PCRYPT_KEY_PROV_INFO keyProvInfo)
{ {
HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING,
0, CERT_STORE_CREATE_NEW_FLAG, NULL); 0, CERT_STORE_CREATE_NEW_FLAG, NULL);
@ -6508,6 +6509,7 @@ static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo,
if (store) if (store)
{ {
CRYPT_DATA_BLOB pfxBlob = { 0, NULL }; CRYPT_DATA_BLOB pfxBlob = { 0, NULL };
PCCERT_CONTEXT cert = NULL;
if (pContextInfo->fExportChain) if (pContextInfo->fExportChain)
{ {
@ -6542,9 +6544,16 @@ static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo,
for (i = 0; ret && i < chain->cChain; i++) for (i = 0; ret && i < chain->cChain; i++)
for (j = 0; ret && j < chain->rgpChain[i]->cElement; for (j = 0; ret && j < chain->rgpChain[i]->cElement;
j++) j++)
ret = CertAddCertificateContextToStore(store, {
chain->rgpChain[i]->rgpElement[j]->pCertContext, if (i == 0 && j == 0)
CERT_STORE_ADD_ALWAYS, NULL); ret = CertAddCertificateContextToStore(store,
chain->rgpChain[i]->rgpElement[j]->pCertContext,
CERT_STORE_ADD_ALWAYS, &cert);
else
ret = CertAddCertificateContextToStore(store,
chain->rgpChain[i]->rgpElement[j]->pCertContext,
CERT_STORE_ADD_ALWAYS, NULL);
}
CertFreeCertificateChain(chain); CertFreeCertificateChain(chain);
} }
} }
@ -6553,7 +6562,27 @@ static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo,
} }
else else
ret = CertAddCertificateContextToStore(store, ret = CertAddCertificateContextToStore(store,
pExportInfo->u.pCertContext, CERT_STORE_ADD_ALWAYS, NULL); pExportInfo->u.pCertContext, CERT_STORE_ADD_ALWAYS, &cert);
/* Copy private key info to newly created cert, so it'll get exported
* along with the cert.
*/
if (ret && pContextInfo->fExportPrivateKeys)
{
if (keyProvInfo)
ret = CertSetCertificateContextProperty(cert,
CERT_KEY_PROV_INFO_PROP_ID, 0, keyProvInfo);
else
{
if (!(keyProvInfo = export_get_private_key_info(cert)))
ret = FALSE;
else
{
ret = CertSetCertificateContextProperty(cert,
CERT_KEY_PROV_INFO_PROP_ID, 0, keyProvInfo);
HeapFree(GetProcessHeap(), 0, keyProvInfo);
}
}
}
if (ret) if (ret)
{ {
DWORD exportFlags = DWORD exportFlags =
@ -6583,13 +6612,15 @@ static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo,
} }
} }
} }
CertFreeCertificateContext(cert);
CertCloseStore(store, 0); CertCloseStore(store, 0);
} }
return ret; return ret;
} }
static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo,
PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO pContextInfo) PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO pContextInfo,
PCRYPT_KEY_PROV_INFO keyProvInfo)
{ {
BOOL ret; BOOL ret;
@ -6633,7 +6664,7 @@ static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo,
pContextInfo->fExportChain); pContextInfo->fExportChain);
break; break;
case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: case CRYPTUI_WIZ_EXPORT_FORMAT_PFX:
ret = save_pfx(file, pExportInfo, pContextInfo); ret = save_pfx(file, pExportInfo, pContextInfo, keyProvInfo);
break; break;
default: default:
SetLastError(E_FAIL); SetLastError(E_FAIL);
@ -6697,7 +6728,7 @@ static LRESULT CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER);
if ((data->success = do_export(data->file, &data->exportInfo, if ((data->success = do_export(data->file, &data->exportInfo,
&data->contextInfo))) &data->contextInfo, data->keyProvInfo)))
{ {
messageID = IDS_EXPORT_SUCCEEDED; messageID = IDS_EXPORT_SUCCEEDED;
mbFlags = MB_OK; mbFlags = MB_OK;
@ -6902,7 +6933,7 @@ BOOL WINAPI CryptUIWizExport(DWORD dwFlags, HWND hwndParent,
if (file != INVALID_HANDLE_VALUE) if (file != INVALID_HANDLE_VALUE)
{ {
ret = do_export(file, pExportInfo, pvoid); ret = do_export(file, pExportInfo, pvoid, NULL);
CloseHandle(file); CloseHandle(file);
} }
else else