February 2009 - Wine-Commits

Juan Lang : cryptui: Save private key in temporary store when exporting it.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: ccc2be7470029db7512579b498c45b0c7da8cec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc2be7470029db7512579b49… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Feb 6 12:17:45 2009 -0800 cryptui: Save private key in temporary store when exporting it. --- dlls/cryptui/main.c | 49 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 620f53f..5cd38e7 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -6499,7 +6499,8 @@ static BOOL save_serialized_store(HANDLE file, HCERTSTORE store) } 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, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -6508,6 +6509,7 @@ static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, if (store) { CRYPT_DATA_BLOB pfxBlob = { 0, NULL }; + PCCERT_CONTEXT cert = NULL; 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 (j = 0; ret && j < chain->rgpChain[i]->cElement; j++) - ret = CertAddCertificateContextToStore(store, - chain->rgpChain[i]->rgpElement[j]->pCertContext, - CERT_STORE_ADD_ALWAYS, NULL); + { + if (i == 0 && j == 0) + 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); } } @@ -6553,7 +6562,27 @@ static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, } else 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) { DWORD exportFlags = @@ -6583,13 +6612,15 @@ static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, } } } + CertFreeCertificateContext(cert); CertCloseStore(store, 0); } return ret; } 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; @@ -6633,7 +6664,7 @@ static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, pContextInfo->fExportChain); break; case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: - ret = save_pfx(file, pExportInfo, pContextInfo); + ret = save_pfx(file, pExportInfo, pContextInfo, keyProvInfo); break; default: 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); if ((data->success = do_export(data->file, &data->exportInfo, - &data->contextInfo))) + &data->contextInfo, data->keyProvInfo))) { messageID = IDS_EXPORT_SUCCEEDED; mbFlags = MB_OK; @@ -6902,7 +6933,7 @@ BOOL WINAPI CryptUIWizExport(DWORD dwFlags, HWND hwndParent, if (file != INVALID_HANDLE_VALUE) { - ret = do_export(file, pExportInfo, pvoid); + ret = do_export(file, pExportInfo, pvoid, NULL); CloseHandle(file); } else

1 0

Juan Lang : cryptui: Implement exporting to a PFX file.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 0d961d9ce37b45a43f04a0afb2c03deec0c1e291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d961d9ce37b45a43f04a0afb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 1 14:27:59 2009 -0800 cryptui: Implement exporting to a PFX file. --- dlls/cryptui/main.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 6a8e9e8..ee01c6e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -6413,6 +6413,96 @@ static BOOL save_serialized_store(HANDLE file, HCERTSTORE store) CERT_STORE_SAVE_AS_STORE, CERT_STORE_SAVE_TO_FILE, file, 0); } +static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, + PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO pContextInfo) +{ + HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, + 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + BOOL ret = FALSE; + + if (store) + { + CRYPT_DATA_BLOB pfxBlob = { 0, NULL }; + + if (pContextInfo->fExportChain) + { + HCERTCHAINENGINE engine = NULL; + + if (pExportInfo->cStores) + { + CERT_CHAIN_ENGINE_CONFIG config; + + memset(&config, 0, sizeof(config)); + config.cbSize = sizeof(config); + config.cAdditionalStore = pExportInfo->cStores; + config.rghAdditionalStore = pExportInfo->rghStores; + ret = CertCreateCertificateChainEngine(&config, &engine); + } + else + ret = TRUE; + if (ret) + { + CERT_CHAIN_PARA chainPara; + PCCERT_CHAIN_CONTEXT chain; + + memset(&chainPara, 0, sizeof(chainPara)); + chainPara.cbSize = sizeof(chainPara); + ret = CertGetCertificateChain(engine, + pExportInfo->u.pCertContext, NULL, NULL, &chainPara, 0, NULL, + &chain); + if (ret) + { + DWORD i, j; + + for (i = 0; ret && i < chain->cChain; i++) + for (j = 0; ret && j < chain->rgpChain[i]->cElement; + j++) + ret = CertAddCertificateContextToStore(store, + chain->rgpChain[i]->rgpElement[j]->pCertContext, + CERT_STORE_ADD_ALWAYS, NULL); + CertFreeCertificateChain(chain); + } + } + if (engine) + CertFreeCertificateChainEngine(engine); + } + else + ret = CertAddCertificateContextToStore(store, + pExportInfo->u.pCertContext, CERT_STORE_ADD_ALWAYS, NULL); + if (ret) + { + DWORD exportFlags = + REPORT_NOT_ABLE_TO_EXPORT_PRIVATE_KEY | EXPORT_PRIVATE_KEYS; + + ret = PFXExportCertStore(store, &pfxBlob, + pContextInfo->pwszPassword, exportFlags); + if (ret) + { + pfxBlob.pbData = HeapAlloc(GetProcessHeap(), 0, pfxBlob.cbData); + if (pfxBlob.pbData) + { + ret = PFXExportCertStore(store, &pfxBlob, + pContextInfo->pwszPassword, exportFlags); + if (ret) + { + DWORD bytesWritten; + + ret = WriteFile(file, pfxBlob.pbData, pfxBlob.cbData, + &bytesWritten, NULL); + } + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } + } + } + CertCloseStore(store, 0); + } + return ret; +} + static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO pContextInfo) { @@ -6458,8 +6548,7 @@ static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, pContextInfo->fExportChain); break; case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: - FIXME("unimplemented for PFX\n"); - ret = FALSE; + ret = save_pfx(file, pExportInfo, pContextInfo); break; default: SetLastError(E_FAIL);

1 0

Juan Lang : cryptui: Ensure a certificate' s private key is exportable before allowing it to be selected for export.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: af87814ac6552a2358e9df4a439bea765b4305be URL: http://source.winehq.org/git/wine.git/?a=commit;h=af87814ac6552a2358e9df4a4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Feb 6 12:05:30 2009 -0800 cryptui: Ensure a certificate's private key is exportable before allowing it to be selected for export. --- dlls/cryptui/cryptui_En.rc | 3 ++ dlls/cryptui/cryptuires.h | 7 +++- dlls/cryptui/main.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 8cabea4..c6d6559 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -166,6 +166,8 @@ STRINGTABLE DISCARDABLE IDS_EXPORT_PASSWORD_TITLE "Enter Password" IDS_EXPORT_PASSWORD_SUBTITLE "You may password-protect a private key." IDS_EXPORT_PASSWORD_MISMATCH "The passwords do not match." + IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Note: The private key for this certificate could not be opened." + IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Note: The private key for this certificate is not exportable." } IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 @@ -396,6 +398,7 @@ BEGIN IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "N&o, do not export the private key", IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON + LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24 END IDD_EXPORT_PASSWORD DIALOG DISCARDABLE 0,0,317,143 diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index e16bb21..b46ea4e 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -165,6 +165,8 @@ #define IDS_EXPORT_PASSWORD_TITLE 1222 #define IDS_EXPORT_PASSWORD_SUBTITLE 1223 #define IDS_EXPORT_PASSWORD_MISMATCH 1224 +#define IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE 1225 +#define IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE 1226 #define IDD_GENERAL 100 #define IDD_DETAIL 101 @@ -262,7 +264,8 @@ #define IDC_EXPORT_SETTINGS 2911 #define IDC_EXPORT_PRIVATE_KEY_YES 2912 #define IDC_EXPORT_PRIVATE_KEY_NO 2913 -#define IDC_EXPORT_PASSWORD 2914 -#define IDC_EXPORT_PASSWORD_CONFIRM 2915 +#define IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE 2914 +#define IDC_EXPORT_PASSWORD 2915 +#define IDC_EXPORT_PASSWORD_CONFIRM 2916 #endif /* ndef __CRYPTUIRES_H_ */ diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 677bee4..620f53f 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5518,6 +5518,7 @@ struct ExportWizData CRYPTUI_WIZ_EXPORT_INFO exportInfo; CRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO contextInfo; BOOL freePassword; + PCRYPT_KEY_PROV_INFO keyProvInfo; LPWSTR fileName; HANDLE file; BOOL success; @@ -5567,6 +5568,63 @@ static LRESULT CALLBACK export_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, return ret; } +static PCRYPT_KEY_PROV_INFO export_get_private_key_info(PCCERT_CONTEXT cert) +{ + PCRYPT_KEY_PROV_INFO info = NULL; + DWORD size; + + if (CertGetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, + NULL, &size)) + { + info = HeapAlloc(GetProcessHeap(), 0, size); + if (info) + { + if (!CertGetCertificateContextProperty(cert, + CERT_KEY_PROV_INFO_PROP_ID, info, &size)) + { + HeapFree(GetProcessHeap(), 0, info); + info = NULL; + } + } + } + return info; +} + +static BOOL export_acquire_private_key(PCRYPT_KEY_PROV_INFO info, + HCRYPTPROV *phProv) +{ + BOOL ret; + + ret = CryptAcquireContextW(phProv, info->pwszContainerName, + info->pwszProvName, info->dwProvType, 0); + if (ret) + { + DWORD i; + + for (i = 0; i < info->cProvParam; i++) + CryptSetProvParam(*phProv, info->rgProvParam[i].dwParam, + info->rgProvParam[i].pbData, info->rgProvParam[i].dwFlags); + } + return ret; +} + +static BOOL export_is_key_exportable(HCRYPTPROV hProv, DWORD keySpec) +{ + BOOL ret; + HCRYPTKEY key; + + if ((ret = CryptGetUserKey(hProv, keySpec, &key))) + { + DWORD permissions, size = sizeof(permissions); + + if ((ret = CryptGetKeyParam(key, KP_PERMISSIONS, (BYTE *)&permissions, + &size, 0)) && !(permissions & CRYPT_EXPORT)) + ret = FALSE; + CryptDestroyKey(key); + } + return ret; +} + static LRESULT CALLBACK export_private_key_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -5578,9 +5636,36 @@ static LRESULT CALLBACK export_private_key_dlg_proc(HWND hwnd, UINT msg, case WM_INITDIALOG: { PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; + PCRYPT_KEY_PROV_INFO info; + HCRYPTPROV hProv = 0; + int errorID = 0; data = (struct ExportWizData *)page->lParam; SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + /* Get enough information about a key to see whether it's exportable. + */ + if (!(info = export_get_private_key_info( + data->exportInfo.u.pCertContext))) + errorID = IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE; + else if (!export_acquire_private_key(info, &hProv)) + errorID = IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE; + else if (!export_is_key_exportable(hProv, info->dwKeySpec)) + errorID = IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE; + + if (errorID) + { + WCHAR error[MAX_STRING_LEN]; + + LoadStringW(hInstance, errorID, error, + sizeof(error) / sizeof(error[0])); + SendMessageW(GetDlgItem(hwnd, IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE), + WM_SETTEXT, 0, (LPARAM)error); + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_PRIVATE_KEY_YES), FALSE); + } + else + data->keyProvInfo = info; + if (hProv) + CryptReleaseContext(hProv, 0); SendMessageW(GetDlgItem(hwnd, IDC_EXPORT_PRIVATE_KEY_NO), BM_CLICK, 0, 0); break; @@ -6671,6 +6756,7 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, memcpy(&data.contextInfo, pvoid, min(((PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO)pvoid)->dwSize, sizeof(data.contextInfo))); + data.keyProvInfo = NULL; data.fileName = NULL; data.file = INVALID_HANDLE_VALUE; data.success = FALSE; @@ -6785,6 +6871,7 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, if (data.freePassword) HeapFree(GetProcessHeap(), 0, (LPWSTR)data.contextInfo.pwszPassword); + HeapFree(GetProcessHeap(), 0, data.keyProvInfo); CloseHandle(data.file); HeapFree(GetProcessHeap(), 0, data.fileName); if (l == 0)

1 0

Juan Lang : cryptui: Correct return value of the user cancels the export wizard.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: fd3cd61b5d05a8a8fee3f1b4a2111e6733f23432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3cd61b5d05a8a8fee3f1b4a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 1 14:31:37 2009 -0800 cryptui: Correct return value of the user cancels the export wizard. --- dlls/cryptui/main.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index ee01c6e..677bee4 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -6650,6 +6650,7 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, struct ExportWizData data; int nPages = 0; BOOL hasPrivateKey, showFormatPage = TRUE; + INT_PTR l; data.dwFlags = dwFlags; data.pwszWizardTitle = pwszWizardTitle; @@ -6779,14 +6780,20 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, hdr.nPages = nPages; hdr.u4.pszbmWatermark = MAKEINTRESOURCEW(IDB_CERT_WATERMARK); hdr.u5.pszbmHeader = MAKEINTRESOURCEW(IDB_CERT_HEADER); - PropertySheetW(&hdr); + l = PropertySheetW(&hdr); DeleteObject(data.titleFont); if (data.freePassword) HeapFree(GetProcessHeap(), 0, (LPWSTR)data.contextInfo.pwszPassword); CloseHandle(data.file); HeapFree(GetProcessHeap(), 0, data.fileName); - return data.success; + if (l == 0) + { + SetLastError(ERROR_CANCELLED); + return FALSE; + } + else + return data.success; } BOOL WINAPI CryptUIWizExport(DWORD dwFlags, HWND hwndParent,

1 0

Juan Lang : cryptui: Skip password page when moving backward through the export wizard if it wasn 't shown in the first place.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 8cb9702265ff59ab39b498a1672aed0f79c9aa49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb9702265ff59ab39b498a16… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 1 13:23:04 2009 -0800 cryptui: Skip password page when moving backward through the export wizard if it wasn't shown in the first place. --- dlls/cryptui/main.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index b05edec..6a8e9e8 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -6114,6 +6114,15 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, switch (hdr->code) { + case PSN_WIZBACK: + data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + if (data->contextInfo.dwExportFormat != + CRYPTUI_WIZ_EXPORT_FORMAT_PFX) + { + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, IDD_EXPORT_FORMAT); + ret = 1; + } + break; case PSN_WIZNEXT: { HWND fileNameEdit = GetDlgItem(hwnd, IDC_EXPORT_FILENAME);

1 0

Juan Lang : cryptui: Validate password in export wizard.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 0eefd4fb3bfbb46acb4b096753f7bc0369202a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eefd4fb3bfbb46acb4b09675… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 1 12:54:09 2009 -0800 cryptui: Validate password in export wizard. --- dlls/cryptui/cryptui_En.rc | 1 + dlls/cryptui/cryptuires.h | 1 + dlls/cryptui/main.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 36dab7c..8cabea4 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -165,6 +165,7 @@ STRINGTABLE DISCARDABLE IDS_EXPORT_PRIVATE_KEY_SUBTITLE "The certificate contains a private key which may be exported along with the certificate." IDS_EXPORT_PASSWORD_TITLE "Enter Password" IDS_EXPORT_PASSWORD_SUBTITLE "You may password-protect a private key." + IDS_EXPORT_PASSWORD_MISMATCH "The passwords do not match." } IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index ca37608..e16bb21 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -164,6 +164,7 @@ #define IDS_EXPORT_PRIVATE_KEY_SUBTITLE 1221 #define IDS_EXPORT_PASSWORD_TITLE 1222 #define IDS_EXPORT_PASSWORD_SUBTITLE 1223 +#define IDS_EXPORT_PASSWORD_MISMATCH 1224 #define IDD_GENERAL 100 #define IDD_DETAIL 101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 911d588..b05edec 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5517,6 +5517,7 @@ struct ExportWizData LPCWSTR pwszWizardTitle; CRYPTUI_WIZ_EXPORT_INFO exportInfo; CRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO contextInfo; + BOOL freePassword; LPWSTR fileName; HANDLE file; BOOL success; @@ -5776,6 +5777,25 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, return ret; } +static void export_password_mismatch(HWND hwnd, struct ExportWizData *data) +{ + WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN]; + LPCWSTR pTitle; + + if (data->pwszWizardTitle) + pTitle = data->pwszWizardTitle; + else + { + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, + sizeof(title) / sizeof(title[0])); + pTitle = title; + } + LoadStringW(hInstance, IDS_EXPORT_PASSWORD_MISMATCH, error, + sizeof(error) / sizeof(error[0])); + MessageBoxW(hwnd, error, pTitle, MB_ICONERROR | MB_OK); + SetFocus(GetDlgItem(hwnd, IDC_EXPORT_PASSWORD)); +} + static LRESULT CALLBACK export_password_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -5803,6 +5823,58 @@ static LRESULT CALLBACK export_password_dlg_proc(HWND hwnd, UINT msg, PSWIZB_BACK | PSWIZB_NEXT); ret = TRUE; break; + case PSN_WIZNEXT: + { + HWND passwordEdit = GetDlgItem(hwnd, IDC_EXPORT_PASSWORD); + HWND passwordConfirmEdit = GetDlgItem(hwnd, + IDC_EXPORT_PASSWORD_CONFIRM); + DWORD passwordLen = SendMessageW(passwordEdit, WM_GETTEXTLENGTH, + 0, 0); + DWORD passwordConfirmLen = SendMessageW(passwordConfirmEdit, + WM_GETTEXTLENGTH, 0, 0); + + data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + if (!passwordLen && !passwordConfirmLen) + data->contextInfo.pwszPassword = NULL; + else if (passwordLen != passwordConfirmLen) + { + export_password_mismatch(hwnd, data); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 1); + ret = 1; + } + else + { + LPWSTR password = HeapAlloc(GetProcessHeap(), 0, + (passwordLen + 1) * sizeof(WCHAR)); + LPWSTR passwordConfirm = HeapAlloc(GetProcessHeap(), 0, + (passwordConfirmLen + 1) * sizeof(WCHAR)); + BOOL freePassword = TRUE; + + if (password && passwordConfirm) + { + SendMessageW(passwordEdit, WM_GETTEXT, passwordLen + 1, + (LPARAM)password); + SendMessageW(passwordConfirmEdit, WM_GETTEXT, + passwordConfirmLen + 1, (LPARAM)passwordConfirm); + if (strcmpW(password, passwordConfirm)) + { + export_password_mismatch(hwnd, data); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 1); + ret = 1; + } + else + { + data->contextInfo.pwszPassword = password; + freePassword = FALSE; + data->freePassword = TRUE; + } + } + if (freePassword) + HeapFree(GetProcessHeap(), 0, password); + HeapFree(GetProcessHeap(), 0, passwordConfirm); + } + break; + } } break; } @@ -6493,6 +6565,8 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, data.contextInfo.fExportChain = FALSE; data.contextInfo.fStrongEncryption = FALSE; data.contextInfo.fExportPrivateKeys = FALSE; + data.contextInfo.pwszPassword = NULL; + data.freePassword = FALSE; if (pExportInfo->dwSubjectChoice == CRYPTUI_WIZ_EXPORT_CERT_CONTEXT && pvoid) memcpy(&data.contextInfo, pvoid, @@ -6609,6 +6683,9 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, hdr.u5.pszbmHeader = MAKEINTRESOURCEW(IDB_CERT_HEADER); PropertySheetW(&hdr); DeleteObject(data.titleFont); + if (data.freePassword) + HeapFree(GetProcessHeap(), 0, + (LPWSTR)data.contextInfo.pwszPassword); CloseHandle(data.file); HeapFree(GetProcessHeap(), 0, data.fileName); return data.success;

1 0

Juan Lang : cryptui: Only show password page if the private key is to be exported.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 6209459b213938df4a7c587792ddf6750e85cbd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6209459b213938df4a7c58779… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 1 11:38:52 2009 -0800 cryptui: Only show password page if the private key is to be exported. --- dlls/cryptui/main.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 4ac3784..911d588 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5702,6 +5702,8 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, break; case PSN_WIZNEXT: { + BOOL skipPasswordPage = TRUE; + data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); if (IsDlgButtonChecked(hwnd, IDC_EXPORT_FORMAT_DER)) data->contextInfo.dwExportFormat = @@ -5727,7 +5729,11 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data->contextInfo.fStrongEncryption = TRUE; if (IsDlgButtonChecked(hwnd, IDC_EXPORT_PFX_DELETE_PRIVATE_KEY)) data->contextInfo.fExportPrivateKeys = TRUE; + skipPasswordPage = FALSE; } + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, + skipPasswordPage ? IDD_EXPORT_FILE : 0); + ret = 1; break; } }

1 0

Juan Lang : cryptui: Add a password page to the export wizard.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 9c52df8364200caed2179625355b92577f095b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c52df8364200caed21796253… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 1 11:34:21 2009 -0800 cryptui: Add a password page to the export wizard. --- dlls/cryptui/cryptui_En.rc | 12 +++++++++++ dlls/cryptui/cryptuires.h | 4 +++ dlls/cryptui/main.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 61 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 8e61d7b..36dab7c 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -163,6 +163,8 @@ STRINGTABLE DISCARDABLE IDS_EXPORT_FAILED "The export failed." IDS_EXPORT_PRIVATE_KEY_TITLE "Export Private Key" IDS_EXPORT_PRIVATE_KEY_SUBTITLE "The certificate contains a private key which may be exported along with the certificate." + IDS_EXPORT_PASSWORD_TITLE "Enter Password" + IDS_EXPORT_PASSWORD_SUBTITLE "You may password-protect a private key." } IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 @@ -395,6 +397,16 @@ BEGIN IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON END +IDD_EXPORT_PASSWORD DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificate Export Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Password:", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&Confirm password:", -1, 21,35,195,10 + EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP +END + IDD_EXPORT_FORMAT DIALOG DISCARDABLE 0,0,317,143 CAPTION "Certificate Export Wizard" FONT 8, "MS Shell Dlg" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 45eb12b..ca37608 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -162,6 +162,8 @@ #define IDS_EXPORT_FAILED 1219 #define IDS_EXPORT_PRIVATE_KEY_TITLE 1220 #define IDS_EXPORT_PRIVATE_KEY_SUBTITLE 1221 +#define IDS_EXPORT_PASSWORD_TITLE 1222 +#define IDS_EXPORT_PASSWORD_SUBTITLE 1223 #define IDD_GENERAL 100 #define IDD_DETAIL 101 @@ -259,5 +261,7 @@ #define IDC_EXPORT_SETTINGS 2911 #define IDC_EXPORT_PRIVATE_KEY_YES 2912 #define IDC_EXPORT_PRIVATE_KEY_NO 2913 +#define IDC_EXPORT_PASSWORD 2914 +#define IDC_EXPORT_PASSWORD_CONFIRM 2915 #endif /* ndef __CRYPTUIRES_H_ */ diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 2523db6..4ac3784 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5770,6 +5770,40 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, return ret; } +static LRESULT CALLBACK export_password_dlg_proc(HWND hwnd, UINT msg, + WPARAM wp, LPARAM lp) +{ + LRESULT ret = 0; + struct ExportWizData *data; + + switch (msg) + { + case WM_INITDIALOG: + { + PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; + + data = (struct ExportWizData *)page->lParam; + SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + break; + } + case WM_NOTIFY: + { + NMHDR *hdr = (NMHDR *)lp; + + switch (hdr->code) + { + case PSN_SETACTIVE: + PostMessageW(GetParent(hwnd), PSM_SETWIZBUTTONS, 0, + PSWIZB_BACK | PSWIZB_NEXT); + ret = TRUE; + break; + } + break; + } + } + return ret; +} + static LPWSTR export_append_extension(struct ExportWizData *data, LPWSTR fileName) { @@ -6521,7 +6555,17 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, } if (hasPrivateKey && showFormatPage) { - FIXME("add password page\n"); + pages[nPages].dwSize = sizeof(pages[0]); + pages[nPages].hInstance = hInstance; + pages[nPages].u.pszTemplate = MAKEINTRESOURCEW(IDD_EXPORT_PASSWORD); + pages[nPages].pfnDlgProc = export_password_dlg_proc; + pages[nPages].dwFlags = PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + pages[nPages].pszHeaderTitle = + MAKEINTRESOURCEW(IDS_EXPORT_PASSWORD_TITLE); + pages[nPages].pszHeaderSubTitle = + MAKEINTRESOURCEW(IDS_EXPORT_PASSWORD_SUBTITLE); + pages[nPages].lParam = (LPARAM)&data; + nPages++; } pages[nPages].dwSize = sizeof(pages[0]);

1 0

Juan Lang : cryptui: Enable/ disable PFX choice based on whether the private key is to be exported.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 7dae1dc5129b19acd75a092cb29bc9bc32291dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dae1dc5129b19acd75a092cb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 1 11:14:31 2009 -0800 cryptui: Enable/disable PFX choice based on whether the private key is to be exported. --- dlls/cryptui/main.c | 61 +++++++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 23 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 13ad832..2523db6 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5635,6 +5635,41 @@ static BOOL export_info_has_private_key(PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo) return ret; } +static void export_format_enable_controls(HWND hwnd, struct ExportWizData *data) +{ + int defaultFormatID; + + switch (data->contextInfo.dwExportFormat) + { + case CRYPTUI_WIZ_EXPORT_FORMAT_BASE64: + defaultFormatID = IDC_EXPORT_FORMAT_BASE64; + break; + case CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7: + defaultFormatID = IDC_EXPORT_FORMAT_CMS; + break; + case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: + defaultFormatID = IDC_EXPORT_FORMAT_PFX; + break; + default: + defaultFormatID = IDC_EXPORT_FORMAT_DER; + } + SendMessageW(GetDlgItem(hwnd, defaultFormatID), BM_CLICK, 0, 0); + if (defaultFormatID == IDC_EXPORT_FORMAT_PFX) + { + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_DER), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_BASE64), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_CMS), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_PFX), TRUE); + } + else + { + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_DER), TRUE); + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_BASE64), TRUE); + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_CMS), TRUE); + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_PFX), FALSE); + } +} + static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -5646,32 +5681,10 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, case WM_INITDIALOG: { PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; - int defaultFormatID; - BOOL hasPrivateKey; data = (struct ExportWizData *)page->lParam; SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); - hasPrivateKey = export_info_has_private_key(&data->exportInfo); - if (hasPrivateKey) - EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_PFX), TRUE); - switch (data->contextInfo.dwExportFormat) - { - case CRYPTUI_WIZ_EXPORT_FORMAT_BASE64: - defaultFormatID = IDC_EXPORT_FORMAT_BASE64; - break; - case CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7: - defaultFormatID = IDC_EXPORT_FORMAT_CMS; - break; - case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: - if (hasPrivateKey) - defaultFormatID = IDC_EXPORT_FORMAT_PFX; - else - defaultFormatID = IDC_EXPORT_FORMAT_DER; - break; - default: - defaultFormatID = IDC_EXPORT_FORMAT_DER; - } - SendMessageW(GetDlgItem(hwnd, defaultFormatID), BM_CLICK, 0, 0); + export_format_enable_controls(hwnd, data); break; } case WM_NOTIFY: @@ -5683,6 +5696,8 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, case PSN_SETACTIVE: PostMessageW(GetParent(hwnd), PSM_SETWIZBUTTONS, 0, PSWIZB_BACK | PSWIZB_NEXT); + data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + export_format_enable_controls(hwnd, data); ret = TRUE; break; case PSN_WIZNEXT:

1 0

Juan Lang : cryptui: Set default export format based on whether the private key is to be exported .
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: f09b7fa12fbd8c7227d64f494c051c47fbb307c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09b7fa12fbd8c7227d64f494… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 1 11:06:44 2009 -0800 cryptui: Set default export format based on whether the private key is to be exported. --- dlls/cryptui/main.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 36ba3f7..13ad832 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5570,12 +5570,12 @@ static LRESULT CALLBACK export_private_key_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { LRESULT ret = 0; + struct ExportWizData *data; switch (msg) { case WM_INITDIALOG: { - struct ExportWizData *data; PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; data = (struct ExportWizData *)page->lParam; @@ -5595,6 +5595,21 @@ static LRESULT CALLBACK export_private_key_dlg_proc(HWND hwnd, UINT msg, PSWIZB_BACK | PSWIZB_NEXT); ret = TRUE; break; + case PSN_WIZNEXT: + data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + if (IsDlgButtonChecked(hwnd, IDC_EXPORT_PRIVATE_KEY_NO)) + { + data->contextInfo.dwExportFormat = + CRYPTUI_WIZ_EXPORT_FORMAT_DER; + data->contextInfo.fExportPrivateKeys = FALSE; + } + else + { + data->contextInfo.dwExportFormat = + CRYPTUI_WIZ_EXPORT_FORMAT_PFX; + data->contextInfo.fExportPrivateKeys = TRUE; + } + break; } break; }

1 0