November 2009 - Wine-commits

Damjan Jovanovic : winemenubuilder: Escape XML special characters in MIME types.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: e1e07b40ba31dc3296652799157c2e802e76a503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e07b40ba31dc32966527991… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Nov 12 21:42:19 2009 +0200 winemenubuilder: Escape XML special characters in MIME types. --- programs/winemenubuilder/winemenubuilder.c | 34 +++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index fb13878..7bcdd44 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -730,6 +730,26 @@ static char* heap_printf(const char *format, ...) return ret; } +static void write_xml_text(FILE *file, const char *text) +{ + int i; + for (i = 0; text[i]; i++) + { + if (text[i] == '&') + fputs("&", file); + else if (text[i] == '<') + fputs("<", file); + else if (text[i] == '>') + fputs(">", file); + else if (text[i] == '\'') + fputs("'", file); + else if (text[i] == '"') + fputs(""", file); + else + fputc(text[i], file); + } +} + static BOOL create_directories(char *directory) { BOOL ret = TRUE; @@ -1805,10 +1825,18 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch { fprintf(packageFile, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); fprintf(packageFile, "<mime-info xmlns=\"http://www.freedesktop.org/standards/shared-mime-info\">\n"); - fprintf(packageFile, " <mime-type type=\"%s\">\n", mime_type); - fprintf(packageFile, " <glob pattern=\"*%s\"/>\n", dot_extension); + fprintf(packageFile, " <mime-type type=\""); + write_xml_text(packageFile, mime_type); + fprintf(packageFile, "\">\n"); + fprintf(packageFile, " <glob pattern=\"*"); + write_xml_text(packageFile, dot_extension); + fprintf(packageFile, "\"/>\n"); if (comment) - fprintf(packageFile, " <comment>%s</comment>\n", comment); + { + fprintf(packageFile, " <comment>"); + write_xml_text(packageFile, comment); + fprintf(packageFile, "</comment>\n"); + } fprintf(packageFile, " </mime-type>\n"); fprintf(packageFile, "</mime-info>\n"); ret = TRUE;

1 0

Paul Vriens : comctl32/tests: Remove unused parameter.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 54a01bf5bc5de5a834e88d8492af2706952dc5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a01bf5bc5de5a834e88d849… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 13 11:00:56 2009 +0100 comctl32/tests: Remove unused parameter. --- dlls/comctl32/tests/imagelist.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index dd02c33..d67252a 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -78,7 +78,6 @@ static HRESULT (WINAPI *pImageList_CoCreateInstance)(REFCLSID,const IUnknown *, REFIID,void **); static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); -static HDC desktopDC; static HINSTANCE hinst; /* These macros build cursor/bitmap data in 4x4 pixel blocks */ @@ -1290,7 +1289,6 @@ START_TEST(imagelist) pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); - desktopDC=GetDC(NULL); hinst = GetModuleHandleA(NULL); InitCommonControls();

1 0

Hans Leidekker : msi: Handle environment strings without a value.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: e52531ab1dae0e1edeb5787b545693ae5db0fd23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52531ab1dae0e1edeb5787b5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 13 11:06:12 2009 +0100 msi: Handle environment strings without a value. --- dlls/msi/action.c | 39 +++++++++++++++++++++++---------------- dlls/msi/tests/install.c | 10 +++++++++- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a6af7cc..3a11c61 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4888,7 +4888,6 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) static LONG env_set_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) { LPCWSTR cptr = *name; - LPCWSTR ptr = *value; static const WCHAR prefix[] = {'[','~',']',0}; static const int prefix_len = 3; @@ -4919,18 +4918,22 @@ static LONG env_set_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) return ERROR_FUNCTION_FAILED; } - if (!strncmpW(ptr, prefix, prefix_len)) + if (*value) { - *flags |= ENV_MOD_APPEND; - *value += lstrlenW(prefix); - } - else if (lstrlenW(*value) >= prefix_len) - { - ptr += lstrlenW(ptr) - prefix_len; - if (!lstrcmpW(ptr, prefix)) + LPCWSTR ptr = *value; + if (!strncmpW(ptr, prefix, prefix_len)) { - *flags |= ENV_MOD_PREFIX; - /* the "[~]" will be removed by deformat_string */; + *flags |= ENV_MOD_APPEND; + *value += lstrlenW(prefix); + } + else if (lstrlenW(*value) >= prefix_len) + { + ptr += lstrlenW(ptr) - prefix_len; + if (!lstrcmpW(ptr, prefix)) + { + *flags |= ENV_MOD_PREFIX; + /* the "[~]" will be removed by deformat_string */; + } } } @@ -4978,8 +4981,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) if (res != ERROR_SUCCESS) goto done; - deformat_string(package, value, &deformatted); - if (!deformatted) + if (value && !deformat_string(package, value, &deformatted)) { res = ERROR_OUTOFMEMORY; goto done; @@ -5066,7 +5068,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) } } } - else + else if (value) { size = (lstrlenW(value) + 1) * sizeof(WCHAR); newval = msi_alloc(size); @@ -5079,8 +5081,13 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) lstrcpyW(newval, value); } - TRACE("setting %s to %s\n", debugstr_w(name), debugstr_w(newval)); - res = RegSetValueExW(env, name, 0, type, (LPVOID)newval, size); + if (newval) + { + TRACE("setting %s to %s\n", debugstr_w(name), debugstr_w(newval)); + res = RegSetValueExW(env, name, 0, type, (LPVOID)newval, size); + } + else + res = ERROR_SUCCESS; done: if (env) RegCloseKey(env); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 6efd290..35bbc85 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -174,7 +174,9 @@ static const CHAR environment_dat[] = "Environment\tName\tValue\tComponent_\n" "Var1\t=-MSITESTVAR1\t1\tOne\n" "Var2\tMSITESTVAR2\t1\tOne\n" "Var3\t=-MSITESTVAR3\t1\tOne\n" - "Var4\tMSITESTVAR4\t1\tOne\n"; + "Var4\tMSITESTVAR4\t1\tOne\n" + "Var5\t-MSITESTVAR5\t\tOne\n" + "Var6\tMSITESTVAR6\t\tOne\n"; static const CHAR condition_dat[] = "Feature_\tLevel\tCondition\n" "s38\ti2\tS255\n" @@ -6610,6 +6612,12 @@ static void test_envvar(void) res = RegDeleteValueA(env, "MSITESTVAR4"); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegDeleteValueA(env, "MSITESTVAR5"); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + res = RegDeleteValueA(env, "MSITESTVAR6"); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + RegCloseKey(env); delete_pf("msitest\\cabout\\new\\five.txt", TRUE);

1 0

Juan Lang : crypt32: Add tests for cs.stanford.edu's chain.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 95a14deff997c7b3b19bb71ebbb69a187dc8c4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a14deff997c7b3b19bb71eb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 12 10:47:04 2009 -0800 crypt32: Add tests for cs.stanford.edu's chain. --- dlls/crypt32/tests/chain.c | 312 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 312 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95a14deff997c7b3b19bb…

1 0

Juan Lang : crypt32: Accept any matching dNSName in a subject alternate name.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 21ecc84620aa37fa005048a1b52a0890bb6e7fdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=21ecc84620aa37fa005048a1b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 12 12:26:05 2009 -0800 crypt32: Accept any matching dNSName in a subject alternate name. --- dlls/crypt32/chain.c | 11 ++++++++--- dlls/crypt32/tests/chain.c | 7 +------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 805447d..eb6d757 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2373,16 +2373,21 @@ static BOOL match_dns_to_subject_alt_name(PCERT_EXTENSION ext, &subjectName, &size)) { DWORD i; - BOOL found = FALSE; - for (i = 0; !found && i < subjectName->cAltEntry; i++) + /* RFC 5280 states that multiple instances of each name type may exist, + * in section 4.2.1.6: + * "Multiple name forms, and multiple instances of each name form, + * MAY be included." + * It doesn't specify the behavior in such cases, but common usage is + * to accept a certificate if any name matches. + */ + for (i = 0; !matches && 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; diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 323f062..1da1993 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3688,11 +3688,6 @@ static const ChainPolicyCheck stanfordPolicyCheckWithMatchingName = { { 0, 0, -1, -1, NULL}, NULL, 0 }; -static const ChainPolicyCheck stanfordPolicyCheckWithMatchingNameTodo = { - { sizeof(stanfordChain) / sizeof(stanfordChain[0]), stanfordChain }, - { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR -}; - static const ChainPolicyCheck stanfordPolicyCheckWithoutMatchingName = { { sizeof(stanfordChain) / sizeof(stanfordChain[0]), stanfordChain }, { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 @@ -4022,7 +4017,7 @@ static void check_ssl_policy(void) /* With "www.cs.stanford.edu": match */ sslPolicyPara.pwszServerName = www_dot_cs_dot_stanford_dot_edu; checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, - &stanfordPolicyCheckWithMatchingNameTodo, 0, &oct2009, &policyPara); + &stanfordPolicyCheckWithMatchingName, 0, &oct2009, &policyPara); /* With "a.cs.stanford.edu": no match */ sslPolicyPara.pwszServerName = a_dot_cs_dot_stanford_dot_edu; checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL,

1 0

Juan Lang : crypt32: Fix test failures.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 9aee8fd556ff8b32fe93970dd856ac780d8df4cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aee8fd556ff8b32fe93970dd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 12 12:48:05 2009 -0800 crypt32: Fix test failures. --- dlls/crypt32/tests/chain.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 1da1993..be3a0bd 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3032,7 +3032,8 @@ static const SimpleChainStatusCheck simpleStatus27[] = { static const CERT_TRUST_STATUS elementStatus27Broken[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, - CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER | + CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, }; static const SimpleChainStatusCheck simpleStatus27Broken[] = { { sizeof(elementStatus27Broken) / sizeof(elementStatus27Broken[0]), @@ -3405,7 +3406,7 @@ static ChainCheck chainCheckEmbeddedNullBroken = { { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, 1, simpleStatus27Broken }, 0 };

1 0

Rico Schüller : user32: Add argument check for PTITLEBARINFO in GetTitleBarInfo().
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: a679b4e3af0538d918968572f5e6f7a6b09e6956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a679b4e3af0538d918968572f… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Nov 12 21:50:01 2009 +0100 user32: Add argument check for PTITLEBARINFO in GetTitleBarInfo(). --- dlls/user32/nonclient.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index ccea517..e38e454 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1630,6 +1630,11 @@ BOOL WINAPI GetTitleBarInfo(HWND hwnd, PTITLEBARINFO tbi) { TRACE("(%p %p)\n", hwnd, tbi); + if(!tbi) { + SetLastError(ERROR_NOACCESS); + return FALSE; + } + if(tbi->cbSize != sizeof(TITLEBARINFO)) { TRACE("Invalid TITLEBARINFO size: %d\n", tbi->cbSize); SetLastError(ERROR_INVALID_PARAMETER);

1 0

Juan Lang : crypt32: Test matching a certificate with a wildcard in its name.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: e7406726477e0dc1403554a03a40e7763e686a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7406726477e0dc1403554a03… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 11 16:28:23 2009 -0800 crypt32: Test matching a certificate with a wildcard in its name. --- dlls/crypt32/tests/chain.c | 49 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 0f04604..8092c8c 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3371,12 +3371,12 @@ static const ChainPolicyCheck sslPolicyCheck[] = { { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, NULL, 0 }, }; -static const ChainPolicyCheck sslPolicyCheckWithMatchingNameExpired = { +static const ChainPolicyCheck googlePolicyCheckWithMatchingNameExpired = { { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, { 0, CERT_E_EXPIRED, 0, 0, NULL}, NULL, 0 }; -static const ChainPolicyCheck sslPolicyCheckWithMatchingName = { +static const ChainPolicyCheck googlePolicyCheckWithMatchingName = { { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, { 0, 0, -1, -1, NULL}, NULL, 0 }; @@ -3385,11 +3385,22 @@ static const ChainPolicyCheck sslPolicyCheckWithMatchingName = { static const CERT_CHAIN_POLICY_STATUS noMatchingNameBrokenStatus = { 0, CERT_E_ROLE, 0, 0, NULL }; -static const ChainPolicyCheck sslPolicyCheckWithoutMatchingName = { +static const ChainPolicyCheck iTunesPolicyCheckWithoutMatchingName = { { sizeof(iTunesChain) / sizeof(iTunesChain[0]), iTunesChain }, { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, &noMatchingNameBrokenStatus, 0 }; +static const ChainPolicyCheck opensslPolicyCheckWithMatchingName = { + { sizeof(opensslChain) / sizeof(opensslChain[0]), opensslChain }, + { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR +}; + +static const ChainPolicyCheck opensslPolicyCheckWithoutMatchingName = { + { sizeof(opensslChain) / sizeof(opensslChain[0]), opensslChain }, + { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 +}; + + static const ChainPolicyCheck authenticodePolicyCheck[] = { { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, @@ -3595,6 +3606,13 @@ static void check_ssl_policy(void) WCHAR winehq[] = { 'w','i','n','e','h','q','.','o','r','g',0 }; WCHAR google_dot_com[] = { 'w','w','w','.','g','o','o','g','l','e','.', 'c','o','m',0 }; + WCHAR a_dot_openssl_dot_org[] = { 'a','.','o','p','e','n','s','s','l','.', + 'o','r','g',0 }; + WCHAR openssl_dot_org[] = { 'o','p','e','n','s','s','l','.','o','r','g',0 }; + WCHAR fopenssl_dot_org[] = { 'f','o','p','e','n','s','s','l','.', + 'o','r','g',0 }; + WCHAR a_dot_b_dot_openssl_dot_org[] = { 'a','.','b','.', + 'o','p','e','n','s','s','l','.','o','r','g',0 }; /* Check ssl policy with no parameter */ for (i = 0; @@ -3663,15 +3681,34 @@ static void check_ssl_policy(void) * extension. */ checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, - &sslPolicyCheckWithoutMatchingName, 0, &oct2007, &policyPara); + &iTunesPolicyCheckWithoutMatchingName, 0, &oct2007, &policyPara); /* And again, but checking the Google chain at a bad date */ sslPolicyPara.pwszServerName = google_dot_com; checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, - &sslPolicyCheckWithMatchingNameExpired, 0, &oct2007, &policyPara); + &googlePolicyCheckWithMatchingNameExpired, 0, &oct2007, &policyPara); /* And again, but checking the Google chain at a good date */ sslPolicyPara.pwszServerName = google_dot_com; checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, - &sslPolicyCheckWithMatchingName, 0, &oct2009, &policyPara); + &googlePolicyCheckWithMatchingName, 0, &oct2009, &policyPara); + /* Check again with the openssl cert, which has a wildcard in its name, + * with various combinations of matching and non-matching names. + * With "a.openssl.org": match + */ + sslPolicyPara.pwszServerName = a_dot_openssl_dot_org; + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + &opensslPolicyCheckWithMatchingName, 0, &oct2009, &policyPara); + /* With "openssl.org": no match */ + sslPolicyPara.pwszServerName = openssl_dot_org; + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + &opensslPolicyCheckWithoutMatchingName, 0, &oct2009, &policyPara); + /* With "fopenssl.org": no match */ + sslPolicyPara.pwszServerName = fopenssl_dot_org; + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + &opensslPolicyCheckWithoutMatchingName, 0, &oct2009, &policyPara); + /* with "a.b.openssl.org": no match */ + sslPolicyPara.pwszServerName = a_dot_b_dot_openssl_dot_org; + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + &opensslPolicyCheckWithoutMatchingName, 0, &oct2009, &policyPara); } static void testVerifyCertChainPolicy(void)

1 0

Juan Lang : crypt32: Implement matching a certificate with a wildcard in its name.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: b91d0c8bde9e27ea9c647c6ba9913487d60b3d2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91d0c8bde9e27ea9c647c6ba… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 11 17:45:49 2009 -0800 crypt32: Implement matching a certificate with a wildcard in its name. --- dlls/crypt32/chain.c | 138 +++++++++++++++++++++++++++++++++++++++++--- dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 131 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 54bff75..805447d 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2418,6 +2418,134 @@ static BOOL find_matching_domain_component(CERT_NAME_INFO *name, return matches; } +static BOOL match_domain_component(LPCWSTR allowed_component, DWORD allowed_len, + LPCWSTR server_component, DWORD server_len, BOOL allow_wildcards, + BOOL *see_wildcard) +{ + LPCWSTR allowed_ptr, server_ptr; + BOOL matches = TRUE; + + *see_wildcard = FALSE; + if (server_len < allowed_len) + { + WARN_(chain)("domain component %s too short for %s\n", + debugstr_wn(server_component, server_len), + debugstr_wn(allowed_component, allowed_len)); + /* A domain component can't contain a wildcard character, so a domain + * component shorter than the allowed string can't produce a match. + */ + return FALSE; + } + for (allowed_ptr = allowed_component, server_ptr = server_component; + matches && allowed_ptr - allowed_component < allowed_len; + allowed_ptr++, server_ptr++) + { + if (*allowed_ptr == '*') + { + if (allowed_ptr - allowed_component < allowed_len - 1) + { + WARN_(chain)("non-wildcard characters after wildcard not supported\n"); + matches = FALSE; + } + else if (!allow_wildcards) + { + WARN_(chain)("wildcard after non-wildcard component\n"); + matches = FALSE; + } + else + { + /* the preceding characters must have matched, so the rest of + * the component also matches. + */ + *see_wildcard = TRUE; + break; + } + } + matches = tolowerW(*allowed_ptr) == tolowerW(*server_ptr); + } + if (matches && server_ptr - server_component < server_len) + { + /* If there are unmatched characters in the server domain component, + * the server domain only matches if the allowed string ended in a '*'. + */ + matches = *allowed_ptr == '*'; + } + return matches; +} + +static BOOL match_common_name(LPCWSTR server_name, PCERT_RDN_ATTR nameAttr) +{ + LPCWSTR allowed = (LPCWSTR)nameAttr->Value.pbData; + LPCWSTR allowed_component = allowed; + DWORD allowed_len = nameAttr->Value.cbData / sizeof(WCHAR); + LPCWSTR server_component = server_name; + DWORD server_len = strlenW(server_name); + BOOL matches = TRUE, allow_wildcards = TRUE; + + TRACE_(chain)("CN = %s\n", debugstr_wn(allowed_component, allowed_len)); + + /* From RFC 2818 (HTTP over TLS), section 3.1: + * "Names may contain the wildcard character * which is considered to match + * any single domain name component or component fragment. E.g., + * *.a.com matches foo.a.com but not bar.foo.a.com. f*.com matches foo.com + * but not bar.com." + * + * And from RFC 2595 (Using TLS with IMAP, POP3 and ACAP), section 2.4: + * "A "*" wildcard character MAY be used as the left-most name component in + * the certificate. For example, *.example.com would match a.example.com, + * foo.example.com, etc. but would not match example.com." + * + * There are other protocols which use TLS, and none of them is + * authoritative. This accepts certificates in common usage, e.g. + * *.domain.com matches www.domain.com but not domain.com, and + * www*.domain.com matches www1.domain.com but not mail.domain.com. + */ + do { + LPCWSTR allowed_dot, server_dot; + + allowed_dot = memchrW(allowed_component, '.', + allowed_len - (allowed_component - allowed)); + server_dot = memchrW(server_component, '.', + server_len - (server_component - server_name)); + /* The number of components must match */ + if ((!allowed_dot && server_dot) || (allowed_dot && !server_dot)) + { + if (!allowed_dot) + WARN_(chain)("%s: too many components for CN=%s\n", + debugstr_w(server_name), debugstr_wn(allowed, allowed_len)); + else + WARN_(chain)("%s: not enough components for CN=%s\n", + debugstr_w(server_name), debugstr_wn(allowed, allowed_len)); + matches = FALSE; + } + else + { + LPCWSTR allowed_end, server_end; + BOOL has_wildcard; + + allowed_end = allowed_dot ? allowed_dot : allowed + allowed_len; + server_end = server_dot ? server_dot : server_name + server_len; + matches = match_domain_component(allowed_component, + allowed_end - allowed_component, server_component, + server_end - server_component, allow_wildcards, &has_wildcard); + /* Once a non-wildcard component is seen, no wildcard components + * may follow + */ + if (!has_wildcard) + allow_wildcards = FALSE; + if (matches) + { + allowed_component = allowed_dot ? allowed_dot + 1 : allowed_end; + server_component = server_dot ? server_dot + 1 : server_end; + } + } + } while (matches && allowed_component && + allowed_component - allowed < allowed_len && + server_component && server_component - server_name < server_len); + TRACE_(chain)("returning %d\n", matches); + return matches; +} + static BOOL match_dns_to_subject_dn(PCCERT_CONTEXT cert, LPCWSTR server_name) { BOOL matches = FALSE; @@ -2466,16 +2594,10 @@ static BOOL match_dns_to_subject_dn(PCCERT_CONTEXT cert, LPCWSTR server_name) 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. + * make sure the common name matches. */ 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)); - } + matches = match_common_name(server_name, attr); } LocalFree(name); } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 8092c8c..57fe2b0 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3392,7 +3392,7 @@ static const ChainPolicyCheck iTunesPolicyCheckWithoutMatchingName = { static const ChainPolicyCheck opensslPolicyCheckWithMatchingName = { { sizeof(opensslChain) / sizeof(opensslChain[0]), opensslChain }, - { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR + { 0, 0, -1, -1, NULL}, NULL, 0 }; static const ChainPolicyCheck opensslPolicyCheckWithoutMatchingName = {

1 0

Juan Lang : crypt32: Use broken() to mark an expected result from a broken version of crypt32.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: d311cc9bdb71b21d339336668b11825fd6723ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d311cc9bdb71b21d339336668… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 12 10:35:12 2009 -0800 crypt32: Use broken() to mark an expected result from a broken version of crypt32. --- dlls/crypt32/tests/chain.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 57fe2b0..b9ffec9 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3230,6 +3230,12 @@ static void testGetCertChain(void) chainCheckEmbeddedNull.todo, 0); if (chain) { + ok(chain->TrustStatus.dwErrorStatus == + chainCheckEmbeddedNull.status.status.dwErrorStatus || + broken(chain->TrustStatus.dwErrorStatus == + chainCheckEmbeddedNullBroken.status.status.dwErrorStatus), + "unexpected chain error status %08x\n", + chain->TrustStatus.dwErrorStatus); if (chainCheckEmbeddedNull.status.status.dwErrorStatus == chain->TrustStatus.dwErrorStatus) checkChainStatus(chain, &chainCheckEmbeddedNull.status,

1 0