December 2008 - Wine-commits

Juan Lang : cryptui: Validate input file in CryptUIWizImport.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: db91fdfaa8204fd77d5f4667c5342d60183f6062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db91fdfaa8204fd77d5f4667c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:16:48 2008 -0800 cryptui: Validate input file in CryptUIWizImport. --- dlls/cryptui/cryptui_En.rc | 2 + dlls/cryptui/cryptuires.h | 2 + dlls/cryptui/main.c | 85 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 9f42d2e..7557cf0 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -77,6 +77,8 @@ STRINGTABLE DISCARDABLE IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 Messages (*.spc; *.p7b)" IDS_IMPORT_FILTER_ALL "All Files (*.*)" IDS_IMPORT_EMPTY_FILE "Please select a file." + IDS_IMPORT_BAD_FORMAT "The file format is not recognized. Please select another file." + IDS_IMPORT_OPEN_FAILED "Could not open " IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index b5883a6..9004dc7 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -74,6 +74,8 @@ #define IDS_IMPORT_FILTER_CMS 1054 #define IDS_IMPORT_FILTER_ALL 1055 #define IDS_IMPORT_EMPTY_FILE 1056 +#define IDS_IMPORT_BAD_FORMAT 1057 +#define IDS_IMPORT_OPEN_FAILED 1058 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 4c53d88..f8450cc 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3785,6 +3785,77 @@ struct ImportWizData HCERTSTORE hDestCertStore; }; +static BOOL import_validate_filename(HWND hwnd, struct ImportWizData *data, + LPCWSTR fileName) +{ + HANDLE file; + BOOL ret = FALSE; + + file = CreateFileW(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, 0, NULL); + if (file != INVALID_HANDLE_VALUE) + { + HCERTSTORE source = open_store_from_file(data->dwFlags, fileName); + int warningID = 0; + + if (!source) + warningID = IDS_IMPORT_BAD_FORMAT; + else if (!check_store_context_type(data->dwFlags, source)) + warningID = IDS_IMPORT_TYPE_MISMATCH; + else + { + FIXME("save %s for import\n", debugstr_w(fileName)); + CertCloseStore(source, 0); + ret = TRUE; + } + if (warningID) + { + import_warning(data->dwFlags, hwnd, data->pwszWizardTitle, + warningID); + } + CloseHandle(file); + } + else + { + WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN]; + LPCWSTR pTitle; + LPWSTR msgBuf, fullError; + + if (data->pwszWizardTitle) + pTitle = data->pwszWizardTitle; + else + { + LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, + sizeof(title) / sizeof(title[0])); + pTitle = title; + } + LoadStringW(hInstance, IDS_IMPORT_OPEN_FAILED, error, + sizeof(error) / sizeof(error[0])); + FormatMessageW( + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, + GetLastError(), 0, (LPWSTR) &msgBuf, 0, NULL); + fullError = HeapAlloc(GetProcessHeap(), 0, + (strlenW(error) + strlenW(fileName) + strlenW(msgBuf) + 3) + * sizeof(WCHAR)); + if (fullError) + { + LPWSTR ptr = fullError; + + strcpyW(ptr, error); + ptr += strlenW(error); + strcpyW(ptr, fileName); + ptr += strlenW(fileName); + *ptr++ = ':'; + *ptr++ = '\n'; + strcpyW(ptr, msgBuf); + MessageBoxW(hwnd, fullError, pTitle, MB_ICONERROR | MB_OK); + HeapFree(GetProcessHeap(), 0, fullError); + } + LocalFree(msgBuf); + } + return ret; +} + static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -3830,9 +3901,17 @@ static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPWSTR fileName = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); - SendMessageW(fileNameEdit, WM_GETTEXT, len + 1, - (LPARAM)fileName); - FIXME("validate %s\n", debugstr_w(fileName)); + if (fileName) + { + SendMessageW(fileNameEdit, WM_GETTEXT, len + 1, + (LPARAM)fileName); + if (!import_validate_filename(hwnd, data, fileName)) + { + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 1); + ret = 1; + } + HeapFree(GetProcessHeap(), 0, fileName); + } } break; }

1 0

Juan Lang : cryptui: Store input file as a store in the file page of CryptUIWizImport.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: b9917661aa25f6a58d2e191e67c103b7f5262e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9917661aa25f6a58d2e191e6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:17:28 2008 -0800 cryptui: Store input file as a store in the file page of CryptUIWizImport. --- dlls/cryptui/main.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index f8450cc..a7f8a1b 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3781,7 +3781,8 @@ struct ImportWizData { DWORD dwFlags; LPCWSTR pwszWizardTitle; - PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc; + CRYPTUI_WIZ_IMPORT_SRC_INFO importSrc; + BOOL freeSource; HCERTSTORE hDestCertStore; }; @@ -3804,8 +3805,10 @@ static BOOL import_validate_filename(HWND hwnd, struct ImportWizData *data, warningID = IDS_IMPORT_TYPE_MISMATCH; else { - FIXME("save %s for import\n", debugstr_w(fileName)); - CertCloseStore(source, 0); + data->importSrc.dwSubjectChoice = + CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE; + data->importSrc.u.hCertStore = source; + data->freeSource = TRUE; ret = TRUE; } if (warningID) @@ -4002,11 +4005,18 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, { PROPSHEETHEADERW hdr; PROPSHEETPAGEW pages[4]; - struct ImportWizData data = { dwFlags, pwszWizardTitle, pImportSrc, - hDestCertStore }; + struct ImportWizData data; FIXME("\n"); + data.dwFlags = dwFlags; + data.pwszWizardTitle = pwszWizardTitle; + if (pImportSrc) + memcpy(&data.importSrc, pImportSrc, sizeof(data.importSrc)); + else + memset(&data.importSrc, 0, sizeof(data.importSrc)); + data.freeSource = FALSE; + data.hDestCertStore = hDestCertStore; memset(&pages, 0, sizeof(pages)); pages[0].dwSize = sizeof(pages[0]); @@ -4050,6 +4060,9 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, hdr.u3.ppsp = pages; hdr.nPages = 4; PropertySheetW(&hdr); + if (data.freeSource && + data.importSrc.dwSubjectChoice == CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE) + CertCloseStore(data.importSrc.u.hCertStore, 0); return FALSE; }

1 0

Juan Lang : cryptui: Show UI rather than failing if no import source is specified.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: dbab34e8d574555778e25584f44137486a621708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbab34e8d574555778e25584f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:09:28 2008 -0800 cryptui: Show UI rather than failing if no import source is specified. --- dlls/cryptui/main.c | 74 +++++++++++++++++++++++++++----------------------- 1 files changed, 40 insertions(+), 34 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 074d8be..c37c6aa 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3941,9 +3941,7 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT TRACE("(0x%08x, %p, %s, %p, %p)\n", dwFlags, hwndParent, debugstr_w(pwszWizardTitle), pImportSrc, hDestCertStore); - if (!(dwFlags & CRYPTUI_WIZ_NO_UI)) FIXME("UI not implemented\n"); - - if (!pImportSrc || + if (pImportSrc && pImportSrc->dwSize != sizeof(CRYPTUI_WIZ_IMPORT_SRC_INFO)) { SetLastError(E_INVALIDARG); @@ -3953,39 +3951,47 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT if (!(dwFlags & CRYPTUI_WIZ_NO_UI)) ret = show_import_ui(dwFlags, hwndParent, pwszWizardTitle, pImportSrc, hDestCertStore); - - switch (pImportSrc->dwSubjectChoice) + else if (pImportSrc) { - case CRYPTUI_WIZ_IMPORT_SUBJECT_FILE: - ret = import_file(dwFlags, hwndParent, pwszWizardTitle, - pImportSrc->u.pwszFileName, hDestCertStore); - break; - case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT: - if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CERT))) - ret = import_cert(pImportSrc->u.pCertContext, hDestCertStore); - else - import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); - break; - case CRYPTUI_WIZ_IMPORT_SUBJECT_CRL_CONTEXT: - if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CRL))) - ret = import_crl(pImportSrc->u.pCRLContext, hDestCertStore); - else - import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); - break; - case CRYPTUI_WIZ_IMPORT_SUBJECT_CTL_CONTEXT: - if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CTL))) - ret = import_ctl(pImportSrc->u.pCTLContext, hDestCertStore); - else - import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); - break; - case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE: - ret = import_store(dwFlags, hwndParent, pwszWizardTitle, - pImportSrc->u.hCertStore, hDestCertStore); - break; - default: - WARN("unknown source type: %u\n", pImportSrc->dwSubjectChoice); + switch (pImportSrc->dwSubjectChoice) + { + case CRYPTUI_WIZ_IMPORT_SUBJECT_FILE: + ret = import_file(dwFlags, hwndParent, pwszWizardTitle, + pImportSrc->u.pwszFileName, hDestCertStore); + break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT: + if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CERT))) + ret = import_cert(pImportSrc->u.pCertContext, hDestCertStore); + else + import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); + break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CRL_CONTEXT: + if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CRL))) + ret = import_crl(pImportSrc->u.pCRLContext, hDestCertStore); + else + import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); + break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CTL_CONTEXT: + if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CTL))) + ret = import_ctl(pImportSrc->u.pCTLContext, hDestCertStore); + else + import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); + break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE: + ret = import_store(dwFlags, hwndParent, pwszWizardTitle, + pImportSrc->u.hCertStore, hDestCertStore); + break; + default: + WARN("unknown source type: %u\n", pImportSrc->dwSubjectChoice); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + } + else + { + /* Can't have no UI without specifying source */ SetLastError(E_INVALIDARG); - return FALSE; + ret = FALSE; } return ret;

1 0

Juan Lang : cryptui: Make sure input file is not empty.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 9169e6ed023ea24bf30b7ce640ffb471236e2e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9169e6ed023ea24bf30b7ce64… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:16:07 2008 -0800 cryptui: Make sure input file is not empty. --- dlls/cryptui/cryptui_En.rc | 1 + dlls/cryptui/cryptuires.h | 1 + dlls/cryptui/main.c | 38 +++++++++++++++++++++++++++++++++++--- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 470eb1f..9f42d2e 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -76,6 +76,7 @@ STRINGTABLE DISCARDABLE IDS_IMPORT_FILTER_SERIALIZED_STORE "Microsoft Serialized Certificate Store (*.sst)" IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 Messages (*.spc; *.p7b)" IDS_IMPORT_FILTER_ALL "All Files (*.*)" + IDS_IMPORT_EMPTY_FILE "Please select a file." IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 9abfe49..b5883a6 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -73,6 +73,7 @@ #define IDS_IMPORT_FILTER_SERIALIZED_STORE 1053 #define IDS_IMPORT_FILTER_CMS 1054 #define IDS_IMPORT_FILTER_ALL 1055 +#define IDS_IMPORT_EMPTY_FILE 1056 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index c37c6aa..23efa07 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3529,7 +3529,8 @@ static BOOL check_context_type(DWORD dwFlags, DWORD type) } -static void import_warn_type_mismatch(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle) +static void import_warning(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, + int warningID) { if (!(dwFlags & CRYPTUI_WIZ_NO_UI)) { @@ -3544,12 +3545,17 @@ static void import_warn_type_mismatch(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle) sizeof(title) / sizeof(title[0])); pTitle = title; } - LoadStringW(hInstance, IDS_IMPORT_TYPE_MISMATCH, error, + LoadStringW(hInstance, warningID, error, sizeof(error) / sizeof(error[0])); MessageBoxW(hwnd, error, pTitle, MB_ICONERROR | MB_OK); } } +static void import_warn_type_mismatch(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle) +{ + import_warning(dwFlags, hwnd, szTitle, IDS_IMPORT_TYPE_MISMATCH); +} + static BOOL check_store_context_type(DWORD dwFlags, HCERTSTORE store) { BOOL ret; @@ -3765,6 +3771,7 @@ static WCHAR *make_import_file_filter(DWORD dwFlags) struct ImportWizData { DWORD dwFlags; + LPCWSTR pwszWizardTitle; PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc; HCERTSTORE hDestCertStore; }; @@ -3796,6 +3803,30 @@ static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, PSWIZB_BACK | PSWIZB_NEXT); ret = TRUE; break; + case PSN_WIZNEXT: + { + HWND fileNameEdit = GetDlgItem(hwnd, IDC_IMPORT_FILENAME); + DWORD len = SendMessageW(fileNameEdit, WM_GETTEXTLENGTH, 0, 0); + + data = (struct ImportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + if (!len) + { + import_warning(data->dwFlags, hwnd, data->pwszWizardTitle, + IDS_IMPORT_EMPTY_FILE); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 1); + ret = 1; + } + else + { + LPWSTR fileName = HeapAlloc(GetProcessHeap(), 0, + (len + 1) * sizeof(WCHAR)); + + SendMessageW(fileNameEdit, WM_GETTEXT, len + 1, + (LPARAM)fileName); + FIXME("validate %s\n", debugstr_w(fileName)); + } + break; + } } break; } @@ -3883,7 +3914,8 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, { PROPSHEETHEADERW hdr; PROPSHEETPAGEW pages[4]; - struct ImportWizData data = { dwFlags, pImportSrc, hDestCertStore }; + struct ImportWizData data = { dwFlags, pwszWizardTitle, pImportSrc, + hDestCertStore }; FIXME("\n");

1 0

Juan Lang : cryptui: Implement browsing for input file in CryptUIWizImport.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 0db9031465f1304dc4dd2ae30fde21bb1f1743f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db9031465f1304dc4dd2ae30… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:08:31 2008 -0800 cryptui: Implement browsing for input file in CryptUIWizImport. --- dlls/cryptui/Makefile.in | 2 +- dlls/cryptui/cryptui_En.rc | 13 ++++- dlls/cryptui/cryptuires.h | 7 +++ dlls/cryptui/main.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in index e268be6..d70d0ea 100644 --- a/dlls/cryptui/Makefile.in +++ b/dlls/cryptui/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cryptui.dll -IMPORTS = uuid crypt32 ole32 comctl32 user32 gdi32 kernel32 +IMPORTS = uuid crypt32 ole32 comctl32 comdlg32 user32 gdi32 kernel32 DELAYIMPORTS = wintrust urlmon IMPORTLIB = cryptui diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index aa86409..470eb1f 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -69,6 +69,13 @@ STRINGTABLE DISCARDABLE IDS_IMPORT_FILE_SUBTITLE "Specify the file you want to import." IDS_IMPORT_STORE_TITLE "Certificate Store" IDS_IMPORT_STORE_SUBTITLE "Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists." + IDS_IMPORT_FILTER_CERT "X.509 Certificate (*.cer; *.crt)" + IDS_IMPORT_FILTER_PFX "Personal Information Exchange (*.pfx; *.p12)" + IDS_IMPORT_FILTER_CRL "Certificate Revocation List (*.crl)" + IDS_IMPORT_FILTER_CTL "Certificate Trust List (*.stl)" + IDS_IMPORT_FILTER_SERIALIZED_STORE "Microsoft Serialized Certificate Store (*.sst)" + IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 Messages (*.spc; *.p7b)" + IDS_IMPORT_FILTER_ALL "All Files (*.*)" IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" @@ -209,7 +216,8 @@ IDD_IMPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE, 115,1,195,24 + LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE, + 115,1,195,24 LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.", stc1, 115,33,195,16 LTEXT "A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.", @@ -251,7 +259,8 @@ IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Certificate Import Wizard", IDC_IMPORT_TITLE, 115,1,195,24 + LTEXT "Completing the Certificate Import Wizard", IDC_IMPORT_TITLE, + 115,1,195,24 LTEXT "You have successfully completed the Certificate Import Wizard.", stc1, 115,33,195,24 LTEXT "You have specified the following settings:", diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 0fffb83..9abfe49 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -66,6 +66,13 @@ #define IDS_IMPORT_FILE_SUBTITLE 1046 #define IDS_IMPORT_STORE_TITLE 1047 #define IDS_IMPORT_STORE_SUBTITLE 1048 +#define IDS_IMPORT_FILTER_CERT 1049 +#define IDS_IMPORT_FILTER_PFX 1050 +#define IDS_IMPORT_FILTER_CRL 1051 +#define IDS_IMPORT_FILTER_CTL 1052 +#define IDS_IMPORT_FILTER_SERIALIZED_STORE 1053 +#define IDS_IMPORT_FILTER_CMS 1054 +#define IDS_IMPORT_FILTER_ALL 1055 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index c7f8286..074d8be 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -32,6 +32,7 @@ #include "richedit.h" #include "ole2.h" #include "richole.h" +#include "commdlg.h" #include "commctrl.h" #include "cryptuiapi.h" #include "cryptuires.h" @@ -3695,13 +3696,95 @@ static LRESULT CALLBACK import_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, return ret; } +static const WCHAR filter_cert[] = { '*','.','c','e','r',';','*','.', + 'c','r','t',0 }; +static const WCHAR filter_pfx[] = { '*','.','p','f','x',';','*','.', + 'p','1','2',0 }; +static const WCHAR filter_crl[] = { '*','.','c','r','l',0 }; +static const WCHAR filter_ctl[] = { '*','.','s','t','l',0 }; +static const WCHAR filter_serialized_store[] = { '*','.','s','s','t',0 }; +static const WCHAR filter_cms[] = { '*','.','s','p','c',';','*','.', + 'p','7','b',0 }; +static const WCHAR filter_all[] = { '*','.','*',0 }; + +struct StringToFilter +{ + int id; + DWORD allowFlags; + LPCWSTR filter; +} import_filters[] = { + { IDS_IMPORT_FILTER_CERT, CRYPTUI_WIZ_IMPORT_ALLOW_CERT, filter_cert }, + { IDS_IMPORT_FILTER_PFX, 0, filter_pfx }, + { IDS_IMPORT_FILTER_CRL, CRYPTUI_WIZ_IMPORT_ALLOW_CRL, filter_crl }, + { IDS_IMPORT_FILTER_CTL, CRYPTUI_WIZ_IMPORT_ALLOW_CTL, filter_ctl }, + { IDS_IMPORT_FILTER_SERIALIZED_STORE, 0, filter_serialized_store }, + { IDS_IMPORT_FILTER_CMS, 0, filter_cms }, + { IDS_IMPORT_FILTER_ALL, 0, filter_all }, +}; + +static WCHAR *make_import_file_filter(DWORD dwFlags) +{ + DWORD i; + int len, totalLen = 2; + LPWSTR filter = NULL, str; + + for (i = 0; i < sizeof(import_filters) / sizeof(import_filters[0]); i++) + { + if (!import_filters[i].allowFlags || !dwFlags || + (dwFlags & import_filters[i].allowFlags)) + { + len = LoadStringW(hInstance, import_filters[i].id, (LPWSTR)&str, 0); + totalLen += len + strlenW(import_filters[i].filter) + 2; + } + } + filter = HeapAlloc(GetProcessHeap(), 0, totalLen * sizeof(WCHAR)); + if (filter) + { + LPWSTR ptr; + + ptr = filter; + for (i = 0; i < sizeof(import_filters) / sizeof(import_filters[0]); i++) + { + if (!import_filters[i].allowFlags || !dwFlags || + (dwFlags & import_filters[i].allowFlags)) + { + len = LoadStringW(hInstance, import_filters[i].id, + (LPWSTR)&str, 0); + memcpy(ptr, str, len * sizeof(WCHAR)); + ptr += len; + *ptr++ = 0; + strcpyW(ptr, import_filters[i].filter); + ptr += strlenW(import_filters[i].filter) + 1; + } + } + *ptr++ = 0; + } + return filter; +} + +struct ImportWizData +{ + DWORD dwFlags; + PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc; + HCERTSTORE hDestCertStore; +}; + static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { LRESULT ret = 0; + struct ImportWizData *data; switch (msg) { + case WM_INITDIALOG: + { + PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; + + data = (struct ImportWizData *)page->lParam; + SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + break; + } case WM_NOTIFY: { NMHDR *hdr = (NMHDR *)lp; @@ -3716,6 +3799,30 @@ static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, } break; } + case WM_COMMAND: + switch (wp) + { + case IDC_IMPORT_BROWSE_FILE: + { + OPENFILENAMEW ofn; + WCHAR fileBuf[MAX_PATH]; + + data = (struct ImportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + memset(&ofn, 0, sizeof(ofn)); + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = hwnd; + ofn.lpstrFilter = make_import_file_filter(data->dwFlags); + ofn.lpstrFile = fileBuf; + ofn.nMaxFile = sizeof(fileBuf) / sizeof(fileBuf[0]); + fileBuf[0] = 0; + if (GetOpenFileNameW(&ofn)) + SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_FILENAME), WM_SETTEXT, + 0, (LPARAM)ofn.lpstrFile); + HeapFree(GetProcessHeap(), 0, (LPWSTR)ofn.lpstrFilter); + break; + } + } + break; } return ret; } @@ -3776,6 +3883,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, { PROPSHEETHEADERW hdr; PROPSHEETPAGEW pages[4]; + struct ImportWizData data = { dwFlags, pImportSrc, hDestCertStore }; FIXME("\n"); @@ -3794,6 +3902,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, pages[1].dwFlags = PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; pages[1].pszHeaderTitle = MAKEINTRESOURCEW(IDS_IMPORT_FILE_TITLE); pages[1].pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_IMPORT_FILE_SUBTITLE); + pages[1].lParam = (LPARAM)&data; pages[2].dwSize = sizeof(pages[2]); pages[2].hInstance = hInstance;

1 0

Juan Lang : cryptui: Add a non-operational wizard for CryptUIWizImport.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: b55b4a0cf7e4f139e11e9bb49a4824a56613ef12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55b4a0cf7e4f139e11e9bb49… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:07:51 2008 -0800 cryptui: Add a non-operational wizard for CryptUIWizImport. --- dlls/cryptui/cryptui_En.rc | 60 +++++++++++++++++ dlls/cryptui/cryptuires.h | 17 +++++ dlls/cryptui/main.c | 157 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 234 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 858a8ed..aa86409 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -65,6 +65,10 @@ STRINGTABLE DISCARDABLE IDS_SELECT_STORE "Please select a certificate store." IDS_IMPORT_WIZARD "Certificate Import Wizard" IDS_IMPORT_TYPE_MISMATCH "The file contains objects that do not match the given criteria. Please select another file." + IDS_IMPORT_FILE_TITLE "File to Import" + IDS_IMPORT_FILE_SUBTITLE "Specify the file you want to import." + IDS_IMPORT_STORE_TITLE "Certificate Store" + IDS_IMPORT_STORE_SUBTITLE "Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists." IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" @@ -200,3 +204,59 @@ BEGIN PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 144,118,50,14 END + +IDD_IMPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificate Import Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE, 115,1,195,24 + LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.", + stc1, 115,33,195,16 + LTEXT "A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.", + stc2, 115,56,195,40 + LTEXT "To continue, click Next.", + stc3, 115,103,195,8 +END + +IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificate Import Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File name:", stc1, 21,1,195,10 + EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "B&rowse...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 + LTEXT "Note: The following file formats may contain more than one certificate, certificate revocation list, or certificate trust list:", stc2, 21,26,265,16 + LTEXT "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)", + stc3, 31,49,265,10 + LTEXT "Personal Information Exchange/PKCS #12 (.pfx, .p12)", + stc3, 31,64,265,10 + LTEXT "Microsoft Serialized Certificate Store (.sst)", + stc3, 31,79,265,10 +END + +IDD_IMPORT_STORE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificate Import Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Wine can automatically select the certificate store, or you can specify a location for the certificates.", stc1, 21,1,195,20 + AUTORADIOBUTTON "&Automatically select certificate store", + IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&Place all certificates in the following store:", + IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON + EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "B&rowse...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 +END + +IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificate Import Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Certificate Import Wizard", IDC_IMPORT_TITLE, 115,1,195,24 + LTEXT "You have successfully completed the Certificate Import Wizard.", + stc1, 115,33,195,24 + LTEXT "You have specified the following settings:", + stc2, 115,57,195,12 + CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index aaf65bc..0fffb83 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -62,6 +62,10 @@ #define IDS_SELECT_STORE 1042 #define IDS_IMPORT_WIZARD 1043 #define IDS_IMPORT_TYPE_MISMATCH 1044 +#define IDS_IMPORT_FILE_TITLE 1045 +#define IDS_IMPORT_FILE_SUBTITLE 1046 +#define IDS_IMPORT_STORE_TITLE 1047 +#define IDS_IMPORT_STORE_SUBTITLE 1048 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 @@ -97,6 +101,10 @@ #define IDD_CERT_PROPERTIES_GENERAL 104 #define IDD_ADD_CERT_PURPOSE 105 #define IDD_SELECT_STORE 106 +#define IDD_IMPORT_WELCOME 107 +#define IDD_IMPORT_FILE 108 +#define IDD_IMPORT_STORE 109 +#define IDD_IMPORT_FINISH 110 #define IDB_SMALL_ICONS 200 #define IDB_CERT 201 @@ -140,4 +148,13 @@ #define IDC_STORE_LIST 2601 #define IDC_SHOW_PHYSICAL_STORES 2602 +#define IDC_IMPORT_TITLE 2700 +#define IDC_IMPORT_FILENAME 2701 +#define IDC_IMPORT_BROWSE_FILE 2702 +#define IDC_IMPORT_AUTO_STORE 2703 +#define IDC_IMPORT_SPECIFY_STORE 2704 +#define IDC_IMPORT_STORE 2705 +#define IDC_IMPORT_BROWSE_STORE 2706 +#define IDC_IMPORT_SETTINGS 2707 + #endif /* ndef __CRYPTUIRES_H_ */ diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a4232f8..c7f8286 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3671,6 +3671,159 @@ static BOOL import_file(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, return ret; } +static LRESULT CALLBACK import_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, + LPARAM lp) +{ + LRESULT ret = 0; + + switch (msg) + { + case WM_NOTIFY: + { + NMHDR *hdr = (NMHDR *)lp; + + switch (hdr->code) + { + case PSN_SETACTIVE: + PostMessageW(GetParent(hwnd), PSM_SETWIZBUTTONS, 0, PSWIZB_NEXT); + ret = TRUE; + break; + } + break; + } + } + return ret; +} + +static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, + LPARAM lp) +{ + LRESULT ret = 0; + + switch (msg) + { + 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 LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, + LPARAM lp) +{ + LRESULT ret = 0; + + switch (msg) + { + 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 LRESULT CALLBACK import_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, + LPARAM lp) +{ + LRESULT ret = 0; + + switch (msg) + { + case WM_NOTIFY: + { + NMHDR *hdr = (NMHDR *)lp; + + switch (hdr->code) + { + case PSN_SETACTIVE: + PostMessageW(GetParent(hwnd), PSM_SETWIZBUTTONS, 0, + PSWIZB_BACK | PSWIZB_FINISH); + ret = TRUE; + break; + } + break; + } + } + return ret; +} + +static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, + LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc, + HCERTSTORE hDestCertStore) +{ + PROPSHEETHEADERW hdr; + PROPSHEETPAGEW pages[4]; + + FIXME("\n"); + + memset(&pages, 0, sizeof(pages)); + + pages[0].dwSize = sizeof(pages[0]); + pages[0].hInstance = hInstance; + pages[0].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_WELCOME); + pages[0].pfnDlgProc = import_welcome_dlg_proc; + pages[0].dwFlags = PSP_HIDEHEADER; + + pages[1].dwSize = sizeof(pages[1]); + pages[1].hInstance = hInstance; + pages[1].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_FILE); + pages[1].pfnDlgProc = import_file_dlg_proc; + pages[1].dwFlags = PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + pages[1].pszHeaderTitle = MAKEINTRESOURCEW(IDS_IMPORT_FILE_TITLE); + pages[1].pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_IMPORT_FILE_SUBTITLE); + + pages[2].dwSize = sizeof(pages[2]); + pages[2].hInstance = hInstance; + pages[2].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_STORE); + pages[2].pfnDlgProc = import_store_dlg_proc; + pages[2].dwFlags = PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + pages[2].pszHeaderTitle = MAKEINTRESOURCEW(IDS_IMPORT_STORE_TITLE); + pages[2].pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_IMPORT_STORE_SUBTITLE); + + pages[3].dwSize = sizeof(pages[3]); + pages[3].hInstance = hInstance; + pages[3].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_FINISH); + pages[3].pfnDlgProc = import_finish_dlg_proc; + pages[3].dwFlags = PSP_HIDEHEADER; + + memset(&hdr, 0, sizeof(hdr)); + hdr.dwSize = sizeof(hdr); + hdr.hwndParent = hwndParent; + hdr.dwFlags = PSH_PROPSHEETPAGE | PSH_WIZARD97_OLD | PSH_HEADER; + hdr.hInstance = hInstance; + if (pwszWizardTitle) + hdr.pszCaption = pwszWizardTitle; + else + hdr.pszCaption = MAKEINTRESOURCEW(IDS_IMPORT_WIZARD); + hdr.u3.ppsp = pages; + hdr.nPages = 4; + PropertySheetW(&hdr); + return FALSE; +} + BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc, HCERTSTORE hDestCertStore) { @@ -3688,6 +3841,10 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT return FALSE; } + if (!(dwFlags & CRYPTUI_WIZ_NO_UI)) + ret = show_import_ui(dwFlags, hwndParent, pwszWizardTitle, pImportSrc, + hDestCertStore); + switch (pImportSrc->dwSubjectChoice) { case CRYPTUI_WIZ_IMPORT_SUBJECT_FILE:

1 0

Juan Lang : cryptui: Implement importing stores in CryptUIWizImport.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 95a38f3ac5f960159b1cceadf1e034e6b5a2648c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a38f3ac5f960159b1cceadf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:04:10 2008 -0800 cryptui: Implement importing stores in CryptUIWizImport. --- dlls/cryptui/main.c | 103 ++++++++++++++++++++++++++++++++++++++++++ dlls/cryptui/tests/cryptui.c | 3 - 2 files changed, 103 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 901de33..4ca7364 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3496,6 +3496,34 @@ static BOOL import_crl(PCCRL_CONTEXT crl, HCERTSTORE hDestCertStore) return ret; } +static BOOL import_ctl(PCCTL_CONTEXT ctl, HCERTSTORE hDestCertStore) +{ + HCERTSTORE store; + BOOL ret; + + if (!ctl) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (hDestCertStore) store = hDestCertStore; + else + { + static const WCHAR trust[] = { 'T','r','u','s','t',0 }; + + if (!(store = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER, trust))) + { + WARN("unable to open certificate store\n"); + return FALSE; + } + } + ret = CertAddCTLContextToStore(store, ctl, + CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES, NULL); + if (!hDestCertStore) CertCloseStore(store, 0); + return ret; +} + /* Checks type, a type such as CERT_QUERY_CONTENT_CERT returned by * CryptQueryObject, against the allowed types. Returns TRUE if the * type is allowed, FALSE otherwise. @@ -3561,6 +3589,77 @@ static void import_warn_type_mismatch(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle) } } +static BOOL check_store_context_type(DWORD dwFlags, HCERTSTORE store) +{ + BOOL ret; + + if (dwFlags & + (CRYPTUI_WIZ_IMPORT_ALLOW_CERT | CRYPTUI_WIZ_IMPORT_ALLOW_CRL | + CRYPTUI_WIZ_IMPORT_ALLOW_CTL)) + { + PCCERT_CONTEXT cert; + PCCRL_CONTEXT crl; + PCCTL_CONTEXT ctl; + + ret = TRUE; + if ((cert = CertEnumCertificatesInStore(store, NULL))) + { + CertFreeCertificateContext(cert); + if (!(dwFlags & CRYPTUI_WIZ_IMPORT_ALLOW_CERT)) + ret = FALSE; + } + if (ret && (crl = CertEnumCRLsInStore(store, NULL))) + { + CertFreeCRLContext(crl); + if (!(dwFlags & CRYPTUI_WIZ_IMPORT_ALLOW_CRL)) + ret = FALSE; + } + if (ret && (ctl = CertEnumCTLsInStore(store, NULL))) + { + CertFreeCTLContext(ctl); + if (!(dwFlags & CRYPTUI_WIZ_IMPORT_ALLOW_CTL)) + ret = FALSE; + } + } + else + ret = TRUE; + if (!ret) + SetLastError(E_INVALIDARG); + return ret; +} + +static BOOL import_store(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, + HCERTSTORE source, HCERTSTORE dest) +{ + BOOL ret; + + if ((ret = check_store_context_type(dwFlags, source))) + { + PCCERT_CONTEXT cert = NULL; + PCCRL_CONTEXT crl = NULL; + PCCTL_CONTEXT ctl = NULL; + + do { + cert = CertEnumCertificatesInStore(source, cert); + if (cert) + ret = import_cert(cert, dest); + } while (ret && cert); + do { + crl = CertEnumCRLsInStore(source, crl); + if (crl) + ret = import_crl(crl, dest); + } while (ret && crl); + do { + ctl = CertEnumCTLsInStore(source, ctl); + if (ctl) + ret = import_ctl(ctl, dest); + } while (ret && ctl); + } + else + import_warn_type_mismatch(dwFlags, hwnd, szTitle); + return ret; +} + BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc, HCERTSTORE hDestCertStore) { @@ -3605,6 +3704,10 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT else import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE: + ret = import_store(dwFlags, hwndParent, pwszWizardTitle, + pImportSrc->u.hCertStore, hDestCertStore); + break; default: FIXME("source type not implemented: %u\n", pImportSrc->dwSubjectChoice); SetLastError(E_INVALIDARG); diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 643f327..2cac521 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -537,7 +537,6 @@ static void test_crypt_ui_wiz_import(void) CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE | CRYPTUI_WIZ_IMPORT_ALLOW_CERT | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); - todo_wine ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { @@ -574,7 +573,6 @@ static void test_crypt_ui_wiz_import(void) SetLastError(0xdeadbeef); ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, 0, NULL, &info, store); - todo_wine ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { @@ -615,7 +613,6 @@ static void test_crypt_ui_wiz_import(void) SetLastError(0xdeadbeef); ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); - todo_wine ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) {

1 0

Juan Lang : cryptui: Implement importing CTLs in CryptUIWizImport.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: f6fae84304c991e96dae63146ad1c1b8320599f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6fae84304c991e96dae63146… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:04:46 2008 -0800 cryptui: Implement importing CTLs in CryptUIWizImport. --- dlls/cryptui/main.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 4ca7364..eeae7a0 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3704,12 +3704,18 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT else import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CTL_CONTEXT: + if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CTL))) + ret = import_ctl(pImportSrc->u.pCTLContext, hDestCertStore); + else + import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); + break; case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE: ret = import_store(dwFlags, hwndParent, pwszWizardTitle, pImportSrc->u.hCertStore, hDestCertStore); break; default: - FIXME("source type not implemented: %u\n", pImportSrc->dwSubjectChoice); + WARN("unknown source type: %u\n", pImportSrc->dwSubjectChoice); SetLastError(E_INVALIDARG); return FALSE; }

1 0

Juan Lang : cryptui: Use CryptQueryObject to import files in CryptUIWizImport.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 3b9d543693ae59114150de933ee56d40325fa37b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9d543693ae59114150de933… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:05:34 2008 -0800 cryptui: Use CryptQueryObject to import files in CryptUIWizImport. --- dlls/cryptui/main.c | 104 ++++++++++++++++++++++++++------------------------- 1 files changed, 53 insertions(+), 51 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index eeae7a0..a4232f8 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3345,46 +3345,6 @@ BOOL WINAPI CryptUIDlgViewContext(DWORD dwContextType, LPVOID pvContext, return ret; } -static PCCERT_CONTEXT make_cert_from_file(LPCWSTR fileName) -{ - HANDLE file; - DWORD size, encoding = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; - BYTE *buffer; - PCCERT_CONTEXT cert; - - file = CreateFileW(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, 0, NULL); - if (file == INVALID_HANDLE_VALUE) - { - WARN("can't open certificate file %s\n", debugstr_w(fileName)); - return NULL; - } - if ((size = GetFileSize(file, NULL))) - { - if ((buffer = HeapAlloc(GetProcessHeap(), 0, size))) - { - DWORD read; - if (!ReadFile(file, buffer, size, &read, NULL) || read != size) - { - WARN("can't read certificate file %s\n", debugstr_w(fileName)); - HeapFree(GetProcessHeap(), 0, buffer); - CloseHandle(file); - return NULL; - } - } - } - else - { - WARN("empty file %s\n", debugstr_w(fileName)); - CloseHandle(file); - return NULL; - } - CloseHandle(file); - cert = CertCreateCertificateContext(encoding, buffer, size); - HeapFree(GetProcessHeap(), 0, buffer); - return cert; -} - /* Decodes a cert's basic constraints extension (either szOID_BASIC_CONSTRAINTS * or szOID_BASIC_CONSTRAINTS2, whichever is present) to determine if it * should be a CA. If neither extension is present, returns @@ -3660,11 +3620,61 @@ static BOOL import_store(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, return ret; } +static BOOL import_file(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, + LPCWSTR fileName, HCERTSTORE dest) +{ + HCERTSTORE source; + DWORD contentType, expectedContentTypeFlags; + BOOL ret; + + if (dwFlags & + (CRYPTUI_WIZ_IMPORT_ALLOW_CERT | CRYPTUI_WIZ_IMPORT_ALLOW_CRL | + CRYPTUI_WIZ_IMPORT_ALLOW_CTL)) + { + expectedContentTypeFlags = + CERT_QUERY_CONTENT_FLAG_SERIALIZED_STORE | + CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED | + CERT_QUERY_CONTENT_FLAG_PFX; + if (dwFlags & CRYPTUI_WIZ_IMPORT_ALLOW_CERT) + expectedContentTypeFlags |= + CERT_QUERY_CONTENT_FLAG_CERT | + CERT_QUERY_CONTENT_FLAG_SERIALIZED_CERT; + if (dwFlags & CRYPTUI_WIZ_IMPORT_ALLOW_CRL) + expectedContentTypeFlags |= + CERT_QUERY_CONTENT_FLAG_SERIALIZED_CRL | + CERT_QUERY_CONTENT_FLAG_CRL; + if (dwFlags & CRYPTUI_WIZ_IMPORT_ALLOW_CTL) + expectedContentTypeFlags |= + CERT_QUERY_CONTENT_FLAG_CTL | + CERT_QUERY_CONTENT_FLAG_SERIALIZED_CTL; + } + else + expectedContentTypeFlags = + CERT_QUERY_CONTENT_FLAG_CERT | + CERT_QUERY_CONTENT_FLAG_CTL | + CERT_QUERY_CONTENT_FLAG_CRL | + CERT_QUERY_CONTENT_FLAG_SERIALIZED_STORE | + CERT_QUERY_CONTENT_FLAG_SERIALIZED_CERT | + CERT_QUERY_CONTENT_FLAG_SERIALIZED_CTL | + CERT_QUERY_CONTENT_FLAG_SERIALIZED_CRL | + CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED | + CERT_QUERY_CONTENT_FLAG_PFX; + + ret = CryptQueryObject(CERT_QUERY_OBJECT_FILE, fileName, + expectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, + &contentType, NULL, &source, NULL, NULL); + if (ret) + { + ret = import_store(dwFlags, hwnd, szTitle, source, dest); + CertCloseStore(source, 0); + } + return ret; +} + BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc, HCERTSTORE hDestCertStore) { BOOL ret; - const CERT_CONTEXT *cert; TRACE("(0x%08x, %p, %s, %p, %p)\n", dwFlags, hwndParent, debugstr_w(pwszWizardTitle), pImportSrc, hDestCertStore); @@ -3681,16 +3691,8 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT switch (pImportSrc->dwSubjectChoice) { case CRYPTUI_WIZ_IMPORT_SUBJECT_FILE: - if (!(cert = make_cert_from_file(pImportSrc->u.pwszFileName))) - { - WARN("unable to create certificate context\n"); - return FALSE; - } - else - { - ret = import_cert(cert, hDestCertStore); - CertFreeCertificateContext(cert); - } + ret = import_file(dwFlags, hwndParent, pwszWizardTitle, + pImportSrc->u.pwszFileName, hDestCertStore); break; case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT: if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CERT)))

1 0

Juan Lang : cryptui: Check for type mismatches in CryptUIWizImport.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 23f789fb0816d26ea20dd3a110fe0d91e6ee5f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23f789fb0816d26ea20dd3a11… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:02:43 2008 -0800 cryptui: Check for type mismatches in CryptUIWizImport. --- dlls/cryptui/cryptui_En.rc | 2 + dlls/cryptui/cryptuires.h | 2 + dlls/cryptui/main.c | 70 +++++++++++++++++++++++++++++++++++++++++- dlls/cryptui/tests/cryptui.c | 1 - 4 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 7ad889e..858a8ed 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -63,6 +63,8 @@ STRINGTABLE DISCARDABLE IDS_CERTIFICATE_PURPOSE_EXISTS "The OID you entered already exists." IDS_SELECT_STORE_TITLE "Select Certificate Store" IDS_SELECT_STORE "Please select a certificate store." + IDS_IMPORT_WIZARD "Certificate Import Wizard" + IDS_IMPORT_TYPE_MISMATCH "The file contains objects that do not match the given criteria. Please select another file." IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 25dcb8a..aaf65bc 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -60,6 +60,8 @@ #define IDS_CERTIFICATE_PURPOSE_EXISTS 1040 #define IDS_SELECT_STORE_TITLE 1041 #define IDS_SELECT_STORE 1042 +#define IDS_IMPORT_WIZARD 1043 +#define IDS_IMPORT_TYPE_MISMATCH 1044 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a21f9c5..f97f691 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3468,6 +3468,71 @@ static BOOL import_cert(PCCERT_CONTEXT cert, HCERTSTORE hDestCertStore) return ret; } +/* Checks type, a type such as CERT_QUERY_CONTENT_CERT returned by + * CryptQueryObject, against the allowed types. Returns TRUE if the + * type is allowed, FALSE otherwise. + */ +static BOOL check_context_type(DWORD dwFlags, DWORD type) +{ + BOOL ret; + + if (dwFlags & + (CRYPTUI_WIZ_IMPORT_ALLOW_CERT | CRYPTUI_WIZ_IMPORT_ALLOW_CRL | + CRYPTUI_WIZ_IMPORT_ALLOW_CTL)) + { + switch (type) + { + case CERT_QUERY_CONTENT_CERT: + case CERT_QUERY_CONTENT_SERIALIZED_CERT: + ret = dwFlags & CRYPTUI_WIZ_IMPORT_ALLOW_CERT; + break; + case CERT_QUERY_CONTENT_CRL: + case CERT_QUERY_CONTENT_SERIALIZED_CRL: + ret = dwFlags & CRYPTUI_WIZ_IMPORT_ALLOW_CRL; + break; + case CERT_QUERY_CONTENT_CTL: + case CERT_QUERY_CONTENT_SERIALIZED_CTL: + ret = dwFlags & CRYPTUI_WIZ_IMPORT_ALLOW_CTL; + break; + default: + /* The remaining types contain more than one type, so allow + * any combination. + */ + ret = TRUE; + } + } + else + { + /* No allowed types specified, so any type is allowed */ + ret = TRUE; + } + if (!ret) + SetLastError(E_INVALIDARG); + return ret; +} + + +static void import_warn_type_mismatch(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle) +{ + if (!(dwFlags & CRYPTUI_WIZ_NO_UI)) + { + WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN]; + LPCWSTR pTitle; + + if (szTitle) + pTitle = szTitle; + else + { + LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, + sizeof(title) / sizeof(title[0])); + pTitle = title; + } + LoadStringW(hInstance, IDS_IMPORT_TYPE_MISMATCH, error, + sizeof(error) / sizeof(error[0])); + MessageBoxW(hwnd, error, pTitle, MB_ICONERROR | MB_OK); + } +} + BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc, HCERTSTORE hDestCertStore) { @@ -3501,7 +3566,10 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT } break; case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT: - ret = import_cert(pImportSrc->u.pCertContext, hDestCertStore); + if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CERT))) + ret = import_cert(pImportSrc->u.pCertContext, hDestCertStore); + else + import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); break; default: FIXME("source type not implemented: %u\n", pImportSrc->dwSubjectChoice); diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index a1437fb..643f327 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -377,7 +377,6 @@ static void test_crypt_ui_wiz_import(void) SetLastError(0xdeadbeef); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); CertFreeCertificateContext(info.u.pCertContext);

1 0