October 2009 - Wine-commits

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

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

Alexandre Julliard : kernel32/tests: Add some tests for width and precision formatting in FormatMessage.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 549116bd68a806d924a6d08811be9badf8e123d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=549116bd68a806d924a6d0881… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 13:06:12 2009 +0100 kernel32/tests: Add some tests for width and precision formatting in FormatMessage. --- dlls/kernel32/format_msg.c | 5 +- dlls/kernel32/tests/format_msg.c | 86 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index e8f9fbc..7145479 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -493,10 +493,9 @@ DWORD WINAPI FormatMessageW( /* possible invalid pointers */ xarr[1]=*(argliststart+1); xarr[2]=*(argliststart+2); - sprintfbuf=HeapAlloc(GetProcessHeap(),0,(strlenW((LPWSTR)argliststart[0])*2+1)*sizeof(WCHAR)); - + sprintfbuf = HeapAlloc(GetProcessHeap(), 0, 1000); /* CMF - This makes a BIG assumption about va_list */ - vsprintfW(sprintfbuf, fmtstr, (va_list) xarr); + vsnprintfW(sprintfbuf, 1000, fmtstr, (va_list) xarr); } else if (strcmpW(fmtstr, fmt_wc) == 0) { sprintfbuf = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * 2); diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 7019321..09a0a4a 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -87,6 +87,14 @@ static void test_message_from_string_wide(void) static const WCHAR fmt_hi_crlf[] = {'h','i','\r','\n',0}; static const WCHAR fmt_cr[] = {'\r',0}; static const WCHAR fmt_crcrlf[] = {'\r','\r','\n',0}; + static const WCHAR fmt_13s[] = {'%','1','!','3','s','!',0}; + static const WCHAR fmt_1os[] = {'%','1','!','*','s','!',0}; + static const WCHAR fmt_142u[] = {'%','1','!','4','.','2','u','!',0}; + static const WCHAR fmt_1oou[] = {'%','1','!','*','.','*','u','!',0}; + static const WCHAR fmt_1oou1oou[] = {'%','1','!','*','.','*','u','!',',','%','1','!','*','.','*','u','!',0}; + static const WCHAR fmt_1oou3oou[] = {'%','1','!','*','.','*','u','!',',','%','3','!','*','.','*','u','!',0}; + static const WCHAR fmt_1oou4oou[] = {'%','1','!','*','.','*','u','!',',','%','4','!','*','.','*','u','!',0}; + static const WCHAR s_123d[] = {'1','2','3',0}; static const WCHAR s_14d[] = {' ',' ',' ','1',0}; static const WCHAR s_14x[] = {' ',' ',' ','b',0}; @@ -105,6 +113,14 @@ static void test_message_from_string_wide(void) static const WCHAR s_hi_sp[] = {'h','i',' ',0}; static const WCHAR s_sp[] = {' ',0}; static const WCHAR s_2sp[] = {' ',' ',0}; + static const WCHAR s_spt[] = {' ',' ','t',0}; + static const WCHAR s_sp3t[] = {' ',' ',' ','t',0}; + static const WCHAR s_sp03[] = {' ',' ','0','3',0}; + static const WCHAR s_sp001[] = {' ',' ','0','0','1',0}; + static const WCHAR s_sp001002[] = {' ',' ','0','0','1',',',' ','0','0','0','2',0}; + static const WCHAR s_sp001sp002[] = {' ',' ','0','0','1',',',' ',' ','0','0','0','2',0}; + static const WCHAR s_sp002sp001[] = {' ',' ','0','0','0','2',',',' ',' ','0','0','1',0}; + WCHAR out[0x100] = {0}; DWORD r, error; @@ -296,6 +312,41 @@ static void test_message_from_string_wide(void) ok(!lstrcmpW(s_crlfcrlf, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); + /* precision and width */ + + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_13s, + 0, 0, out, sizeof(out)/sizeof(WCHAR), t ); + ok(!lstrcmpW(s_spt, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==3, "failed: r=%d\n",r); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1os, + 0, 0, out, sizeof(out)/sizeof(WCHAR), 4, t ); + ok(!lstrcmpW( s_sp3t, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==4,"failed: r=%d\n",r); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_142u, + 0, 0, out, sizeof(out)/sizeof(WCHAR), 3 ); + ok(!lstrcmpW( s_sp03, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==4,"failed: r=%d\n",r); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1oou, + 0, 0, out, sizeof(out)/sizeof(WCHAR), 5, 3, 1 ); + ok(!lstrcmpW( s_sp001, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==5,"failed: r=%d\n",r); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1oou1oou, + 0, 0, out, sizeof(out)/sizeof(WCHAR), 5, 3, 1, 4, 2 ); + todo_wine ok(!lstrcmpW( s_sp001002, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==11,"failed: r=%d\n",r); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1oou3oou, + 0, 0, out, sizeof(out)/sizeof(WCHAR), 5, 3, 1, 6, 4, 2 ); + todo_wine ok(!lstrcmpW( s_sp001sp002, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==12,"failed: r=%d\n",r); + /* args are not counted the same way with an argument array */ + { + ULONG_PTR args[] = { 6, 4, 2, 5, 3, 1 }; + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, fmt_1oou4oou, + 0, 0, out, sizeof(out)/sizeof(WCHAR), (va_list *)args ); + ok(!lstrcmpW(s_sp002sp001, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==12,"failed: r=%d\n",r); + } + /* change of pace... test the low byte of dwflags */ /* line feed */ @@ -509,6 +560,41 @@ static void test_message_from_string(void) ok(!strcmp("\r\n\r\n", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); + /* precision and width */ + + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!3s!", + 0, 0, out, sizeof(out), "t" ); + ok(!strcmp(" t", out),"failed out=[%s]\n",out); + ok(r==3, "failed: r=%d\n",r); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!*s!", + 0, 0, out, sizeof(out), 4, "t"); + ok(!strcmp( " t", out),"failed out=[%s]\n",out); + ok(r==4,"failed: r=%d\n",r); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4.2u!", + 0, 0, out, sizeof(out), 3 ); + ok(!strcmp( " 03", out),"failed out=[%s]\n",out); + ok(r==4,"failed: r=%d\n",r); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!*.*u!", + 0, 0, out, sizeof(out), 5, 3, 1 ); + ok(!strcmp( " 001", out),"failed out=[%s]\n",out); + ok(r==5,"failed: r=%d\n",r); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!*.*u!,%1!*.*u!", + 0, 0, out, sizeof(out), 5, 3, 1, 4, 2 ); + todo_wine ok(!strcmp( " 001, 0002", out),"failed out=[%s]\n",out); + ok(r==11,"failed: r=%d\n",r); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!*.*u!,%3!*.*u!", + 0, 0, out, sizeof(out), 5, 3, 1, 6, 4, 2 ); + todo_wine ok(!strcmp( " 001, 0002", out),"failed out=[%s]\n",out); + ok(r==12,"failed: r=%d\n",r); + /* args are not counted the same way with an argument array */ + { + ULONG_PTR args[] = { 6, 4, 2, 5, 3, 1 }; + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, + "%1!*.*u!,%4!*.*u!", 0, 0, out, sizeof(out), (va_list *)args ); + ok(!strcmp(" 0002, 001", out),"failed out=[%s]\n",out); + ok(r==12,"failed: r=%d\n",r); + } + /* change of pace... test the low byte of dwflags */ /* line feed */

1 0

Juan Lang : crypt32: Trace enhanced key usage extension.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 994d7ed40d69871bd7e2ad3d827138ccbf7497ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=994d7ed40d69871bd7e2ad3d8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 23 10:59:30 2009 -0700 crypt32: Trace enhanced key usage extension. --- dlls/crypt32/chain.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index ccb3dc7..c4250dc 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -782,6 +782,24 @@ static void dump_key_usage(const CERT_EXTENSION *ext) } } +static void dump_enhanced_key_usage(const CERT_EXTENSION *ext) +{ + CERT_ENHKEY_USAGE *usage; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ENHANCED_KEY_USAGE, + ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, + &usage, &size)) + { + DWORD i; + + TRACE_(chain)("%d usages:\n", usage->cUsageIdentifier); + for (i = 0; i < usage->cUsageIdentifier; i++) + TRACE_(chain)("%s\n", usage->rgpszUsageIdentifier[i]); + LocalFree(usage); + } +} + static void dump_extension(const CERT_EXTENSION *ext) { TRACE_(chain)("%s (%scritical)\n", debugstr_a(ext->pszObjId), @@ -792,6 +810,8 @@ static void dump_extension(const CERT_EXTENSION *ext) dump_key_usage(ext); else if (!strcmp(ext->pszObjId, szOID_BASIC_CONSTRAINTS2)) dump_basic_constraints2(ext); + else if (!strcmp(ext->pszObjId, szOID_ENHANCED_KEY_USAGE)) + dump_enhanced_key_usage(ext); } static LPCWSTR filetime_to_str(const FILETIME *time)

1 0

Juan Lang : crypt32: Trace cert policies extension.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 777ea81c48c6260bddefa80276096729821a4a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=777ea81c48c6260bddefa8027… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 23 11:09:20 2009 -0700 crypt32: Trace cert policies extension. --- dlls/crypt32/chain.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c4250dc..0380687 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -782,6 +782,33 @@ static void dump_key_usage(const CERT_EXTENSION *ext) } } +static void dump_cert_policies(const CERT_EXTENSION *ext) +{ + CERT_POLICIES_INFO *policies; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT_POLICIES, + ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, + &policies, &size)) + { + DWORD i, j; + + TRACE_(chain)("%d policies:\n", policies->cPolicyInfo); + for (i = 0; i < policies->cPolicyInfo; i++) + { + TRACE_(chain)("policy identifier: %s\n", + debugstr_a(policies->rgPolicyInfo[i].pszPolicyIdentifier)); + TRACE_(chain)("%d policy qualifiers:\n", + policies->rgPolicyInfo[i].cPolicyQualifier); + for (j = 0; j < policies->rgPolicyInfo[i].cPolicyQualifier; j++) + TRACE_(chain)("%s\n", debugstr_a( + policies->rgPolicyInfo[i].rgPolicyQualifier[j]. + pszPolicyQualifierId)); + } + LocalFree(policies); + } +} + static void dump_enhanced_key_usage(const CERT_EXTENSION *ext) { CERT_ENHKEY_USAGE *usage; @@ -810,6 +837,8 @@ static void dump_extension(const CERT_EXTENSION *ext) dump_key_usage(ext); else if (!strcmp(ext->pszObjId, szOID_BASIC_CONSTRAINTS2)) dump_basic_constraints2(ext); + else if (!strcmp(ext->pszObjId, szOID_CERT_POLICIES)) + dump_cert_policies(ext); else if (!strcmp(ext->pszObjId, szOID_ENHANCED_KEY_USAGE)) dump_enhanced_key_usage(ext); }

1 0

Juan Lang : crypt32: Trace name constraints extension.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: bf42ce9c904c9551f89835630052983b8c09799c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf42ce9c904c9551f89835630… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 23 11:38:03 2009 -0700 crypt32: Trace name constraints extension. --- dlls/crypt32/chain.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 0380687..cbbd677 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -782,6 +782,73 @@ static void dump_key_usage(const CERT_EXTENSION *ext) } } +static void dump_alt_name_entry(const CERT_ALT_NAME_ENTRY *entry) +{ + switch (entry->dwAltNameChoice) + { + case CERT_ALT_NAME_OTHER_NAME: + TRACE_(chain)("CERT_ALT_NAME_OTHER_NAME, oid = %s\n", + debugstr_a(entry->u.pOtherName->pszObjId)); + break; + case CERT_ALT_NAME_RFC822_NAME: + TRACE_(chain)("CERT_ALT_NAME_RFC822_NAME: %s\n", + debugstr_w(entry->u.pwszRfc822Name)); + break; + case CERT_ALT_NAME_DNS_NAME: + TRACE_(chain)("CERT_ALT_NAME_DNS_NAME: %s\n", + debugstr_w(entry->u.pwszDNSName)); + break; + case CERT_ALT_NAME_DIRECTORY_NAME: + TRACE_(chain)("CERT_ALT_NAME_DIRECTORY_NAME: %d bytes\n", + entry->u.DirectoryName.cbData); + break; + case CERT_ALT_NAME_URL: + TRACE_(chain)("CERT_ALT_NAME_URL: %s\n", debugstr_w(entry->u.pwszURL)); + break; + case CERT_ALT_NAME_IP_ADDRESS: + TRACE_(chain)("CERT_ALT_NAME_IP_ADDRESS: %d bytes\n", + entry->u.IPAddress.cbData); + break; + case CERT_ALT_NAME_REGISTERED_ID: + TRACE_(chain)("CERT_ALT_NAME_REGISTERED_ID: %s\n", + debugstr_a(entry->u.pszRegisteredID)); + break; + default: + TRACE_(chain)("dwAltNameChoice = %d\n", entry->dwAltNameChoice); + } +} + +static void dump_general_subtree(const CERT_GENERAL_SUBTREE *subtree) +{ + dump_alt_name_entry(&subtree->Base); + TRACE_(chain)("dwMinimum = %d, fMaximum = %d, dwMaximum = %d\n", + subtree->dwMinimum, subtree->fMaximum, subtree->dwMaximum); +} + +static void dump_name_constraints(const CERT_EXTENSION *ext) +{ + CERT_NAME_CONSTRAINTS_INFO *nameConstraints; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_NAME_CONSTRAINTS, + ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, &nameConstraints, + &size)) + { + DWORD i; + + TRACE_(chain)("%d permitted subtrees:\n", + nameConstraints->cPermittedSubtree); + for (i = 0; i < nameConstraints->cPermittedSubtree; i++) + dump_general_subtree(&nameConstraints->rgPermittedSubtree[i]); + TRACE_(chain)("%d excluded subtrees:\n", + nameConstraints->cExcludedSubtree); + for (i = 0; i < nameConstraints->cExcludedSubtree; i++) + dump_general_subtree(&nameConstraints->rgExcludedSubtree[i]); + LocalFree(nameConstraints); + } +} + static void dump_cert_policies(const CERT_EXTENSION *ext) { CERT_POLICIES_INFO *policies; @@ -837,6 +904,8 @@ static void dump_extension(const CERT_EXTENSION *ext) dump_key_usage(ext); else if (!strcmp(ext->pszObjId, szOID_BASIC_CONSTRAINTS2)) dump_basic_constraints2(ext); + else if (!strcmp(ext->pszObjId, szOID_NAME_CONSTRAINTS)) + dump_name_constraints(ext); else if (!strcmp(ext->pszObjId, szOID_CERT_POLICIES)) dump_cert_policies(ext); else if (!strcmp(ext->pszObjId, szOID_ENHANCED_KEY_USAGE))

1 0

Juan Lang : crypt32: Trace the alt name extensions.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 1e953ef12ef30510e8387067a795fbc1ce055da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e953ef12ef30510e8387067a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 23 11:51:40 2009 -0700 crypt32: Trace the alt name extensions. --- dlls/crypt32/chain.c | 101 +++++++++++++++++++++++++++++++------------------ 1 files changed, 64 insertions(+), 37 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index cbbd677..547c74c 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -721,6 +721,61 @@ static void CRYPT_CheckChainNameConstraints(PCERT_SIMPLE_CHAIN chain) } } +static void dump_alt_name_entry(const CERT_ALT_NAME_ENTRY *entry) +{ + switch (entry->dwAltNameChoice) + { + case CERT_ALT_NAME_OTHER_NAME: + TRACE_(chain)("CERT_ALT_NAME_OTHER_NAME, oid = %s\n", + debugstr_a(entry->u.pOtherName->pszObjId)); + break; + case CERT_ALT_NAME_RFC822_NAME: + TRACE_(chain)("CERT_ALT_NAME_RFC822_NAME: %s\n", + debugstr_w(entry->u.pwszRfc822Name)); + break; + case CERT_ALT_NAME_DNS_NAME: + TRACE_(chain)("CERT_ALT_NAME_DNS_NAME: %s\n", + debugstr_w(entry->u.pwszDNSName)); + break; + case CERT_ALT_NAME_DIRECTORY_NAME: + TRACE_(chain)("CERT_ALT_NAME_DIRECTORY_NAME: %d bytes\n", + entry->u.DirectoryName.cbData); + break; + case CERT_ALT_NAME_URL: + TRACE_(chain)("CERT_ALT_NAME_URL: %s\n", debugstr_w(entry->u.pwszURL)); + break; + case CERT_ALT_NAME_IP_ADDRESS: + TRACE_(chain)("CERT_ALT_NAME_IP_ADDRESS: %d bytes\n", + entry->u.IPAddress.cbData); + break; + case CERT_ALT_NAME_REGISTERED_ID: + TRACE_(chain)("CERT_ALT_NAME_REGISTERED_ID: %s\n", + debugstr_a(entry->u.pszRegisteredID)); + break; + default: + TRACE_(chain)("dwAltNameChoice = %d\n", entry->dwAltNameChoice); + } +} + +static void dump_alt_name(LPCSTR type, const CERT_EXTENSION *ext) +{ + CERT_ALT_NAME_INFO *name; + DWORD size; + + TRACE_(chain)("%s:\n", type); + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, + ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, &name, &size)) + { + DWORD i; + + TRACE_(chain)("%d alt name entries:\n", name->cAltEntry); + for (i = 0; i < name->cAltEntry; i++) + dump_alt_name_entry(&name->rgAltEntry[i]); + LocalFree(name); + } +} + static void dump_basic_constraints(const CERT_EXTENSION *ext) { CERT_BASIC_CONSTRAINTS_INFO *info; @@ -782,42 +837,6 @@ static void dump_key_usage(const CERT_EXTENSION *ext) } } -static void dump_alt_name_entry(const CERT_ALT_NAME_ENTRY *entry) -{ - switch (entry->dwAltNameChoice) - { - case CERT_ALT_NAME_OTHER_NAME: - TRACE_(chain)("CERT_ALT_NAME_OTHER_NAME, oid = %s\n", - debugstr_a(entry->u.pOtherName->pszObjId)); - break; - case CERT_ALT_NAME_RFC822_NAME: - TRACE_(chain)("CERT_ALT_NAME_RFC822_NAME: %s\n", - debugstr_w(entry->u.pwszRfc822Name)); - break; - case CERT_ALT_NAME_DNS_NAME: - TRACE_(chain)("CERT_ALT_NAME_DNS_NAME: %s\n", - debugstr_w(entry->u.pwszDNSName)); - break; - case CERT_ALT_NAME_DIRECTORY_NAME: - TRACE_(chain)("CERT_ALT_NAME_DIRECTORY_NAME: %d bytes\n", - entry->u.DirectoryName.cbData); - break; - case CERT_ALT_NAME_URL: - TRACE_(chain)("CERT_ALT_NAME_URL: %s\n", debugstr_w(entry->u.pwszURL)); - break; - case CERT_ALT_NAME_IP_ADDRESS: - TRACE_(chain)("CERT_ALT_NAME_IP_ADDRESS: %d bytes\n", - entry->u.IPAddress.cbData); - break; - case CERT_ALT_NAME_REGISTERED_ID: - TRACE_(chain)("CERT_ALT_NAME_REGISTERED_ID: %s\n", - debugstr_a(entry->u.pszRegisteredID)); - break; - default: - TRACE_(chain)("dwAltNameChoice = %d\n", entry->dwAltNameChoice); - } -} - static void dump_general_subtree(const CERT_GENERAL_SUBTREE *subtree) { dump_alt_name_entry(&subtree->Base); @@ -898,10 +917,18 @@ static void dump_extension(const CERT_EXTENSION *ext) { TRACE_(chain)("%s (%scritical)\n", debugstr_a(ext->pszObjId), ext->fCritical ? "" : "not "); - if (!strcmp(ext->pszObjId, szOID_BASIC_CONSTRAINTS)) + if (!strcmp(ext->pszObjId, szOID_SUBJECT_ALT_NAME)) + dump_alt_name("subject alt name", ext); + else if (!strcmp(ext->pszObjId, szOID_ISSUER_ALT_NAME)) + dump_alt_name("issuer alt name", ext); + else if (!strcmp(ext->pszObjId, szOID_BASIC_CONSTRAINTS)) dump_basic_constraints(ext); else if (!strcmp(ext->pszObjId, szOID_KEY_USAGE)) dump_key_usage(ext); + else if (!strcmp(ext->pszObjId, szOID_SUBJECT_ALT_NAME2)) + dump_alt_name("subject alt name 2", ext); + else if (!strcmp(ext->pszObjId, szOID_ISSUER_ALT_NAME2)) + dump_alt_name("issuer alt name 2", ext); else if (!strcmp(ext->pszObjId, szOID_BASIC_CONSTRAINTS2)) dump_basic_constraints2(ext); else if (!strcmp(ext->pszObjId, szOID_NAME_CONSTRAINTS))

1 0

Juan Lang : crypt32: Accept either the subject alt name 2 or subject alt name extensions, and prefer the former when both are present.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 6a575d697e3fcfc4ec6a2deae1b9d20bcb2aaadb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a575d697e3fcfc4ec6a2deae… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 23 11:54:05 2009 -0700 crypt32: Accept either the subject alt name 2 or subject alt name extensions, and prefer the former when both are present. --- dlls/crypt32/chain.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 547c74c..160bcec 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -618,8 +618,12 @@ static void CRYPT_CheckNameConstraints( { CERT_EXTENSION *ext; - if ((ext = CertFindExtension(szOID_SUBJECT_ALT_NAME, cert->cExtension, - cert->rgExtension))) + ext = CertFindExtension(szOID_SUBJECT_ALT_NAME2, cert->cExtension, + cert->rgExtension); + if (!ext) + ext = CertFindExtension(szOID_SUBJECT_ALT_NAME, cert->cExtension, + cert->rgExtension); + if (ext) { CERT_ALT_NAME_INFO *subjectName; DWORD size; @@ -1088,6 +1092,8 @@ static BOOL CRYPT_CriticalExtensionsSupported(PCCERT_CONTEXT cert) ret = TRUE; else if (!strcmp(oid, szOID_SUBJECT_ALT_NAME)) ret = TRUE; + else if (!strcmp(oid, szOID_SUBJECT_ALT_NAME2)) + ret = TRUE; else { FIXME("unsupported critical extension %s\n",

1 0

Juan Lang : crypt32: Correct a prototype.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 1a194449ccb033b35bc9a62fc719aa73dee5f722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a194449ccb033b35bc9a62fc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 23 13:51:02 2009 -0700 crypt32: Correct a prototype. --- dlls/crypt32/crypt32_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index a5759a2..5e5b540 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -295,7 +295,7 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info); */ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indent, - PCERT_NAME_BLOB pName, DWORD dwStrType, LPWSTR psz, DWORD csz); + const CERT_NAME_BLOB *pName, DWORD dwStrType, LPWSTR psz, DWORD csz); /** * Context functions

1 0

Juan Lang : crypt32: Trace directory name of alt name entries.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: d664edb3221f6a42f9261861addd7582cbb371e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d664edb3221f6a42f9261861a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 23 13:53:26 2009 -0700 crypt32: Trace directory name of alt name entries. --- dlls/crypt32/chain.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 160bcec..5e09cd7 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -725,8 +725,26 @@ static void CRYPT_CheckChainNameConstraints(PCERT_SIMPLE_CHAIN chain) } } +static LPWSTR name_value_to_str(const CERT_NAME_BLOB *name) +{ + DWORD len = cert_name_to_str_with_indent(X509_ASN_ENCODING, 0, name, + CERT_SIMPLE_NAME_STR, NULL, 0); + LPWSTR str = NULL; + + if (len) + { + str = CryptMemAlloc(len * sizeof(WCHAR)); + if (str) + cert_name_to_str_with_indent(X509_ASN_ENCODING, 0, name, + CERT_SIMPLE_NAME_STR, str, len); + } + return str; +} + static void dump_alt_name_entry(const CERT_ALT_NAME_ENTRY *entry) { + LPWSTR str; + switch (entry->dwAltNameChoice) { case CERT_ALT_NAME_OTHER_NAME: @@ -742,8 +760,9 @@ static void dump_alt_name_entry(const CERT_ALT_NAME_ENTRY *entry) debugstr_w(entry->u.pwszDNSName)); break; case CERT_ALT_NAME_DIRECTORY_NAME: - TRACE_(chain)("CERT_ALT_NAME_DIRECTORY_NAME: %d bytes\n", - entry->u.DirectoryName.cbData); + str = name_value_to_str(&entry->u.DirectoryName); + TRACE_(chain)("CERT_ALT_NAME_DIRECTORY_NAME: %s\n", debugstr_w(str)); + CryptMemFree(str); break; case CERT_ALT_NAME_URL: TRACE_(chain)("CERT_ALT_NAME_URL: %s\n", debugstr_w(entry->u.pwszURL));

1 0