June 2007 - Wine-commits - list.winehq.org

Maarten Lankhorst : rsaenh: Allow CRYPT_NEWKEYSET and CRYPT_VERIFYCONTEXT at same time when acquiring context .
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 4e0ef1cb38ccef8cf994a6c34544b822f0e081f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0ef1cb38ccef8cf994a6c34… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jun 13 08:31:07 2007 +0200 rsaenh: Allow CRYPT_NEWKEYSET and CRYPT_VERIFYCONTEXT at same time when acquiring context. --- dlls/rsaenh/rsaenh.c | 1 + dlls/rsaenh/tests/rsaenh.c | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 101eb8c..8f58d82 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1502,6 +1502,7 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer, *phProv = new_key_container(szKeyContainerName, dwFlags, pVTable); break; + case CRYPT_VERIFYCONTEXT|CRYPT_NEWKEYSET: case CRYPT_VERIFYCONTEXT: if (pszContainer) { TRACE("pszContainer should be NULL\n"); diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 5d17be2..53ec374 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1318,6 +1318,11 @@ static void test_schannel_provider(void) 0x3d, 0xca, 0x6a, 0x6f, 0xfa, 0x15, 0x4e, 0xaa }; + result = CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_VERIFYCONTEXT|CRYPT_NEWKEYSET); + ok (result, "%08x\n", GetLastError()); + if (result) + CryptReleaseContext(hProv, 0); + result = CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_VERIFYCONTEXT); ok (result, "%08x\n", GetLastError()); if (!result) return;

1 0

Juan Lang : crypt32: Implement PKCS7_SIGNER_INFO encoding/decoding.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: d1ac9c73f64d5e193f612d2f76caf849ab2605a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ac9c73f64d5e193f612d2f7… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jun 12 15:02:57 2007 -0700 crypt32: Implement PKCS7_SIGNER_INFO encoding/decoding. --- dlls/crypt32/decode.c | 83 ++++++++++++ dlls/crypt32/encode.c | 77 +++++++++++ dlls/crypt32/tests/encode.c | 312 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 472 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1ac9c73f64d5e193f612…

1 0

Francois Gouget : Add API documentation stubs to make winapi_check happy.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 9012d4e72fa25fdd6179543aa3257156db85b386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9012d4e72fa25fdd6179543aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 17:51:53 2007 +0200 Add API documentation stubs to make winapi_check happy. --- dlls/atl/atl_main.c | 3 +++ dlls/gdiplus/gdiplus.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 938df36..374b0d2 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -547,6 +547,9 @@ typedef struct ATL_PROPMAP_ENTRY VARTYPE vt; } ATL_PROPMAP_ENTRY; +/*********************************************************************** + * AtlIPersistStreamInit_Load [ATL.@] + */ HRESULT WINAPI AtlIPersistStreamInit_Load( LPSTREAM pStm, ATL_PROPMAP_ENTRY *pMap, void *pThis, IUnknown *pUnk) { diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 7ebd848..959bcb0 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -45,6 +45,9 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) return TRUE; } +/***************************************************** + * GdiplusStartup [GDIPLUS.@] + */ Status WINAPI GdiplusStartup(ULONG_PTR *token, const struct GdiplusStartupInput *input, struct GdiplusStartupOutput *output) { @@ -65,16 +68,25 @@ Status WINAPI GdiplusStartup(ULONG_PTR *token, const struct GdiplusStartupInput return Ok; } +/***************************************************** + * GdiplusShutdown [GDIPLUS.@] + */ void WINAPI GdiplusShutdown(ULONG_PTR token) { /* FIXME: no object tracking */ } +/***************************************************** + * GdipAlloc [GDIPLUS.@] + */ void* WINGDIPAPI GdipAlloc(SIZE_T size) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } +/***************************************************** + * GdipFree [GDIPLUS.@] + */ void WINGDIPAPI GdipFree(void* ptr) { HeapFree(GetProcessHeap(), 0, ptr);

1 0

Francois Gouget : wintrust/tests: Simplify the code and improve consistency by removing unneeded function typedefs .
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 2c28b62a8059831093b98d06bbb5dd46896f22d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c28b62a8059831093b98d06b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 12 17:58:03 2007 +0200 wintrust/tests: Simplify the code and improve consistency by removing unneeded function typedefs. --- dlls/wintrust/tests/register.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index db5726c..8570c09 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -286,9 +286,6 @@ static void test_LoadFunctionPointers(void) ok(ret, "WintrustLoadFunctionPointers failed: %d\n", GetLastError()); } -typedef void (WINAPI *WintrustGetRegPolicyFlagsFunc)(DWORD *); -typedef BOOL (WINAPI *WintrustSetRegPolicyFlagsFunc)(DWORD); - static void test_RegPolicyFlags(void) { /* Default state value 0x00023c00, which is @@ -302,17 +299,15 @@ static void test_RegPolicyFlags(void) "Software\\Microsoft\\Windows\\CurrentVersion\\Wintrust\\" "Trust Providers\\Software Publishing"; static const CHAR State[] = "State"; - WintrustGetRegPolicyFlagsFunc pGetFlags; - WintrustSetRegPolicyFlagsFunc pSetFlags; + void (WINAPI *pGetFlags)(DWORD *); + BOOL (WINAPI *pSetFlags)(DWORD); HKEY key; LONG r; DWORD flags1, flags2, flags3, size; BOOL ret; - pGetFlags = (WintrustGetRegPolicyFlagsFunc)GetProcAddress(hWintrust, - "WintrustGetRegPolicyFlags"); - pSetFlags = (WintrustSetRegPolicyFlagsFunc)GetProcAddress(hWintrust, - "WintrustSetRegPolicyFlags"); + pGetFlags = (void*)GetProcAddress(hWintrust, "WintrustGetRegPolicyFlags"); + pSetFlags = (void*)GetProcAddress(hWintrust, "WintrustSetRegPolicyFlags"); if (!pGetFlags || !pSetFlags) skip("Policy flags functions not present\n");

1 0

Juan Lang : crypt32: Implement PKCS_CONTENT_INFO encoding/decoding.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 1cd9510be0b58411826516ba696c7770fdf6894f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd9510be0b58411826516ba6… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jun 12 14:40:04 2007 -0700 crypt32: Implement PKCS_CONTENT_INFO encoding/decoding. --- dlls/crypt32/decode.c | 67 ++++++++++++++++++++++++++ dlls/crypt32/encode.c | 47 ++++++++++++++++++ dlls/crypt32/tests/encode.c | 109 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 223 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1cd9510be0b5841182651…

1 0

Juan Lang : crypt32: Separate set encoding into a separate function.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: bbcd95a7e1c8d6a2025316098f6c25650799a68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbcd95a7e1c8d6a2025316098… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jun 12 14:40:52 2007 -0700 crypt32: Separate set encoding into a separate function. --- dlls/crypt32/encode.c | 137 +++++++++++++++++++++++++++---------------------- 1 files changed, 75 insertions(+), 62 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 2f6fca7..7748598 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1165,92 +1165,105 @@ static int BLOBComp(const void *l, const void *r) return ret; } -/* This encodes as a SET OF, which in DER must be lexicographically sorted. +typedef struct _CRYPT_SET_OF { + DWORD cValue; + PCRYPT_DER_BLOB rgValue; +} CRYPT_SET_OF; + +/* This encodes a SET OF, which in DER must be lexicographically sorted. */ +static BOOL WINAPI CRYPT_DEREncodeSet(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + CRYPT_SET_OF *set = (CRYPT_SET_OF *)pvStructInfo; + DWORD bytesNeeded = 0, lenBytes, i; + BOOL ret = FALSE; + + for (i = 0; i < set->cValue; i++) + bytesNeeded += set->rgValue[i].cbData; + CRYPT_EncodeLen(bytesNeeded, NULL, &lenBytes); + bytesNeeded += 1 + lenBytes; + if (pbEncoded) + { + if (*pcbEncoded < bytesNeeded) + { + *pcbEncoded = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + } + else + { + ret = TRUE; + *pcbEncoded = bytesNeeded; + qsort(set->rgValue, set->cValue, sizeof(CRYPT_DER_BLOB), BLOBComp); + *pbEncoded++ = ASN_CONSTRUCTOR | ASN_SETOF; + CRYPT_EncodeLen(bytesNeeded - lenBytes - 1, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; ret && i < set->cValue; i++) + { + memcpy(pbEncoded, set->rgValue[i].pbData, + set->rgValue[i].cbData); + pbEncoded += set->rgValue[i].cbData; + } + } + } + else + { + *pcbEncoded = bytesNeeded; + ret = TRUE; + } + return ret; +} + static BOOL WINAPI CRYPT_AsnEncodeRdn(DWORD dwCertEncodingType, CERT_RDN *rdn, CryptEncodeObjectExFunc nameValueEncodeFunc, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret; - CRYPT_DER_BLOB *blobs = NULL; + CRYPT_SET_OF setOf = { 0, NULL }; __TRY { - DWORD bytesNeeded = 0, lenBytes, i; + DWORD i; - blobs = NULL; ret = TRUE; if (rdn->cRDNAttr) { - blobs = CryptMemAlloc(rdn->cRDNAttr * sizeof(CRYPT_DER_BLOB)); - if (!blobs) + setOf.cValue = rdn->cRDNAttr; + setOf.rgValue = CryptMemAlloc(rdn->cRDNAttr * + sizeof(CRYPT_DER_BLOB)); + if (!setOf.rgValue) ret = FALSE; else - memset(blobs, 0, rdn->cRDNAttr * sizeof(CRYPT_DER_BLOB)); + memset(setOf.rgValue, 0, setOf.cValue * sizeof(CRYPT_DER_BLOB)); } for (i = 0; ret && i < rdn->cRDNAttr; i++) { + setOf.rgValue[i].cbData = 0; ret = CRYPT_AsnEncodeRdnAttr(dwCertEncodingType, &rdn->rgRDNAttr[i], - nameValueEncodeFunc, NULL, &blobs[i].cbData); + nameValueEncodeFunc, NULL, &setOf.rgValue[i].cbData); if (ret) - bytesNeeded += blobs[i].cbData; - else - { - /* Have to propagate index of failing character */ - *pcbEncoded = blobs[i].cbData; - } - } - if (ret) - { - CRYPT_EncodeLen(bytesNeeded, NULL, &lenBytes); - bytesNeeded += 1 + lenBytes; - if (pbEncoded) { - if (*pcbEncoded < bytesNeeded) - { - SetLastError(ERROR_MORE_DATA); + setOf.rgValue[i].pbData = + CryptMemAlloc(setOf.rgValue[i].cbData); + if (!setOf.rgValue[i].pbData) ret = FALSE; - } else - { - for (i = 0; ret && i < rdn->cRDNAttr; i++) - { - blobs[i].pbData = CryptMemAlloc(blobs[i].cbData); - if (!blobs[i].pbData) - ret = FALSE; - else - { - ret = CRYPT_AsnEncodeRdnAttr(dwCertEncodingType, - &rdn->rgRDNAttr[i], nameValueEncodeFunc, - blobs[i].pbData, &blobs[i].cbData); - if (!ret) - *pcbEncoded = blobs[i].cbData; - } - } - if (ret) - { - qsort(blobs, rdn->cRDNAttr, sizeof(CRYPT_DER_BLOB), - BLOBComp); - *pbEncoded++ = ASN_CONSTRUCTOR | ASN_SETOF; - CRYPT_EncodeLen(bytesNeeded - lenBytes - 1, pbEncoded, - &lenBytes); - pbEncoded += lenBytes; - for (i = 0; ret && i < rdn->cRDNAttr; i++) - { - memcpy(pbEncoded, blobs[i].pbData, blobs[i].cbData); - pbEncoded += blobs[i].cbData; - } - } - } + ret = CRYPT_AsnEncodeRdnAttr(dwCertEncodingType, + &rdn->rgRDNAttr[i], nameValueEncodeFunc, + setOf.rgValue[i].pbData, &setOf.rgValue[i].cbData); + } + if (!ret) + { + /* Have to propagate index of failing character */ + *pcbEncoded = setOf.rgValue[i].cbData; } - if (ret) - *pcbEncoded = bytesNeeded; - } - if (blobs) - { - for (i = 0; i < rdn->cRDNAttr; i++) - CryptMemFree(blobs[i].pbData); } + if (ret) + ret = CRYPT_DEREncodeSet(X509_ASN_ENCODING, NULL, &setOf, 0, NULL, + pbEncoded, pcbEncoded); + for (i = 0; i < setOf.cValue; i++) + CryptMemFree(setOf.rgValue[i].pbData); } __EXCEPT_PAGE_FAULT { @@ -1258,7 +1271,7 @@ static BOOL WINAPI CRYPT_AsnEncodeRdn(DWORD dwCertEncodingType, CERT_RDN *rdn, ret = FALSE; } __ENDTRY - CryptMemFree(blobs); + CryptMemFree(setOf.rgValue); return ret; }

1 0

Juan Lang : crypt32: Implement PKCS_ATTRIBUTE encoding/decoding.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 97f2c658fd8f8ec4b3fd30b8638231a7753b2571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f2c658fd8f8ec4b3fd30b86… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jun 12 15:00:01 2007 -0700 crypt32: Implement PKCS_ATTRIBUTE encoding/decoding. --- dlls/crypt32/decode.c | 50 +++++++++++++++++++ dlls/crypt32/encode.c | 35 +++++++++++++ dlls/crypt32/tests/encode.c | 111 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 196 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index ac0a175..b68d5d3 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1795,6 +1795,53 @@ static BOOL WINAPI CRYPT_AsnDecodeCopyBytes(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_DecodeDERArray(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + struct AsnArrayDescriptor arrayDesc = { ASN_CONSTRUCTOR | ASN_SETOF, + CRYPT_AsnDecodeCopyBytes, sizeof(CRYPT_DER_BLOB), TRUE, + offsetof(CRYPT_DER_BLOB, pbData) }; + struct GenericArray *array = (struct GenericArray *)pvStructInfo; + + TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, *pcbStructInfo); + + ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, pcbStructInfo, array ? array->rgItems : NULL); + return ret; +} + +static BOOL WINAPI CRYPT_AsnDecodePKCSAttribute(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = FALSE; + + __TRY + { + struct AsnDecodeSequenceItem items[] = { + { ASN_OBJECTIDENTIFIER, offsetof(CRYPT_ATTRIBUTE, pszObjId), + CRYPT_AsnDecodeOidInternal, sizeof(LPSTR), FALSE, TRUE, + offsetof(CRYPT_ATTRIBUTE, pszObjId), 0 }, + { ASN_CONSTRUCTOR | ASN_SETOF, offsetof(CRYPT_ATTRIBUTE, cValue), + CRYPT_DecodeDERArray, sizeof(struct GenericArray), FALSE, TRUE, + offsetof(CRYPT_ATTRIBUTE, rgValue), 0 }, + }; + + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, pcbStructInfo, NULL); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + static BOOL WINAPI CRYPT_AsnDecodeAlgorithmId(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) @@ -3628,6 +3675,9 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, case (WORD)X509_UNICODE_NAME: decodeFunc = CRYPT_AsnDecodeUnicodeName; break; + case (WORD)PKCS_ATTRIBUTE: + decodeFunc = CRYPT_AsnDecodePKCSAttribute; + break; case (WORD)X509_UNICODE_NAME_VALUE: decodeFunc = CRYPT_AsnDecodeUnicodeNameValue; break; diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 7748598..9cf70b8 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1362,6 +1362,38 @@ static BOOL WINAPI CRYPT_AsnEncodeUnicodeName(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnEncodePKCSAttribute(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + + __TRY + { + const CRYPT_ATTRIBUTE *attr = (const CRYPT_ATTRIBUTE *)pvStructInfo; + + if (!attr->pszObjId) + SetLastError(E_INVALIDARG); + else + { + struct AsnEncodeSequenceItem items[2] = { + { attr->pszObjId, CRYPT_AsnEncodeOid, 0 }, + { &attr->cValue, CRYPT_DEREncodeSet, 0 }, + }; + + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + pcbEncoded); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + static BOOL WINAPI CRYPT_AsnEncodePKCSContentInfo(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -3071,6 +3103,9 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, case (WORD)PKCS_CONTENT_INFO: encodeFunc = CRYPT_AsnEncodePKCSContentInfo; break; + case (WORD)PKCS_ATTRIBUTE: + encodeFunc = CRYPT_AsnEncodePKCSAttribute; + break; case (WORD)X509_UNICODE_NAME_VALUE: encodeFunc = CRYPT_AsnEncodeUnicodeNameValue; break; diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index a655602..0cf9752 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -4631,6 +4631,115 @@ static void test_decodePKCSContentInfo(DWORD dwEncoding) } } +static const BYTE emptyPKCSAttr[] = { 0x30,0x06,0x06,0x02,0x2a,0x03,0x31, + 0x00 }; +static const BYTE bogusPKCSAttr[] = { 0x30,0x07,0x06,0x02,0x2a,0x03,0x31,0x01, + 0x01 }; +static const BYTE intPKCSAttr[] = { 0x30,0x09,0x06,0x02,0x2a,0x03,0x31,0x03, + 0x02,0x01,0x01 }; + +static void test_encodePKCSAttribute(DWORD dwEncoding) +{ + CRYPT_ATTRIBUTE attr = { 0 }; + BOOL ret; + LPBYTE buf = NULL; + DWORD size = 0; + CRYPT_ATTR_BLOB blob; + char oid[] = "1.2.3"; + + SetLastError(0xdeadbeef); + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, NULL, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, &attr, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %x\n", GetLastError()); + attr.pszObjId = oid; + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, &attr, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %x\n", GetLastError()); + if (buf) + { + ok(size == sizeof(emptyPKCSAttr), "Unexpected size %d\n", size); + ok(!memcmp(buf, emptyPKCSAttr, size), "Unexpected value\n"); + LocalFree(buf); + } + blob.cbData = sizeof(bogusDER); + blob.pbData = bogusDER; + attr.cValue = 1; + attr.rgValue = &blob; + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, &attr, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %x\n", GetLastError()); + if (buf) + { + ok(size == sizeof(bogusPKCSAttr), "Unexpected size %d\n", size); + ok(!memcmp(buf, bogusPKCSAttr, size), "Unexpected value\n"); + LocalFree(buf); + } + blob.pbData = (BYTE *)ints[0].encoded; + blob.cbData = ints[0].encoded[1] + 2; + ret = CryptEncodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, &attr, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + if (buf) + { + ok(size == sizeof(intPKCSAttr), "Unexpected size %d\n", size); + ok(!memcmp(buf, intPKCSAttr, size), "Unexpected value\n"); + LocalFree(buf); + } +} + +static void test_decodePKCSAttribute(DWORD dwEncoding) +{ + BOOL ret; + LPBYTE buf = NULL; + DWORD size = 0; + CRYPT_ATTRIBUTE *attr; + + ret = CryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, + emptyPKCSAttr, sizeof(emptyPKCSAttr), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + if (buf) + { + attr = (CRYPT_ATTRIBUTE *)buf; + + ok(!strcmp(attr->pszObjId, "1.2.3"), "Expected 1.2.3, got %s\n", + attr->pszObjId); + ok(attr->cValue == 0, "Expected no value, got %d\n", attr->cValue); + LocalFree(buf); + } + SetLastError(0xdeadbeef); + ret = CryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, + bogusPKCSAttr, sizeof(bogusPKCSAttr), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + /* Native fails with CRYPT_E_ASN1_EOD, accept also CRYPT_E_ASN1_CORRUPT as + * I doubt an app depends on that. + */ + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == CRYPT_E_ASN1_CORRUPT), + "Expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT, got %x\n", + GetLastError()); + ret = CryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTE, + intPKCSAttr, sizeof(intPKCSAttr), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + if (buf) + { + attr = (CRYPT_ATTRIBUTE *)buf; + + ok(!strcmp(attr->pszObjId, "1.2.3"), "Expected 1.2.3, got %s\n", + attr->pszObjId); + ok(attr->cValue == 1, "Expected 1 value, got %d\n", attr->cValue); + ok(attr->rgValue[0].cbData == ints[0].encoded[1] + 2, + "Unexpected size %d\n", attr->rgValue[0].cbData); + ok(!memcmp(attr->rgValue[0].pbData, ints[0].encoded, + attr->rgValue[0].cbData), "Unexpected value\n"); + } +} /* Free *pInfo with HeapFree */ static void testExportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO *pInfo) { @@ -4840,6 +4949,8 @@ START_TEST(encode) test_decodeAuthorityKeyId2(encodings[i]); test_encodePKCSContentInfo(encodings[i]); test_decodePKCSContentInfo(encodings[i]); + test_encodePKCSAttribute(encodings[i]); + test_decodePKCSAttribute(encodings[i]); } testPortPublicKeyInfo(); }

1 0

Juan Lang : crypt32: Use CRYPT_EncodeEnsureSpace to allocate memory when necessary.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 74addd636e6bd64501b01bd3b188171976e47028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74addd636e6bd64501b01bd3b… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jun 12 15:01:04 2007 -0700 crypt32: Use CRYPT_EncodeEnsureSpace to allocate memory when necessary. --- dlls/crypt32/encode.c | 44 ++++++++++++++++++-------------------------- 1 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 9cf70b8..6b78686 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1176,42 +1176,34 @@ static BOOL WINAPI CRYPT_DEREncodeSet(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - CRYPT_SET_OF *set = (CRYPT_SET_OF *)pvStructInfo; + const CRYPT_SET_OF *set = (const CRYPT_SET_OF *)pvStructInfo; DWORD bytesNeeded = 0, lenBytes, i; - BOOL ret = FALSE; + BOOL ret; for (i = 0; i < set->cValue; i++) bytesNeeded += set->rgValue[i].cbData; CRYPT_EncodeLen(bytesNeeded, NULL, &lenBytes); bytesNeeded += 1 + lenBytes; - if (pbEncoded) - { - if (*pcbEncoded < bytesNeeded) - { - *pcbEncoded = bytesNeeded; - SetLastError(ERROR_MORE_DATA); - } - else - { - ret = TRUE; - *pcbEncoded = bytesNeeded; - qsort(set->rgValue, set->cValue, sizeof(CRYPT_DER_BLOB), BLOBComp); - *pbEncoded++ = ASN_CONSTRUCTOR | ASN_SETOF; - CRYPT_EncodeLen(bytesNeeded - lenBytes - 1, pbEncoded, &lenBytes); - pbEncoded += lenBytes; - for (i = 0; ret && i < set->cValue; i++) - { - memcpy(pbEncoded, set->rgValue[i].pbData, - set->rgValue[i].cbData); - pbEncoded += set->rgValue[i].cbData; - } - } - } - else + if (!pbEncoded) { *pcbEncoded = bytesNeeded; ret = TRUE; } + else if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + qsort(set->rgValue, set->cValue, sizeof(CRYPT_DER_BLOB), BLOBComp); + *pbEncoded++ = ASN_CONSTRUCTOR | ASN_SETOF; + CRYPT_EncodeLen(bytesNeeded - lenBytes - 1, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; ret && i < set->cValue; i++) + { + memcpy(pbEncoded, set->rgValue[i].pbData, set->rgValue[i].cbData); + pbEncoded += set->rgValue[i].cbData; + } + } return ret; }

1 0

Juan Lang : crypt32: Implement PKCS_ATTRIBUTES encoding/decoding.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: e1f83a7abf6f9cd87596afd4dff2b8f447eb2aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f83a7abf6f9cd87596afd4d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jun 12 15:01:34 2007 -0700 crypt32: Implement PKCS_ATTRIBUTES encoding/decoding. --- dlls/crypt32/decode.c | 72 +++++++++++++++++++++++++- dlls/crypt32/encode.c | 60 ++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 119 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 249 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1f83a7abf6f9cd87596a…

1 0

H. Verbeet : wined3d: Add wined3d vertex sampler definitions.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: fc5582aef7ccfdfefedff96c2eee1230e29ef7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5582aef7ccfdfefedff96c2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 12 23:08:34 2007 +0200 wined3d: Add wined3d vertex sampler definitions. --- include/wine/wined3d_types.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index cd70b17..0cbe880 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1561,6 +1561,13 @@ typedef enum _WINED3DSURFTYPE { #define WINED3DCREATE_DISABLE_DRIVER_MANAGEMENT 0x00000100 #define WINED3DCREATE_ADAPTERGROUP_DEVICE 0x00000200 +/* VTF defines */ +#define WINED3DDMAPSAMPLER 0x100 +#define WINED3DVERTEXTEXTURESAMPLER0 (WINED3DDMAPSAMPLER + 1) +#define WINED3DVERTEXTEXTURESAMPLER1 (WINED3DDMAPSAMPLER + 2) +#define WINED3DVERTEXTEXTURESAMPLER2 (WINED3DDMAPSAMPLER + 3) +#define WINED3DVERTEXTEXTURESAMPLER3 (WINED3DDMAPSAMPLER + 4) + /* DirectDraw types */ typedef struct _WINEDDCOLORKEY

1 0