wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Paul Vriens : advapi32: Add some input parameter checks to GetOldestEventLogRecord.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 78452960bc0ee057b74a8e48ffd2c5cc527e295d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78452960bc0ee057b74a8e48f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 29 09:25:07 2009 +0100 advapi32: Add some input parameter checks to GetOldestEventLogRecord. --- dlls/advapi32/eventlog.c | 13 ++++++++++++- dlls/advapi32/tests/eventlog.c | 5 ----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 6812cdd..8ce255a 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -300,7 +300,18 @@ BOOL WINAPI GetOldestEventLogRecord( HANDLE hEventLog, PDWORD OldestRecord ) { FIXME("(%p,%p) stub\n", hEventLog, OldestRecord); - if (!OldestRecord) return FALSE; + if (!OldestRecord) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!hEventLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + *OldestRecord = 0; return TRUE; diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index dab24f0..9dc1d97 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -191,25 +191,20 @@ static void test_oldest(void) SetLastError(0xdeadbeef); ret = GetOldestEventLogRecord(NULL, NULL); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); oldest = 0xdeadbeef; ret = GetOldestEventLogRecord(NULL, &oldest); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); ok(oldest == 0xdeadbeef, "Expected oldest to stay unchanged\n"); - } handle = OpenEventLogA(NULL, "Application"); SetLastError(0xdeadbeef); ret = GetOldestEventLogRecord(handle, NULL); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); oldest = 0xdeadbeef;

1 0

Paul Vriens : advapi32/tests: Add some GetOldestEventLogRecord tests.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 1fe325fd1336016ae59ace9cc36aa784eb17f15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe325fd1336016ae59ace9cc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 29 09:22:42 2009 +0100 advapi32/tests: Add some GetOldestEventLogRecord tests. --- dlls/advapi32/tests/eventlog.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index d394012..dab24f0 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -182,6 +182,44 @@ static void test_count(void) CloseEventLog(handle); } +static void test_oldest(void) +{ + HANDLE handle; + BOOL ret; + DWORD oldest; + + SetLastError(0xdeadbeef); + ret = GetOldestEventLogRecord(NULL, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + oldest = 0xdeadbeef; + ret = GetOldestEventLogRecord(NULL, &oldest); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(oldest == 0xdeadbeef, "Expected oldest to stay unchanged\n"); + } + + handle = OpenEventLogA(NULL, "Application"); + + SetLastError(0xdeadbeef); + ret = GetOldestEventLogRecord(handle, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + oldest = 0xdeadbeef; + ret = GetOldestEventLogRecord(handle, &oldest); + ok(ret, "Expected succes\n"); + ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); + + CloseEventLog(handle); +} + START_TEST(eventlog) { SetLastError(0xdeadbeef); @@ -198,4 +236,5 @@ START_TEST(eventlog) test_open_close(); test_info(); test_count(); + test_oldest(); }

1 0

Paul Vriens : advapi32: Add some input parameter checks to GetNumberOfEventLogRecords.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: de72f40580f35eed0abf8ee081bc8b833d0fbe0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=de72f40580f35eed0abf8ee08… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 28 19:37:06 2009 +0100 advapi32: Add some input parameter checks to GetNumberOfEventLogRecords. --- dlls/advapi32/eventlog.c | 13 ++++++++++++- dlls/advapi32/tests/eventlog.c | 5 ----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index e5c7bd7..6812cdd 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -265,7 +265,18 @@ BOOL WINAPI GetNumberOfEventLogRecords( HANDLE hEventLog, PDWORD NumberOfRecords { FIXME("(%p,%p) stub\n", hEventLog, NumberOfRecords); - if (!NumberOfRecords) return FALSE; + if (!NumberOfRecords) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!hEventLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + *NumberOfRecords = 0; return TRUE; diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 4840ec5..d394012 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -158,25 +158,20 @@ static void test_count(void) SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(NULL, NULL); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(NULL, &count); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); ok(count == 0xdeadbeef, "Expected count to stay unchanged\n"); - } handle = OpenEventLogA(NULL, "Application"); SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(handle, NULL); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); count = 0xdeadbeef;

1 0

Paul Vriens : advapi32/tests: Add some GetNumberOfEventLogRecords tests.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 215ca8a4d748b9fc7371a06d413ac055009616d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=215ca8a4d748b9fc7371a06d4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 28 19:35:30 2009 +0100 advapi32/tests: Add some GetNumberOfEventLogRecords tests. --- dlls/advapi32/tests/eventlog.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 628b08c..4840ec5 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -149,6 +149,44 @@ static void test_info(void) CloseEventLog(handle); } +static void test_count(void) +{ + HANDLE handle; + BOOL ret; + DWORD count; + + SetLastError(0xdeadbeef); + ret = GetNumberOfEventLogRecords(NULL, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + count = 0xdeadbeef; + ret = GetNumberOfEventLogRecords(NULL, &count); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(count == 0xdeadbeef, "Expected count to stay unchanged\n"); + } + + handle = OpenEventLogA(NULL, "Application"); + + SetLastError(0xdeadbeef); + ret = GetNumberOfEventLogRecords(handle, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + ret = GetNumberOfEventLogRecords(handle, &count); + ok(ret, "Expected succes\n"); + ok(count != 0xdeadbeef, "Expected the number of records\n"); + + CloseEventLog(handle); +} + START_TEST(eventlog) { SetLastError(0xdeadbeef); @@ -164,4 +202,5 @@ START_TEST(eventlog) /* Parameters only */ test_open_close(); test_info(); + test_count(); }

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode::nextSibling implementation.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 11651f5731d9f01f3c1d2253a8606b2ae3db4919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11651f5731d9f01f3c1d2253a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 29 02:37:44 2009 +0100 mshtml: Added IHTMLDOMNode::nextSibling implementation. --- dlls/mshtml/htmlnode.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 9227899..92ad74e 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -729,8 +729,19 @@ static HRESULT WINAPI HTMLDOMNode_get_previousSibling(IHTMLDOMNode *iface, IHTML static HRESULT WINAPI HTMLDOMNode_get_nextSibling(IHTMLDOMNode *iface, IHTMLDOMNode **p) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNode *nssibling = NULL; + + TRACE("(%p)->(%p)\n", This, p); + + nsIDOMNode_GetNextSibling(This->nsnode, &nssibling); + if(nssibling) { + *p = HTMLDOMNODE(get_node(This->doc, nssibling, TRUE)); + IHTMLDOMNode_AddRef(*p); + }else { + *p = NULL; + } + + return S_OK; } #undef HTMLDOMNODE_THIS diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d9642e1..be3022b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1609,6 +1609,20 @@ static IHTMLDOMNode *_test_node_get_parent(unsigned line, IUnknown *unk) return parent; } +#define node_get_next(u) _node_get_next(__LINE__,u) +static IHTMLDOMNode *_node_get_next(unsigned line, IUnknown *unk) +{ + IHTMLDOMNode *node = _get_node_iface(line, unk); + IHTMLDOMNode *next; + HRESULT hres; + + hres = IHTMLDOMNode_get_nextSibling(node, &next); + IHTMLDOMNode_Release(node); + ok_(__FILE__,line) (hres == S_OK, "get_nextSiblibg failed: %08x\n", hres); + + return next; +} + #define test_elem_get_parent(u) _test_elem_get_parent(__LINE__,u) static IHTMLElement *_test_elem_get_parent(unsigned line, IUnknown *unk) { @@ -5248,11 +5262,13 @@ static void test_elems(IHTMLDocument2 *doc) ok(hres == S_OK, "get_length failed: %08x\n", hres); ok(length, "length=0\n"); + node2 = NULL; node = get_child_item(child_col, 0); ok(node != NULL, "node == NULL\n"); if(node) { type = get_node_type((IUnknown*)node); ok(type == 3, "type=%d\n", type); + node2 = node_get_next((IUnknown*)node); IHTMLDOMNode_Release(node); } @@ -5263,6 +5279,8 @@ static void test_elems(IHTMLDocument2 *doc) ok(type == 8, "type=%d\n", type); test_elem_id((IUnknown*)node, NULL); + ok(iface_cmp((IUnknown*)node2, (IUnknown*)node), "node2 != node\n"); + IHTMLDOMNode_Release(node2); IHTMLDOMNode_Release(node); } @@ -5343,6 +5361,13 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_innerhtml((IUnknown*)elem, "inner html"); test_elem_set_innerhtml((IUnknown*)elem, ""); test_elem_innerhtml((IUnknown*)elem, NULL); + node = node_get_next((IUnknown*)elem); + ok(!node, "node = %p\n", node); + + elem2 = get_doc_elem_by_id(doc, "x"); + node = node_get_next((IUnknown*)elem2); + IHTMLDOMNode_Release(node); + IHTMLElement_Release(elem2); IHTMLElement_Release(elem); IHTMLDocument3_Release(doc3);

1 0

Jacek Caban : mshtml: Inherit scriptmode from parent window.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: d76720cc562b9122c5c04427decb1727c78bd562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76720cc562b9122c5c04427d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 22:55:26 2009 +0100 mshtml: Inherit scriptmode from parent window. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9b8dda3..5b07b0f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1582,7 +1582,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->nswindow = nswindow; } - window->scriptmode = SCRIPTMODE_GECKO; + window->scriptmode = parent ? parent->scriptmode : SCRIPTMODE_GECKO; list_init(&window->script_hosts); window->task_magic = get_task_target_magic();

1 0

Jacek Caban : mshtml: Improve debug traces.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: ceb02fb0272fcf6db934039ed024f6af96523d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceb02fb0272fcf6db934039ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 22:54:48 2009 +0100 mshtml: Improve debug traces. --- dlls/mshtml/script.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4ee0da0..7df0dd6 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -620,11 +620,14 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) VariantInit(&var); memset(&excepinfo, 0, sizeof(excepinfo)); + TRACE(">>>\n"); hres = IActiveScriptParse64_ParseScriptText(script_host->parse, text, windowW, NULL, script_endW, 0, 0, SCRIPTTEXT_ISVISIBLE|SCRIPTTEXT_HOSTMANAGESSOURCE, &var, &excepinfo); - if(FAILED(hres)) - WARN("ParseScriptText failed: %08x\n", hres); + if(SUCCEEDED(hres)) + TRACE("<<<\n"); + else + WARN("<<< %08x\n", hres); }

1 0

Juan Lang : cryptui: Fix German translation.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: b8b8ff07545b2978a44e3ecf3bc9d64e8ac7cf2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b8ff07545b2978a44e3ecf3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 28 11:33:08 2009 -0700 cryptui: Fix German translation. --- dlls/cryptui/cryptui_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_De.rc b/dlls/cryptui/cryptui_De.rc index cfaf468..7174015 100644 --- a/dlls/cryptui/cryptui_De.rc +++ b/dlls/cryptui/cryptui_De.rc @@ -119,7 +119,7 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_DEFAULT "Sind Sie sicher, dass Sie dieses Zertifikat entfernen möchten?" IDS_WARN_REMOVE_PLURAL_DEFAULT "Sind Sie sicher, dass Sie diese Zertifikate entfernen möchten?" IDS_CERT_MGR "Zertifikate" - IDS_FRIENDLY_NAME_NONE "<Keine>" + IDS_FRIENDLY_NAME_NONE "<Keiner>" IDS_PURPOSE_SERVER_AUTH "Garantiert die Identität eines entfernten Computers" IDS_PURPOSE_CLIENT_AUTH "Beweist Ihre Identität für einen entfernten Computers" IDS_PURPOSE_CODE_SIGNING "Schützt Software vor Manipulation nach der Veröffentlichung"

1 0

Aurimas Fišeras : cryptui: Fix Lithuanian translation.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 878aac41e8115124eae4600d23742c2155696ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878aac41e8115124eae4600d2… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Oct 28 19:39:51 2009 +0200 cryptui: Fix Lithuanian translation. --- dlls/cryptui/cryptui_Lt.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_Lt.rc b/dlls/cryptui/cryptui_Lt.rc index deb5598..ee02eab 100644 --- a/dlls/cryptui/cryptui_Lt.rc +++ b/dlls/cryptui/cryptui_Lt.rc @@ -120,7 +120,7 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_DEFAULT "Ar tikrai norite pašalinti šį liudijimą?" IDS_WARN_REMOVE_PLURAL_DEFAULT "Ar tikrai norite pašalinti šiuos liudijimus?" IDS_CERT_MGR "Liudijimai" - IDS_FRIENDLY_NAME_NONE "<jokios>" + IDS_FRIENDLY_NAME_NONE "<joks>" IDS_PURPOSE_SERVER_AUTH "Garantuoja nutolusio kompiuterio tapatumą" IDS_PURPOSE_CLIENT_AUTH "Įrodo jūsų tapatumą nutolusiam kompiuteriui" IDS_PURPOSE_CODE_SIGNING "Garantuoja, kad programinė įranga yra iš šio leidėjo\nApsaugo programinę įrangą nuo pakeitimų po išleidimo"

1 0

Juan Lang : crypt32: Implement CertVerifyCertificateChainPolicy for CERT_CHAIN_POLICY_SSL.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 9059892ec1da79567279aaeb96f46791718bc7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9059892ec1da79567279aaeb9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 28 09:17:30 2009 -0700 crypt32: Implement CertVerifyCertificateChainPolicy for CERT_CHAIN_POLICY_SSL. --- dlls/crypt32/chain.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 231 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index e8f9de3..8972463 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2117,6 +2117,234 @@ static BOOL WINAPI verify_basic_constraints_policy(LPCSTR szPolicyOID, return TRUE; } +static inline PCERT_EXTENSION get_subject_alt_name_ext(PCCERT_CONTEXT cert) +{ + PCERT_EXTENSION ext; + + ext = CertFindExtension(szOID_SUBJECT_ALT_NAME2, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); + if (!ext) + ext = CertFindExtension(szOID_SUBJECT_ALT_NAME, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); + return ext; +} + +static BOOL match_dns_to_subject_alt_name(PCERT_EXTENSION ext, + LPCWSTR server_name) +{ + BOOL matches = FALSE; + CERT_ALT_NAME_INFO *subjectName; + DWORD size; + + TRACE_(chain)("%s\n", debugstr_w(server_name)); + /* FIXME: This can be spoofed by the embedded NULL vulnerability. The + * returned CERT_ALT_NAME_INFO doesn't have a way to indicate the + * encoded length of a name, so a certificate issued to + * winehq.org\0badsite.com will get treated as having been issued to + * winehq.org. + */ + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, + ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &subjectName, &size)) + { + DWORD i; + BOOL found = FALSE; + + for (i = 0; !found && i < subjectName->cAltEntry; i++) + { + if (subjectName->rgAltEntry[i].dwAltNameChoice == + CERT_ALT_NAME_DNS_NAME) + { + TRACE_(chain)("dNSName: %s\n", debugstr_w( + subjectName->rgAltEntry[i].u.pwszDNSName)); + found = TRUE; + if (!strcmpiW(server_name, + subjectName->rgAltEntry[i].u.pwszDNSName)) + matches = TRUE; + } + } + LocalFree(subjectName); + } + return matches; +} + +static BOOL find_matching_domain_component(CERT_NAME_INFO *name, + LPCWSTR component) +{ + BOOL matches = FALSE; + DWORD i, j; + + for (i = 0; !matches && i < name->cRDN; i++) + for (j = 0; j < name->rgRDN[i].cRDNAttr; j++) + if (!strcmp(szOID_DOMAIN_COMPONENT, + name->rgRDN[i].rgRDNAttr[j].pszObjId)) + { + PCERT_RDN_ATTR attr; + + attr = &name->rgRDN[i].rgRDNAttr[j]; + /* Compare with memicmpW rather than strcmpiW in order to avoid + * a match with a string with an embedded NULL. The component + * must match one domain component attribute's entire string + * value with a case-insensitive match. + */ + matches = !memicmpW(component, (LPWSTR)attr->Value.pbData, + attr->Value.cbData / sizeof(WCHAR)); + } + return matches; +} + +static BOOL match_dns_to_subject_dn(PCCERT_CONTEXT cert, LPCWSTR server_name) +{ + BOOL matches = FALSE; + CERT_NAME_INFO *name; + DWORD size; + + TRACE_(chain)("%s\n", debugstr_w(server_name)); + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_UNICODE_NAME, + cert->pCertInfo->Subject.pbData, cert->pCertInfo->Subject.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &name, &size)) + { + /* If the subject distinguished name contains any name components, + * make sure all of them are present. + */ + if (CertFindRDNAttr(szOID_DOMAIN_COMPONENT, name)) + { + LPCWSTR ptr = server_name; + + matches = TRUE; + do { + LPCWSTR dot = strchrW(ptr, '.'), end; + /* 254 is the maximum DNS label length, see RFC 1035 */ + WCHAR component[255]; + DWORD len; + + end = dot ? dot : ptr + strlenW(ptr); + len = end - ptr; + if (len >= sizeof(component) / sizeof(component[0])) + { + WARN_(chain)("domain component %s too long\n", + debugstr_wn(ptr, len)); + matches = FALSE; + } + else + { + memcpy(component, ptr, len * sizeof(WCHAR)); + component[len] = 0; + matches = find_matching_domain_component(name, component); + } + ptr = dot ? dot + 1 : end; + } while (matches && ptr && *ptr); + } + else + { + PCERT_RDN_ATTR attr; + + /* If the certificate isn't using a DN attribute in the name, make + * make sure the common name matches. Again, use memicmpW rather + * than strcmpiW in order to avoid being fooled by an embedded NULL. + */ + if ((attr = CertFindRDNAttr(szOID_COMMON_NAME, name))) + { + TRACE_(chain)("CN = %s\n", debugstr_w( + (LPWSTR)attr->Value.pbData)); + matches = !memicmpW(server_name, (LPWSTR)attr->Value.pbData, + attr->Value.cbData / sizeof(WCHAR)); + } + } + LocalFree(name); + } + return matches; +} + +static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, + PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, + PCERT_CHAIN_POLICY_STATUS pPolicyStatus) +{ + pPolicyStatus->lChainIndex = pPolicyStatus->lElementIndex = -1; + if (pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_NOT_SIGNATURE_VALID) + { + pPolicyStatus->dwError = TRUST_E_CERT_SIGNATURE; + find_element_with_error(pChainContext, + CERT_TRUST_IS_NOT_SIGNATURE_VALID, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } + else if (pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_UNTRUSTED_ROOT) + { + pPolicyStatus->dwError = CERT_E_UNTRUSTEDROOT; + find_element_with_error(pChainContext, + CERT_TRUST_IS_UNTRUSTED_ROOT, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } + else if (pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_CYCLIC) + { + pPolicyStatus->dwError = CERT_E_UNTRUSTEDROOT; + find_element_with_error(pChainContext, + CERT_TRUST_IS_CYCLIC, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + /* For a cyclic chain, which element is a cycle isn't meaningful */ + pPolicyStatus->lElementIndex = -1; + } + else if (pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_NOT_TIME_VALID) + { + pPolicyStatus->dwError = CERT_E_EXPIRED; + find_element_with_error(pChainContext, + CERT_TRUST_IS_NOT_TIME_VALID, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } + else + pPolicyStatus->dwError = NO_ERROR; + /* We only need bother checking whether the name in the end certificate + * matches if the chain is otherwise okay. + */ + if (!pPolicyStatus->dwError && pPolicyPara && + pPolicyPara->cbSize >= sizeof(CERT_CHAIN_POLICY_PARA)) + { + HTTPSPolicyCallbackData *sslPara = pPolicyPara->pvExtraPolicyPara; + + if (sslPara && sslPara->u.cbSize >= sizeof(HTTPSPolicyCallbackData)) + { + if (sslPara->dwAuthType == AUTHTYPE_SERVER && + sslPara->pwszServerName) + { + PCCERT_CONTEXT cert; + PCERT_EXTENSION altNameExt; + BOOL matches; + + cert = pChainContext->rgpChain[0]->rgpElement[0]->pCertContext; + altNameExt = get_subject_alt_name_ext(cert); + /* If the alternate name extension exists, the name it contains + * is bound to the certificate, so make sure the name matches + * it. Otherwise, look for the server name in the subject + * distinguished name. RFC5280, section 4.2.1.6: + * "Whenever such identities are to be bound into a + * certificate, the subject alternative name (or issuer + * alternative name) extension MUST be used; however, a DNS + * name MAY also be represented in the subject field using the + * domainComponent attribute." + */ + if (altNameExt) + matches = match_dns_to_subject_alt_name(altNameExt, + sslPara->pwszServerName); + else + matches = match_dns_to_subject_dn(cert, + sslPara->pwszServerName); + if (!matches) + { + pPolicyStatus->dwError = CERT_E_CN_NO_MATCH; + pPolicyStatus->lChainIndex = 0; + pPolicyStatus->lElementIndex = 0; + } + } + } + } + return TRUE; +} + static BYTE msPubKey1[] = { 0x30,0x82,0x01,0x0a,0x02,0x82,0x01,0x01,0x00,0xdf,0x08,0xba,0xe3,0x3f,0x6e, 0x64,0x9b,0xf5,0x89,0xaf,0x28,0x96,0x4a,0x07,0x8f,0x1b,0x2e,0x8b,0x3e,0x1d, @@ -2257,6 +2485,9 @@ BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID, case LOWORD(CERT_CHAIN_POLICY_AUTHENTICODE): verifyPolicy = verify_authenticode_policy; break; + case LOWORD(CERT_CHAIN_POLICY_SSL): + verifyPolicy = verify_ssl_policy; + break; case LOWORD(CERT_CHAIN_POLICY_BASIC_CONSTRAINTS): verifyPolicy = verify_basic_constraints_policy; break;

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
121
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009