December 2008 - Wine-Commits

Juan Lang : cryptui: Show certificate status for selected certificate in hierarchy page.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: 275cb46fa6fc0289549ae8011bdcdf0d4d4a92d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275cb46fa6fc0289549ae8011… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 09:01:32 2008 -0800 cryptui: Show certificate status for selected certificate in hierarchy page. --- dlls/cryptui/main.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 76273a2..cc585f8 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1748,6 +1748,59 @@ struct hierarchy_data DWORD selectedCert; }; +static LPARAM index_to_lparam(struct hierarchy_data *data, DWORD index) +{ + CRYPT_PROVIDER_SGNR *provSigner = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)data->pCertViewInfo->u.pCryptProviderData, + data->pCertViewInfo->idxSigner, data->pCertViewInfo->fCounterSigner, + data->pCertViewInfo->idxCounterSigner); + + /* Takes advantage of the fact that a pointer is 32-bit aligned, and + * therefore always even. + */ + if (index == provSigner->csCertChain - 1) + return (LPARAM)data; + return index << 1 | 1; +} + +static inline DWORD lparam_to_index(struct hierarchy_data *data, LPARAM lp) +{ + CRYPT_PROVIDER_SGNR *provSigner = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)data->pCertViewInfo->u.pCryptProviderData, + data->pCertViewInfo->idxSigner, data->pCertViewInfo->fCounterSigner, + data->pCertViewInfo->idxCounterSigner); + + if (!(lp & 1)) + return provSigner->csCertChain - 1; + return lp >> 1; +} + +static struct hierarchy_data *get_hierarchy_data_from_tree_item(HWND tree, + HTREEITEM hItem) +{ + struct hierarchy_data *data = NULL; + HTREEITEM root = NULL; + + do { + HTREEITEM parent = (HTREEITEM)SendMessageW(tree, TVM_GETNEXTITEM, + TVGN_PARENT, (LPARAM)hItem); + + if (!parent) + root = hItem; + hItem = parent; + } while (hItem); + if (root) + { + TVITEMW item; + + item.mask = TVIF_PARAM; + item.hItem = root; + SendMessageW(tree, TVM_GETITEMW, 0, (LPARAM)&item); + data = (struct hierarchy_data *)item.lParam; + } + return data; +} + static WCHAR *get_cert_property_as_string(PCCERT_CONTEXT cert, DWORD prop) { WCHAR *name = NULL; @@ -1801,7 +1854,7 @@ static void show_cert_chain(HWND hwnd, struct hierarchy_data *data) tvis.hParent = parent; tvis.hInsertAfter = TVI_LAST; tvis.u.item.mask = TVIF_TEXT | TVIF_STATE | TVIF_IMAGE | - TVIF_SELECTEDIMAGE; + TVIF_SELECTEDIMAGE | TVIF_PARAM; tvis.u.item.pszText = name; tvis.u.item.state = TVIS_EXPANDED; tvis.u.item.stateMask = TVIS_EXPANDED; @@ -1821,6 +1874,7 @@ static void show_cert_chain(HWND hwnd, struct hierarchy_data *data) else tvis.u.item.iImage = 1; tvis.u.item.iSelectedImage = tvis.u.item.iImage; + tvis.u.item.lParam = index_to_lparam(data, i - 1); parent = (HTREEITEM)SendMessageW(tree, TVM_INSERTITEMW, 0, (LPARAM)&tvis); HeapFree(GetProcessHeap(), 0, name); @@ -1872,6 +1926,8 @@ static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, { PROPSHEETPAGEW *page; struct hierarchy_data *data; + HWND tree = GetDlgItem(hwnd, IDC_CERTPATH); + DWORD selection; TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -1882,6 +1938,28 @@ static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data = (struct hierarchy_data *)page->lParam; show_cert_hierarchy(hwnd, data); break; + case WM_NOTIFY: + { + NMTREEVIEWW *nm; + CRYPT_PROVIDER_SGNR *provSigner; + + nm = (NMTREEVIEWW*)lp; + switch (nm->hdr.code) + { + case TVN_SELCHANGEDW: + data = get_hierarchy_data_from_tree_item(tree, nm->itemNew.hItem); + selection = lparam_to_index(data, nm->itemNew.lParam); + provSigner = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)data->pCertViewInfo->u.pCryptProviderData, + data->pCertViewInfo->idxSigner, + data->pCertViewInfo->fCounterSigner, + data->pCertViewInfo->idxCounterSigner); + set_certificate_status(GetDlgItem(hwnd, IDC_CERTIFICATESTATUSTEXT), + &provSigner->pasCertChain[selection]); + break; + } + break; + } } return 0; }

1 0

Juan Lang : cryptui: Show status for end cert in hierarchy page.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: d3a61c769fe06d90fc04410be0d42b4e8d13bdea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a61c769fe06d90fc04410be… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 09:00:58 2008 -0800 cryptui: Show status for end cert in hierarchy page. --- dlls/cryptui/cryptui_En.rc | 5 +++++ dlls/cryptui/cryptuires.h | 5 +++++ dlls/cryptui/main.c | 33 ++++++++++++++++++++++++++++++++- 3 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index af1725e..08e79e6 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -34,6 +34,11 @@ STRINGTABLE DISCARDABLE IDS_ISSUER_HEADING "Issued by: " IDS_VALID_FROM "Valid from " IDS_VALID_TO " to " + IDS_CERTIFICATE_BAD_SIGNATURE "This certificate has an invalid signature." + IDS_CERTIFICATE_BAD_TIME "This certificate has expired or is not yet valid." + IDS_CERTIFICATE_BAD_TIMENEST "This certificate's validity period exceeds that of its issuer." + IDS_CERTIFICATE_REVOKED "This certificate was revoked by its issuer." + IDS_CERTIFICATE_VALID "This certificate is OK." IDS_FIELD "Field" IDS_VALUE "Value" IDS_FIELDS_ALL "<All>" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index b8183ee..66206d0 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -31,6 +31,11 @@ #define IDS_ISSUER_HEADING 1011 #define IDS_VALID_FROM 1012 #define IDS_VALID_TO 1013 +#define IDS_CERTIFICATE_BAD_SIGNATURE 1014 +#define IDS_CERTIFICATE_BAD_TIME 1015 +#define IDS_CERTIFICATE_BAD_TIMENEST 1016 +#define IDS_CERTIFICATE_REVOKED 1017 +#define IDS_CERTIFICATE_VALID 1018 #define IDS_FIELD 1019 #define IDS_VALUE 1020 #define IDS_FIELDS_ALL 1021 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 98ecad7..76273a2 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1828,12 +1828,43 @@ static void show_cert_chain(HWND hwnd, struct hierarchy_data *data) } } +static void set_certificate_status(HWND hwnd, CRYPT_PROVIDER_CERT *cert) +{ + /* Select all the text in the control, the next update will replace it */ + SendMessageW(hwnd, EM_SETSEL, 0, -1); + /* Set the highest priority error messages first. */ + if (!(cert->dwConfidence & CERT_CONFIDENCE_SIG)) + add_string_resource_to_control(hwnd, IDS_CERTIFICATE_BAD_SIGNATURE); + else if (!(cert->dwConfidence & CERT_CONFIDENCE_TIME)) + add_string_resource_to_control(hwnd, IDS_CERTIFICATE_BAD_TIME); + else if (!(cert->dwConfidence & CERT_CONFIDENCE_TIMENEST)) + add_string_resource_to_control(hwnd, IDS_CERTIFICATE_BAD_TIMENEST); + else if (cert->dwRevokedReason) + add_string_resource_to_control(hwnd, IDS_CERTIFICATE_REVOKED); + else + add_string_resource_to_control(hwnd, IDS_CERTIFICATE_VALID); +} + +static void set_certificate_status_for_end_cert(HWND hwnd, + PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo) +{ + HWND status = GetDlgItem(hwnd, IDC_CERTIFICATESTATUSTEXT); + CRYPT_PROVIDER_SGNR *provSigner = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)pCertViewInfo->u.pCryptProviderData, + pCertViewInfo->idxSigner, pCertViewInfo->fCounterSigner, + pCertViewInfo->idxCounterSigner); + CRYPT_PROVIDER_CERT *provCert = WTHelperGetProvCertFromChain(provSigner, + pCertViewInfo->idxCert); + + set_certificate_status(status, provCert); +} + static void show_cert_hierarchy(HWND hwnd, struct hierarchy_data *data) { /* Disable view certificate button until a certificate is selected */ EnableWindow(GetDlgItem(hwnd, IDC_VIEWCERTIFICATE), FALSE); show_cert_chain(hwnd, data); - FIXME("show cert status\n"); + set_certificate_status_for_end_cert(hwnd, data->pCertViewInfo); } static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,

1 0

Juan Lang : cryptui: Allow viewing another cert in the chain from the hierarchy page.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: 6e907fea1339c67af651d648cba77815ae45506c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e907fea1339c67af651d648c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 09:02:21 2008 -0800 cryptui: Allow viewing another cert in the chain from the hierarchy page. --- dlls/cryptui/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index cc585f8..8a251b4 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1954,12 +1954,57 @@ static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data->pCertViewInfo->idxSigner, data->pCertViewInfo->fCounterSigner, data->pCertViewInfo->idxCounterSigner); + EnableWindow(GetDlgItem(hwnd, IDC_VIEWCERTIFICATE), selection != 0); set_certificate_status(GetDlgItem(hwnd, IDC_CERTIFICATESTATUSTEXT), &provSigner->pasCertChain[selection]); break; } break; } + case WM_COMMAND: + switch (wp) + { + case IDC_VIEWCERTIFICATE: + { + TVITEMW item; + CRYPT_PROVIDER_SGNR *provSigner; + CRYPTUI_VIEWCERTIFICATE_STRUCTW viewInfo; + BOOL changed = FALSE; + + memset(&item, 0, sizeof(item)); + item.mask = TVIF_HANDLE | TVIF_PARAM; + item.hItem = (HTREEITEM)SendMessageW(tree, TVM_GETNEXTITEM, + TVGN_CARET, (LPARAM)NULL); + SendMessageW(tree, TVM_GETITEMW, 0, (LPARAM)&item); + data = get_hierarchy_data_from_tree_item(tree, item.hItem); + selection = lparam_to_index(data, item.lParam); + provSigner = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)data->pCertViewInfo->u.pCryptProviderData, + data->pCertViewInfo->idxSigner, + data->pCertViewInfo->fCounterSigner, + data->pCertViewInfo->idxCounterSigner); + memset(&viewInfo, 0, sizeof(viewInfo)); + viewInfo.dwSize = sizeof(viewInfo); + viewInfo.dwFlags = data->pCertViewInfo->dwFlags; + viewInfo.szTitle = data->pCertViewInfo->szTitle; + viewInfo.pCertContext = provSigner->pasCertChain[selection].pCert; + viewInfo.cStores = data->pCertViewInfo->cStores; + viewInfo.rghStores = data->pCertViewInfo->rghStores; + viewInfo.cPropSheetPages = data->pCertViewInfo->cPropSheetPages; + viewInfo.rgPropSheetPages = data->pCertViewInfo->rgPropSheetPages; + viewInfo.nStartPage = data->pCertViewInfo->nStartPage; + CryptUIDlgViewCertificateW(&viewInfo, &changed); + if (changed) + { + /* Delete the contents of the tree */ + SendMessageW(tree, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT); + /* Reinitialize the tree */ + show_cert_hierarchy(hwnd, data); + } + break; + } + } + break; } return 0; }

1 0

Juan Lang : cryptui: Show the certificate properties in the details page.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: 094fed7529242752edc715c44a74c510eb56af0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=094fed7529242752edc715c44… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 08:57:33 2008 -0800 cryptui: Show the certificate properties in the details page. --- dlls/cryptui/cryptui_En.rc | 4 + dlls/cryptui/cryptuires.h | 4 + dlls/cryptui/main.c | 132 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 138 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 49050d4..f0462c2 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -49,6 +49,10 @@ STRINGTABLE DISCARDABLE IDS_FIELD_SUBJECT "Subject" IDS_FIELD_PUBLIC_KEY "Public key" IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bits)" + IDS_PROP_HASH "SHA1 hash" + IDS_PROP_ENHKEY_USAGE "Enhanced key usage (property)" + IDS_PROP_FRIENDLY_NAME "Friendly name" + IDS_PROP_DESCRIPTION "Description" 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 befd9f9..0815510 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -46,6 +46,10 @@ #define IDS_FIELD_SUBJECT 1031 #define IDS_FIELD_PUBLIC_KEY 1032 #define IDS_FIELD_PUBLIC_KEY_FORMAT 1033 +#define IDS_PROP_HASH 1034 +#define IDS_PROP_ENHKEY_USAGE 1035 +#define IDS_PROP_FRIENDLY_NAME 1036 +#define IDS_PROP_DESCRIPTION 1037 #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 993e953..cdfed20 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1406,11 +1406,139 @@ static void add_critical_extensions(HWND hwnd, struct detail_data *data) &cert->pCertInfo->rgExtension[i]); } +typedef WCHAR * (*prop_to_value_func)(void *pb, DWORD cb); + +struct prop_id_to_string_id +{ + DWORD prop; + int id; + BOOL prop_is_string; + prop_to_value_func prop_to_value; +}; + +static WCHAR *format_enhanced_key_usage_value(void *pb, DWORD cb) +{ + static const WCHAR sep[] = { ',',' ',0 }; + const CERT_ENHKEY_USAGE *usage = (const CERT_ENHKEY_USAGE *)pb; + static WCHAR *str = NULL; + DWORD i, chars = 0; + + for (i = 0; i < usage->cUsageIdentifier; i++) + { + PCCRYPT_OID_INFO info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, + usage->rgpszUsageIdentifier[i], CRYPT_ENHKEY_USAGE_OID_GROUP_ID); + + if (info) + { + chars += strlenW(info->pwszName); + if (i < usage->cUsageIdentifier - 1) + chars += strlenW(sep); + if (!str) + { + str = HeapAlloc(GetProcessHeap(), 0, + (chars + 1) * sizeof(WCHAR)); + if (str) + *str = '\0'; + } + else + str = HeapReAlloc(GetProcessHeap(), 0, str, + (chars + 1) * sizeof(WCHAR)); + if (str) + { + if (i < usage->cUsageIdentifier - 1) + strcatW(str, sep); + strcatW(str, info->pwszName); + } + } + else + { + chars += strlen(usage->rgpszUsageIdentifier[i]); + if (i < usage->cUsageIdentifier - 1) + chars += strlenW(sep); + if (!str) + { + str = HeapAlloc(GetProcessHeap(), 0, + (chars + 1) * sizeof(WCHAR)); + if (str) + *str = '\0'; + } + else + str = HeapReAlloc(GetProcessHeap(), 0, str, + (chars + 1) * sizeof(WCHAR)); + if (str) + { + WCHAR *dst; + const char *src; + + if (i < usage->cUsageIdentifier - 1) + strcatW(str, sep); + for (src = usage->rgpszUsageIdentifier[i], + dst = str + strlenW(str); *src; src++, dst++) + *dst = *src; + *dst = '\0'; + } + } + } + return str; +} + +/* Logically the access state should also be checked, and IDC_EDITPROPERTIES + * disabled for read-only certificates, but native doesn't appear to do that. + */ +static const struct prop_id_to_string_id prop_id_map[] = { + { CERT_HASH_PROP_ID, IDS_PROP_HASH, FALSE, format_hex_string }, + { CERT_FRIENDLY_NAME_PROP_ID, IDS_PROP_FRIENDLY_NAME, TRUE, NULL }, + { CERT_DESCRIPTION_PROP_ID, IDS_PROP_DESCRIPTION, TRUE, NULL }, + { CERT_ENHKEY_USAGE_PROP_ID, IDS_PROP_ENHKEY_USAGE, FALSE, + format_enhanced_key_usage_value }, +}; + +static void add_properties(HWND hwnd, struct detail_data *data) +{ + DWORD i; + PCCERT_CONTEXT cert = data->pCertViewInfo->pCertContext; + + for (i = 0; i < sizeof(prop_id_map) / sizeof(prop_id_map[0]); i++) + { + DWORD cb; + + if (CertGetCertificateContextProperty(cert, prop_id_map[i].prop, NULL, + &cb)) + { + BYTE *pb; + WCHAR *val = NULL; + + /* FIXME: MS adds a separate value for the signature hash + * algorithm. + */ + pb = HeapAlloc(GetProcessHeap(), 0, cb); + if (pb) + { + if (CertGetCertificateContextProperty(cert, + prop_id_map[i].prop, pb, &cb)) + { + if (prop_id_map[i].prop_is_string) + { + val = (LPWSTR)pb; + /* Don't double-free pb */ + pb = NULL; + } + else + val = prop_id_map[i].prop_to_value(pb, cb); + } + HeapFree(GetProcessHeap(), 0, pb); + } + add_string_id_and_value_to_list(hwnd, data, prop_id_map[i].id, val, + NULL, NULL); + } + } +} + static void add_all_fields(HWND hwnd, struct detail_data *data) { add_v1_fields(hwnd, data); add_all_extensions(hwnd, data); - FIXME("add properties\n"); + add_properties(hwnd, data); } struct selection_list_item @@ -1424,7 +1552,7 @@ const struct selection_list_item listItems[] = { { IDS_FIELDS_V1, add_v1_fields }, { IDS_FIELDS_EXTENSIONS, add_all_extensions }, { IDS_FIELDS_CRITICAL_EXTENSIONS, add_critical_extensions }, - { IDS_FIELDS_PROPERTIES, NULL }, + { IDS_FIELDS_PROPERTIES, add_properties }, }; static void create_show_list(HWND hwnd, struct detail_data *data)

1 0

Juan Lang : cryptui: Add selections to field selection list in details page .
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: a4d362805b1de3e36d786fc9a55e4c2c669bd12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d362805b1de3e36d786fc9a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 08:52:52 2008 -0800 cryptui: Add selections to field selection list in details page. --- dlls/cryptui/cryptui_En.rc | 7 +++++ dlls/cryptui/cryptuires.h | 7 +++++ dlls/cryptui/main.c | 59 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index eef2b30..e8ea266 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -34,6 +34,13 @@ STRINGTABLE DISCARDABLE IDS_ISSUER_HEADING "Issued by: " IDS_VALID_FROM "Valid from " IDS_VALID_TO " to " + IDS_FIELD "Field" + IDS_VALUE "Value" + IDS_FIELDS_ALL "<All>" + IDS_FIELDS_V1 "Version 1 Fields Only" + IDS_FIELDS_EXTENSIONS "Extensions Only" + IDS_FIELDS_CRITICAL_EXTENSIONS "Critical Extensions Only" + IDS_FIELDS_PROPERTIES "Properties Only" 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 0c80783..8ffb930 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -31,6 +31,13 @@ #define IDS_ISSUER_HEADING 1011 #define IDS_VALID_FROM 1012 #define IDS_VALID_TO 1013 +#define IDS_FIELD 1019 +#define IDS_VALUE 1020 +#define IDS_FIELDS_ALL 1021 +#define IDS_FIELDS_V1 1022 +#define IDS_FIELDS_EXTENSIONS 1023 +#define IDS_FIELDS_CRITICAL_EXTENSIONS 1024 +#define IDS_FIELDS_PROPERTIES 1025 #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 db5fc6b..8a724be 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 "commctrl.h" #include "cryptuiapi.h" #include "cryptuires.h" #include "urlmon.h" @@ -1007,6 +1008,62 @@ struct detail_data BOOL *pfPropertiesChanged; }; +struct selection_list_item +{ + int id; +}; + +const struct selection_list_item listItems[] = { + { IDS_FIELDS_ALL }, + { IDS_FIELDS_V1 }, + { IDS_FIELDS_EXTENSIONS }, + { IDS_FIELDS_CRITICAL_EXTENSIONS }, + { IDS_FIELDS_PROPERTIES }, +}; + +static void create_show_list(HWND hwnd, struct detail_data *data) +{ + HWND cb = GetDlgItem(hwnd, IDC_DETAIL_SELECT); + WCHAR buf[MAX_STRING_LEN]; + int i; + + for (i = 0; i < sizeof(listItems) / sizeof(listItems[0]); i++) + { + int index; + + LoadStringW(hInstance, listItems[i].id, buf, + sizeof(buf) / sizeof(buf[0])); + index = SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); + SendMessageW(cb, CB_SETITEMDATA, index, (LPARAM)data); + } + SendMessageW(cb, CB_SETCURSEL, 0, 0); +} + +static void create_listview_columns(HWND hwnd) +{ + HWND lv = GetDlgItem(hwnd, IDC_DETAIL_LIST); + RECT rc; + WCHAR buf[MAX_STRING_LEN]; + LVCOLUMNW column; + + SendMessageW(lv, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); + GetWindowRect(lv, &rc); + LoadStringW(hInstance, IDS_FIELD, buf, sizeof(buf) / sizeof(buf[0])); + column.mask = LVCF_WIDTH | LVCF_TEXT; + column.cx = (rc.right - rc.left) / 2 - 2; + column.pszText = buf; + SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); + LoadStringW(hInstance, IDS_VALUE, buf, sizeof(buf) / sizeof(buf[0])); + SendMessageW(lv, LVM_INSERTCOLUMNW, 1, (LPARAM)&column); +} + +static void create_cert_details_list(HWND hwnd, struct detail_data *data) +{ + create_show_list(hwnd, data); + create_listview_columns(hwnd); + FIXME("add cert details\n"); +} + static LRESULT CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -1020,7 +1077,7 @@ static LRESULT CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, case WM_INITDIALOG: page = (PROPSHEETPAGEW *)lp; data = (struct detail_data *)page->lParam; - FIXME("add cert details\n"); + create_cert_details_list(hwnd, data); if (!(data->pCertViewInfo->dwFlags & CRYPTUI_ENABLE_EDITPROPERTIES)) EnableWindow(GetDlgItem(hwnd, IDC_EDITPROPERTIES), FALSE); if (data->pCertViewInfo->dwFlags & CRYPTUI_DISABLE_EXPORT)

1 0

Juan Lang : cryptui: Show detailed value of a field when it' s selected in the details page.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: bac337e68b561f277606ea01dc833f0a1937e0fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac337e68b561f277606ea01d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 08:54:11 2008 -0800 cryptui: Show detailed value of a field when it's selected in the details page. --- dlls/cryptui/main.c | 118 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 105 insertions(+), 13 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 820f501..fbc2b99 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1042,11 +1042,37 @@ static WCHAR *field_format_issuer(PCCERT_CONTEXT cert) CERT_NAME_ISSUER_FLAG); } +static WCHAR *field_format_detailed_cert_name(PCERT_NAME_BLOB name) +{ + WCHAR *str = NULL; + DWORD len = CertNameToStrW(X509_ASN_ENCODING, name, + CERT_X500_NAME_STR | CERT_NAME_STR_CRLF_FLAG, NULL, 0); + + if (len) + { + str = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (str) + CertNameToStrW(X509_ASN_ENCODING, name, + CERT_X500_NAME_STR | CERT_NAME_STR_CRLF_FLAG, str, len); + } + return str; +} + +static WCHAR *field_format_detailed_issuer(PCCERT_CONTEXT cert, void *param) +{ + return field_format_detailed_cert_name(&cert->pCertInfo->Issuer); +} + static WCHAR *field_format_subject(PCCERT_CONTEXT cert) { return get_cert_name_string(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0); } +static WCHAR *field_format_detailed_subject(PCCERT_CONTEXT cert, void *param) +{ + return field_format_detailed_cert_name(&cert->pCertInfo->Subject); +} + static WCHAR *format_long_date(const FILETIME *fileTime) { WCHAR dateFmt[80]; /* long enough for LOCALE_SLONGDATE */ @@ -1115,6 +1141,13 @@ static WCHAR *field_format_public_key(PCCERT_CONTEXT cert) return buf; } +static WCHAR *field_format_detailed_public_key(PCCERT_CONTEXT cert, void *param) +{ + return format_hex_string( + cert->pCertInfo->SubjectPublicKeyInfo.PublicKey.pbData, + cert->pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData); +} + struct field_value_data; struct detail_data { @@ -1126,12 +1159,17 @@ struct detail_data typedef void (*add_fields_func)(HWND hwnd, struct detail_data *data); +typedef WCHAR *(*create_detailed_value_func)(PCCERT_CONTEXT cert, void *param); + struct field_value_data { + create_detailed_value_func create; + LPWSTR detailed_value; void *param; }; -static void add_field_value_data(struct detail_data *data, void *param) +static void add_field_value_data(struct detail_data *data, + create_detailed_value_func create, void *param) { if (data->cFields) data->fields = HeapReAlloc(GetProcessHeap(), 0, data->fields, @@ -1141,13 +1179,15 @@ static void add_field_value_data(struct detail_data *data, void *param) sizeof(struct field_value_data)); if (data->fields) { + data->fields[data->cFields].create = create; + data->fields[data->cFields].detailed_value = NULL; data->fields[data->cFields].param = param; data->cFields++; } } static void add_field_and_value_to_list(HWND hwnd, struct detail_data *data, - LPWSTR field, LPWSTR value, void *param) + LPWSTR field, LPWSTR value, create_detailed_value_func create, void *param) { LVITEMW item; int iItem = SendMessageW(hwnd, LVM_GETITEMCOUNT, 0, 0); @@ -1164,22 +1204,23 @@ static void add_field_and_value_to_list(HWND hwnd, struct detail_data *data, item.iSubItem = 1; SendMessageW(hwnd, LVM_SETITEMTEXTW, iItem, (LPARAM)&item); } - add_field_value_data(data, param); + add_field_value_data(data, create, param); } static void add_string_id_and_value_to_list(HWND hwnd, struct detail_data *data, - int id, LPWSTR value, void *param) + int id, LPWSTR value, create_detailed_value_func create, void *param) { WCHAR buf[MAX_STRING_LEN]; LoadStringW(hInstance, id, buf, sizeof(buf) / sizeof(buf[0])); - add_field_and_value_to_list(hwnd, data, buf, value, param); + add_field_and_value_to_list(hwnd, data, buf, value, create, param); } struct v1_field { int id; field_format_func format; + create_detailed_value_func create_detailed_value; }; static void add_v1_field(HWND hwnd, struct detail_data *data, @@ -1189,19 +1230,21 @@ static void add_v1_field(HWND hwnd, struct detail_data *data, if (val) { - add_string_id_and_value_to_list(hwnd, data, field->id, val, NULL); + add_string_id_and_value_to_list(hwnd, data, field->id, val, + field->create_detailed_value, NULL); HeapFree(GetProcessHeap(), 0, val); } } static const struct v1_field v1_fields[] = { - { IDS_FIELD_VERSION, field_format_version }, - { IDS_FIELD_SERIAL_NUMBER, field_format_serial_number }, - { IDS_FIELD_ISSUER, field_format_issuer }, - { IDS_FIELD_VALID_FROM, field_format_from_date }, - { IDS_FIELD_VALID_TO, field_format_to_date }, - { IDS_FIELD_SUBJECT, field_format_subject }, - { IDS_FIELD_PUBLIC_KEY, field_format_public_key } + { IDS_FIELD_VERSION, field_format_version, NULL }, + { IDS_FIELD_SERIAL_NUMBER, field_format_serial_number, NULL }, + { IDS_FIELD_ISSUER, field_format_issuer, field_format_detailed_issuer }, + { IDS_FIELD_VALID_FROM, field_format_from_date, NULL }, + { IDS_FIELD_VALID_TO, field_format_to_date, NULL }, + { IDS_FIELD_SUBJECT, field_format_subject, field_format_detailed_subject }, + { IDS_FIELD_PUBLIC_KEY, field_format_public_key, + field_format_detailed_public_key } }; static void add_v1_fields(HWND hwnd, struct detail_data *data) @@ -1295,6 +1338,10 @@ static void create_cert_details_list(HWND hwnd, struct detail_data *data) static void free_detail_fields(struct detail_data *data) { + DWORD i; + + for (i = 0; i < data->cFields; i++) + HeapFree(GetProcessHeap(), 0, data->fields[i].detailed_value); HeapFree(GetProcessHeap(), 0, data->fields); data->fields = NULL; data->cFields = 0; @@ -1332,6 +1379,51 @@ static LRESULT CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, if (data->pCertViewInfo->dwFlags & CRYPTUI_DISABLE_EXPORT) EnableWindow(GetDlgItem(hwnd, IDC_EXPORT), FALSE); break; + case WM_NOTIFY: + { + NMITEMACTIVATE *nm; + HWND list = GetDlgItem(hwnd, IDC_DETAIL_LIST); + + nm = (NMITEMACTIVATE*)lp; + if (nm->hdr.hwndFrom == list && nm->uNewState & LVN_ITEMACTIVATE + && nm->hdr.code == LVN_ITEMCHANGED) + { + data = (struct detail_data *)nm->lParam; + if (nm->iItem >= 0 && data && nm->iItem < data->cFields) + { + WCHAR buf[MAX_STRING_LEN], *val = NULL; + HWND valueCtl = GetDlgItem(hwnd, IDC_DETAIL_VALUE); + + if (data->fields[nm->iItem].create) + val = data->fields[nm->iItem].create( + data->pCertViewInfo->pCertContext, + data->fields[nm->iItem].param); + else + { + LVITEMW item; + int res; + + item.cchTextMax = sizeof(buf) / sizeof(buf[0]); + item.mask = LVIF_TEXT; + item.pszText = buf; + item.iItem = nm->iItem; + item.iSubItem = 1; + res = SendMessageW(list, LVM_GETITEMW, 0, (LPARAM)&item); + if (res) + val = buf; + } + /* Select all the text in the control, the next update will + * replace it + */ + SendMessageW(valueCtl, EM_SETSEL, 0, -1); + add_unformatted_text_to_control(valueCtl, val, + val ? strlenW(val) : 0); + if (val != buf) + HeapFree(GetProcessHeap(), 0, val); + } + } + break; + } case WM_COMMAND: switch (wp) {

1 0

Juan Lang : cryptui: Show the certificate extensions in the details page.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: c5fad0d15694bc213abe4328db4f3913f95e0449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5fad0d15694bc213abe4328d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 08:55:09 2008 -0800 cryptui: Show the certificate extensions in the details page. --- dlls/cryptui/main.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index fbc2b99..993e953 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1261,10 +1261,156 @@ static void add_v1_fields(HWND hwnd, struct detail_data *data) add_v1_field(hwnd, data, &v1_fields[i]); } +static WCHAR *crypt_format_extension(PCERT_EXTENSION ext, DWORD formatStrType) +{ + WCHAR *str = NULL; + DWORD size; + + if (CryptFormatObject(X509_ASN_ENCODING, 0, formatStrType, NULL, + ext->pszObjId, ext->Value.pbData, ext->Value.cbData, NULL, &size)) + { + str = HeapAlloc(GetProcessHeap(), 0, size); + CryptFormatObject(X509_ASN_ENCODING, 0, formatStrType, NULL, + ext->pszObjId, ext->Value.pbData, ext->Value.cbData, str, &size); + } + return str; +} + +static WCHAR *field_format_extension_hex_with_ascii(PCERT_EXTENSION ext) +{ + WCHAR *str = NULL; + + if (ext->Value.cbData) + { + /* The output is formatted as: + * <hex bytes> <ascii bytes>\n + * where <hex bytes> is a string of up to 8 bytes, output as %02x, + * and <ascii bytes> is the ASCII equivalent of each byte, or '.' if + * the byte is not printable. + * So, for example, the extension value consisting of the following + * bytes: + * 0x30,0x14,0x31,0x12,0x30,0x10,0x06,0x03,0x55,0x04,0x03, + * 0x13,0x09,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67 + * is output as: + * 30 14 31 12 30 10 06 03 0.1.0... + * 55 04 03 13 09 4a 75 61 U....Jua + * 6e 20 4c 61 6e 67 n Lang + * The allocation size therefore requires: + * - 4 characters per character in an 8-byte line + * (2 for the hex format, one for the space, one for the ASCII value) + * - 3 more characters per 8-byte line (two spaces and a newline) + * - 1 character for the terminating nul + * FIXME: should use a fixed-width font for this + */ + DWORD lines = (ext->Value.cbData + 7) / 8; + + str = HeapAlloc(GetProcessHeap(), 0, + (lines * 8 * 4 + lines * 3 + 1) * sizeof(WCHAR)); + if (str) + { + static const WCHAR fmt[] = { '%','0','2','x',' ',0 }; + DWORD i, j; + WCHAR *ptr; + + for (i = 0, ptr = str; i < ext->Value.cbData; i += 8) + { + /* Output as hex bytes first */ + for (j = i; j < min(i + 8, ext->Value.cbData); j++, ptr += 3) + sprintfW(ptr, fmt, ext->Value.pbData[j]); + /* Pad the hex output with spaces for alignment */ + if (j == ext->Value.cbData && j % 8) + { + static const WCHAR pad[] = { ' ',' ',' ' }; + + for (; j % 8; j++, ptr += sizeof(pad) / sizeof(pad[0])) + memcpy(ptr, pad, sizeof(pad)); + } + /* The last sprintfW included a space, so just insert one + * more space between the hex bytes and the ASCII output + */ + *ptr++ = ' '; + /* Output as ASCII bytes */ + for (j = i; j < min(i + 8, ext->Value.cbData); j++, ptr++) + { + if (isprintW(ext->Value.pbData[j]) && + !isspaceW(ext->Value.pbData[j])) + *ptr = ext->Value.pbData[j]; + else + *ptr = '.'; + } + *ptr++ = '\n'; + } + *ptr++ = '\0'; + } + } + return str; +} + +static WCHAR *field_format_detailed_extension(PCCERT_CONTEXT cert, void *param) +{ + PCERT_EXTENSION ext = param; + LPWSTR str = crypt_format_extension(ext, + CRYPT_FORMAT_STR_MULTI_LINE | CRYPT_FORMAT_STR_NO_HEX); + + if (!str) + str = field_format_extension_hex_with_ascii(ext); + return str; +} + +static void add_cert_extension_detail(HWND hwnd, struct detail_data *data, + PCERT_EXTENSION ext) +{ + PCCRYPT_OID_INFO oidInfo = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, + ext->pszObjId, 0); + LPWSTR val = crypt_format_extension(ext, 0); + + if (oidInfo) + add_field_and_value_to_list(hwnd, data, (LPWSTR)oidInfo->pwszName, + val, field_format_detailed_extension, ext); + else + { + DWORD len = strlen(ext->pszObjId); + LPWSTR oidW = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + + if (oidW) + { + DWORD i; + + for (i = 0; i <= len; i++) + oidW[i] = ext->pszObjId[i]; + add_field_and_value_to_list(hwnd, data, oidW, val, + field_format_detailed_extension, ext); + HeapFree(GetProcessHeap(), 0, oidW); + } + } + HeapFree(GetProcessHeap(), 0, val); +} + +static void add_all_extensions(HWND hwnd, struct detail_data *data) +{ + DWORD i; + PCCERT_CONTEXT cert = data->pCertViewInfo->pCertContext; + + for (i = 0; i < cert->pCertInfo->cExtension; i++) + add_cert_extension_detail(hwnd, data, &cert->pCertInfo->rgExtension[i]); +} + +static void add_critical_extensions(HWND hwnd, struct detail_data *data) +{ + DWORD i; + PCCERT_CONTEXT cert = data->pCertViewInfo->pCertContext; + + for (i = 0; i < cert->pCertInfo->cExtension; i++) + if (cert->pCertInfo->rgExtension[i].fCritical) + add_cert_extension_detail(hwnd, data, + &cert->pCertInfo->rgExtension[i]); +} + static void add_all_fields(HWND hwnd, struct detail_data *data) { add_v1_fields(hwnd, data); - FIXME("add extensions and properties\n"); + add_all_extensions(hwnd, data); + FIXME("add properties\n"); } struct selection_list_item @@ -1276,8 +1422,8 @@ struct selection_list_item const struct selection_list_item listItems[] = { { IDS_FIELDS_ALL, add_all_fields }, { IDS_FIELDS_V1, add_v1_fields }, - { IDS_FIELDS_EXTENSIONS, NULL }, - { IDS_FIELDS_CRITICAL_EXTENSIONS, NULL }, + { IDS_FIELDS_EXTENSIONS, add_all_extensions }, + { IDS_FIELDS_CRITICAL_EXTENSIONS, add_critical_extensions }, { IDS_FIELDS_PROPERTIES, NULL }, };

1 0

Juan Lang : cryptui: Show the X. 509 v1 certificate fields in the details page.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: d1b8b80c8324818e122f7db06cd3141e3eac0c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b8b80c8324818e122f7db06… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 08:53:32 2008 -0800 cryptui: Show the X.509 v1 certificate fields in the details page. --- dlls/cryptui/cryptui_En.rc | 8 ++ dlls/cryptui/cryptuires.h | 8 ++ dlls/cryptui/main.c | 266 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 276 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1b8b80c8324818e122f7…

1 0

Juan Lang : cryptui: Add a (empty) details page to the cert properties dialog.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: b7afe1740b11da41eb5561091adcfe31edf7c899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7afe1740b11da41eb5561091… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 08:52:15 2008 -0800 cryptui: Add a (empty) details page to the cert properties dialog. --- dlls/cryptui/cryptui_En.rc | 17 ++++++++++ dlls/cryptui/cryptuires.h | 7 ++++ dlls/cryptui/main.c | 72 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 95 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index d0ef8b1..eef2b30 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -82,6 +82,23 @@ BEGIN PUSHBUTTON "Issuer &Statement", IDC_ISSUERSTATEMENT,177,216,70,14 END +IDD_DETAIL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Details" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Show:", stc1, 6,12,40,14 + COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_DETAIL_LIST, "SysListView32", + LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 6,28,241,100 + CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", + ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 + PUSHBUTTON "&Edit Properties...", IDC_EDITPROPERTIES,103,216,70,14 + PUSHBUTTON "&Copy to File...", IDC_EXPORT,177,216,70,14 +END + IDD_USERNOTICE DIALOG DISCARDABLE 0, 0, 255, 256 CAPTION "Disclaimer" STYLE WS_VISIBLE diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index e499e0b..0c80783 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -60,6 +60,7 @@ #define IDS_PURPOSE_DS_EMAIL_REPLICATION 1125 #define IDD_GENERAL 100 +#define IDD_DETAIL 101 #define IDD_USERNOTICE 103 #define IDB_CERT 201 @@ -75,6 +76,12 @@ #define IDC_ADDTOSTORE 2005 #define IDC_ISSUERSTATEMENT 2006 +#define IDC_DETAIL_SELECT 2100 +#define IDC_DETAIL_LIST 2101 +#define IDC_DETAIL_VALUE 2102 +#define IDC_EDITPROPERTIES 2103 +#define IDC_EXPORT 2104 + #define IDC_USERNOTICE 2300 #define IDC_CPS 2301 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index f04875f..db5fc6b 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1001,6 +1001,70 @@ static void init_general_page(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, page->lParam = (LPARAM)pCertViewInfo; } +struct detail_data +{ + PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo; + BOOL *pfPropertiesChanged; +}; + +static LRESULT CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, + LPARAM lp) +{ + PROPSHEETPAGEW *page; + struct detail_data *data; + + TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + + switch (msg) + { + case WM_INITDIALOG: + page = (PROPSHEETPAGEW *)lp; + data = (struct detail_data *)page->lParam; + FIXME("add cert details\n"); + if (!(data->pCertViewInfo->dwFlags & CRYPTUI_ENABLE_EDITPROPERTIES)) + EnableWindow(GetDlgItem(hwnd, IDC_EDITPROPERTIES), FALSE); + if (data->pCertViewInfo->dwFlags & CRYPTUI_DISABLE_EXPORT) + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT), FALSE); + break; + case WM_COMMAND: + switch (wp) + { + case IDC_EXPORT: + FIXME("call CryptUIWizExport\n"); + break; + case IDC_EDITPROPERTIES: + FIXME("show edit properties dialog\n"); + break; + } + break; + } + return 0; +} + +static BOOL init_detail_page(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, + BOOL *pfPropertiesChanged, PROPSHEETPAGEW *page) +{ + BOOL ret; + struct detail_data *data = HeapAlloc(GetProcessHeap(), 0, + sizeof(struct detail_data)); + + if (data) + { + data->pCertViewInfo = pCertViewInfo; + data->pfPropertiesChanged = pfPropertiesChanged; + memset(page, 0, sizeof(PROPSHEETPAGEW)); + page->dwSize = sizeof(PROPSHEETPAGEW); + page->hInstance = hInstance; + page->u.pszTemplate = MAKEINTRESOURCEW(IDD_DETAIL); + page->pfnDlgProc = detail_dlg_proc; + page->lParam = (LPARAM)data; + ret = TRUE; + } + else + ret = FALSE; + return ret; +} + static int CALLBACK cert_prop_sheet_proc(HWND hwnd, UINT msg, LPARAM lp) { RECT rc; @@ -1040,7 +1104,7 @@ static BOOL show_cert_dialog(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, nPages = pCertViewInfo->cPropSheetPages + 1; /* one for the General tab */ if (!(pCertViewInfo->dwFlags & CRYPTUI_HIDE_DETAILPAGE)) - FIXME("show detail page\n"); + nPages++; if (!(pCertViewInfo->dwFlags & CRYPTUI_HIDE_HIERARCHYPAGE)) FIXME("show hierarchy page\n"); pages = HeapAlloc(GetProcessHeap(), 0, nPages * sizeof(PROPSHEETPAGEW)); @@ -1059,6 +1123,12 @@ static BOOL show_cert_dialog(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, else hdr.pszCaption = MAKEINTRESOURCEW(IDS_CERTIFICATE); init_general_page(pCertViewInfo, &pages[hdr.nPages++]); + if (!(pCertViewInfo->dwFlags & CRYPTUI_HIDE_DETAILPAGE)) + { + if (init_detail_page(pCertViewInfo, pfPropertiesChanged, + &pages[hdr.nPages])) + hdr.nPages++; + } /* Copy each additional page, and create the init dialog struct for it */ if (pCertViewInfo->cPropSheetPages)

1 0

Juan Lang : cryptui: Show icon and text representing trust state of certificate.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: 71472a2a2099f03813abf0c21e46566adbdbb358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71472a2a2099f03813abf0c21… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 16 09:52:20 2008 -0800 cryptui: Show icon and text representing trust state of certificate. --- dlls/cryptui/Makefile.in | 2 +- dlls/cryptui/cert.bmp | Bin 0 -> 630 bytes dlls/cryptui/certerror.bmp | Bin 0 -> 630 bytes dlls/cryptui/certwarning.bmp | Bin 0 -> 630 bytes dlls/cryptui/cryptui.rc | 9 +++ dlls/cryptui/cryptui_En.rc | 5 ++ dlls/cryptui/cryptuires.h | 10 +++ dlls/cryptui/main.c | 141 +++++++++++++++++++++++++++++++++++++++++- 8 files changed, 165 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in index bc4cd1c..078cb33 100644 --- a/dlls/cryptui/Makefile.in +++ b/dlls/cryptui/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cryptui.dll -IMPORTS = crypt32 comctl32 user32 kernel32 +IMPORTS = uuid crypt32 ole32 comctl32 user32 kernel32 DELAYIMPORTS = wintrust IMPORTLIB = cryptui diff --git a/dlls/cryptui/cert.bmp b/dlls/cryptui/cert.bmp new file mode 100644 index 0000000..1f44f36 Binary files /dev/null and b/dlls/cryptui/cert.bmp differ diff --git a/dlls/cryptui/certerror.bmp b/dlls/cryptui/certerror.bmp new file mode 100644 index 0000000..98bce50 Binary files /dev/null and b/dlls/cryptui/certerror.bmp differ diff --git a/dlls/cryptui/certwarning.bmp b/dlls/cryptui/certwarning.bmp new file mode 100644 index 0000000..5961d9f Binary files /dev/null and b/dlls/cryptui/certwarning.bmp differ diff --git a/dlls/cryptui/cryptui.rc b/dlls/cryptui/cryptui.rc index d18034d..2a1f0e4 100644 --- a/dlls/cryptui/cryptui.rc +++ b/dlls/cryptui/cryptui.rc @@ -25,4 +25,13 @@ #include "cryptuires.h" +/* @makedep: cert.bmp */ +IDB_CERT BITMAP LOADONCALL DISCARDABLE cert.bmp + +/* @makedep: certerror.bmp */ +IDB_CERT_ERROR BITMAP LOADONCALL DISCARDABLE certerror.bmp + +/* @makedep: certwarning.bmp */ +IDB_CERT_WARNING BITMAP LOADONCALL DISCARDABLE certwarning.bmp + #include "cryptui_En.rc" diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 3f718cc..99f18ec 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -23,6 +23,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { IDS_CERTIFICATE "Certificate" + IDS_CERTIFICATEINFORMATION "Certificate Information" + IDS_CERT_INFO_BAD_SIG "This certificate has an invalid signature. The certificate may have been altered or corrupted." + IDS_CERT_INFO_UNTRUSTED_CA "This root certificate is not trusted. To trust it, add it to your system's trusted root certificate store." + IDS_CERT_INFO_UNTRUSTED_ROOT "This certificate could not be validated to a trusted root certificate." + IDS_CERT_INFO_PARTIAL_CHAIN "This certificate's issuer could not be found." IDS_SUBJECT_HEADING "Issued to: " IDS_ISSUER_HEADING "Issued by: " IDS_VALID_FROM "Valid from " diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 8c99b8e..dcc1b7a 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -19,6 +19,11 @@ #define __CRYPTUIRES_H_ #define IDS_CERTIFICATE 1000 +#define IDS_CERTIFICATEINFORMATION 1001 +#define IDS_CERT_INFO_BAD_SIG 1002 +#define IDS_CERT_INFO_UNTRUSTED_CA 1003 +#define IDS_CERT_INFO_UNTRUSTED_ROOT 1004 +#define IDS_CERT_INFO_PARTIAL_CHAIN 1005 #define IDS_SUBJECT_HEADING 1010 #define IDS_ISSUER_HEADING 1011 @@ -27,6 +32,11 @@ #define IDD_GENERAL 100 +#define IDB_CERT 201 +#define IDB_CERT_ERROR 202 +#define IDB_CERT_WARNING 203 +#define IDB_CHECKS 204 + #define IDC_STATIC 2000 #define IDC_CERTIFICATE_ICON 2001 #define IDC_CERTIFICATE_INFO 2002 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 6ec6aa3..234ccd7 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -20,6 +20,7 @@ #include <stdarg.h> +#define COBJMACROS #define NONAMELESSUNION #include "windef.h" @@ -29,6 +30,8 @@ #include "softpub.h" #include "wingdi.h" #include "richedit.h" +#include "ole2.h" +#include "richole.h" #include "cryptuiapi.h" #include "cryptuires.h" #include "wine/debug.h" @@ -203,8 +206,144 @@ static void add_cert_string_to_control(HWND hwnd, PCCERT_CONTEXT pCertContext, } } +static void add_icon_to_control(HWND hwnd, int id) +{ + HRESULT hr; + LPRICHEDITOLE richEditOle = NULL; + LPOLEOBJECT object = NULL; + CLSID clsid; + LPOLECACHE oleCache = NULL; + FORMATETC formatEtc; + DWORD conn; + LPDATAOBJECT dataObject = NULL; + HBITMAP bitmap = NULL; + RECT rect; + STGMEDIUM stgm; + REOBJECT reObject; + + TRACE("(%p, %d)\n", hwnd, id); + + SendMessageW(hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&richEditOle); + if (!richEditOle) + goto end; + hr = OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, + (void**)&object); + if (FAILED(hr)) + goto end; + hr = IOleObject_GetUserClassID(object, &clsid); + if (FAILED(hr)) + goto end; + hr = IOleObject_QueryInterface(object, &IID_IOleCache, (void**)&oleCache); + if (FAILED(hr)) + goto end; + formatEtc.cfFormat = CF_BITMAP; + formatEtc.ptd = NULL; + formatEtc.dwAspect = DVASPECT_CONTENT; + formatEtc.lindex = -1; + formatEtc.tymed = TYMED_GDI; + hr = IOleCache_Cache(oleCache, &formatEtc, 0, &conn); + if (FAILED(hr)) + goto end; + hr = IOleObject_QueryInterface(object, &IID_IDataObject, + (void**)&dataObject); + if (FAILED(hr)) + goto end; + bitmap = LoadImageW(hInstance, MAKEINTRESOURCEW(id), IMAGE_BITMAP, 0, 0, + LR_DEFAULTSIZE | LR_LOADTRANSPARENT); + if (!bitmap) + goto end; + rect.left = rect.top = 0; + rect.right = GetSystemMetrics(SM_CXICON); + rect.bottom = GetSystemMetrics(SM_CYICON); + stgm.tymed = TYMED_GDI; + stgm.u.hBitmap = bitmap; + stgm.pUnkForRelease = NULL; + hr = IDataObject_SetData(dataObject, &formatEtc, &stgm, TRUE); + if (FAILED(hr)) + goto end; + + reObject.cbStruct = sizeof(reObject); + reObject.cp = REO_CP_SELECTION; + reObject.clsid = clsid; + reObject.poleobj = object; + reObject.pstg = NULL; + reObject.polesite = NULL; + reObject.sizel.cx = reObject.sizel.cy = 0; + reObject.dvaspect = DVASPECT_CONTENT; + reObject.dwFlags = 0; + reObject.dwUser = 0; + + IRichEditOle_InsertObject(richEditOle, &reObject); + +end: + if (dataObject) + IDataObject_Release(dataObject); + if (oleCache) + IOleCache_Release(oleCache); + if (object) + IOleObject_Release(object); + if (richEditOle) + IRichEditOle_Release(richEditOle); +} + #define MY_INDENT 200 +static void set_cert_info(HWND hwnd, + PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo) +{ + CHARFORMATW charFmt; + PARAFORMAT2 parFmt; + HWND icon = GetDlgItem(hwnd, IDC_CERTIFICATE_ICON); + HWND text = GetDlgItem(hwnd, IDC_CERTIFICATE_INFO); + CRYPT_PROVIDER_SGNR *provSigner = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)pCertViewInfo->u.pCryptProviderData, + pCertViewInfo->idxSigner, pCertViewInfo->fCounterSigner, + pCertViewInfo->idxCounterSigner); + CRYPT_PROVIDER_CERT *root = + &provSigner->pasCertChain[provSigner->csCertChain - 1]; + + if (provSigner->pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_PARTIAL_CHAIN) + add_icon_to_control(icon, IDB_CERT_WARNING); + else if (!root->fTrustedRoot) + add_icon_to_control(icon, IDB_CERT_ERROR); + else + add_icon_to_control(icon, IDB_CERT); + + memset(&charFmt, 0, sizeof(charFmt)); + charFmt.cbSize = sizeof(charFmt); + charFmt.dwMask = CFM_BOLD; + charFmt.dwEffects = CFE_BOLD; + SendMessageW(text, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&charFmt); + /* FIXME: vertically center text */ + parFmt.cbSize = sizeof(parFmt); + parFmt.dwMask = PFM_STARTINDENT; + parFmt.dxStartIndent = MY_INDENT; + add_string_resource_with_paraformat_to_control(text, + IDS_CERTIFICATEINFORMATION, &parFmt); + + text = GetDlgItem(hwnd, IDC_CERTIFICATE_STATUS); + SendMessageW(text, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&charFmt); + if (provSigner->dwError == TRUST_E_CERT_SIGNATURE) + add_string_resource_with_paraformat_to_control(text, + IDS_CERT_INFO_BAD_SIG, &parFmt); + else if (provSigner->pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_PARTIAL_CHAIN) + add_string_resource_with_paraformat_to_control(text, + IDS_CERT_INFO_PARTIAL_CHAIN, &parFmt); + else if (!root->fTrustedRoot) + { + if (provSigner->csCertChain == 1 && root->fSelfSigned) + add_string_resource_with_paraformat_to_control(text, + IDS_CERT_INFO_UNTRUSTED_CA, &parFmt); + else + add_string_resource_with_paraformat_to_control(text, + IDS_CERT_INFO_UNTRUSTED_ROOT, &parFmt); + } + else + FIXME("show policies and issuer statement\n"); +} + static void set_cert_name_string(HWND hwnd, PCCERT_CONTEXT cert, DWORD nameFlags, int heading) { @@ -278,7 +417,7 @@ static void set_cert_validity_period(HWND hwnd, PCCERT_CONTEXT cert) static void set_general_info(HWND hwnd, PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo) { - FIXME("set cert general info\n"); + set_cert_info(hwnd, pCertViewInfo); set_cert_name_string(hwnd, pCertViewInfo->pCertContext, 0, IDS_SUBJECT_HEADING); set_cert_name_string(hwnd, pCertViewInfo->pCertContext,

1 0