October 2009 - Wine-commits

Juan Lang : crypt32: Explicitly pass array pointer when decoding CMS message certs rather than assuming a particular alignment .
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 8c52850102eb4dbb8a03a6f1d6e7beded21d8a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c52850102eb4dbb8a03a6f1d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:48:03 2009 -0700 crypt32: Explicitly pass array pointer when decoding CMS message certs rather than assuming a particular alignment. --- dlls/crypt32/decode.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a9f3383..b660626 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5346,6 +5346,38 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfo(DWORD dwCertEncodingType, return ret; } +static BOOL CRYPT_AsnDecodeCMSCertEncoded(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret; + struct AsnArrayDescriptor arrayDesc = { 0, CRYPT_AsnDecodeCopyBytes, + sizeof(CRYPT_DER_BLOB), TRUE, offsetof(CRYPT_DER_BLOB, pbData) }; + DWORD bytesNeeded; + + TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pvStructInfo ? *pcbStructInfo : 0, pcbDecoded); + + if ((ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + NULL, NULL, &bytesNeeded, pcbDecoded))) + { + bytesNeeded += MEMBERSIZE(CRYPT_SIGNED_INFO, cCertEncoded, cCrlEncoded); + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(0, NULL, pvStructInfo, + pcbStructInfo, bytesNeeded))) + { + CRYPT_SIGNED_INFO *info = (CRYPT_SIGNED_INFO *) + ((BYTE *)pvStructInfo - offsetof(CRYPT_SIGNED_INFO, cCertEncoded)); + + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + &info->cCertEncoded, info->rgCertEncoded, &bytesNeeded, + pcbDecoded); + } + } + return ret; +} + static BOOL CRYPT_AsnDecodeCMSSignerId(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -5504,8 +5536,8 @@ BOOL CRYPT_AsnDecodeCMSSignedInfo(const BYTE *pbEncoded, DWORD cbEncoded, CRYPT_AsnDecodePKCSContentInfoInternal, sizeof(CRYPT_CONTENT_INFO), FALSE, TRUE, offsetof(CRYPT_SIGNED_INFO, content.pszObjId), 0 }, { ASN_CONSTRUCTOR | ASN_CONTEXT | 0, - offsetof(CRYPT_SIGNED_INFO, cCertEncoded), - CRYPT_DecodeDERArray, sizeof(struct GenericArray), TRUE, TRUE, + offsetof(CRYPT_SIGNED_INFO, cCertEncoded), CRYPT_AsnDecodeCMSCertEncoded, + MEMBERSIZE(CRYPT_SIGNED_INFO, cCertEncoded, cCrlEncoded), TRUE, TRUE, offsetof(CRYPT_SIGNED_INFO, rgCertEncoded), 0 }, { ASN_CONSTRUCTOR | ASN_CONTEXT | 1, offsetof(CRYPT_SIGNED_INFO, cCrlEncoded), CRYPT_DecodeDERArray,

1 0

Juan Lang : crypt32: Explicitly pass array pointer when decoding CMS message CRLs rather than assuming a particular alignment .
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 07a1750af740f399e360efd8b39f77ebc82d22ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a1750af740f399e360efd8b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:48:38 2009 -0700 crypt32: Explicitly pass array pointer when decoding CMS message CRLs rather than assuming a particular alignment. --- dlls/crypt32/decode.c | 53 +++++++++++++++++++++++++++++++----------------- 1 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index b660626..02f700e 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2348,23 +2348,6 @@ static BOOL CRYPT_AsnDecodeCopyBytes(const BYTE *pbEncoded, return ret; } -static BOOL CRYPT_DecodeDERArray(const BYTE *pbEncoded, DWORD cbEncoded, - DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) -{ - BOOL ret; - struct AsnArrayDescriptor arrayDesc = { 0, CRYPT_AsnDecodeCopyBytes, - sizeof(CRYPT_DER_BLOB), TRUE, offsetof(CRYPT_DER_BLOB, pbData) }; - struct GenericArray *array = pvStructInfo; - - TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, - pvStructInfo, *pcbStructInfo, pcbDecoded); - - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - NULL, pvStructInfo, pcbStructInfo, pcbDecoded, - array ? array->rgItems : NULL); - return ret; -} - static BOOL CRYPT_AsnDecodeCTLUsage(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { @@ -5378,6 +5361,38 @@ static BOOL CRYPT_AsnDecodeCMSCertEncoded(const BYTE *pbEncoded, return ret; } +static BOOL CRYPT_AsnDecodeCMSCrlEncoded(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret; + struct AsnArrayDescriptor arrayDesc = { 0, CRYPT_AsnDecodeCopyBytes, + sizeof(CRYPT_DER_BLOB), TRUE, offsetof(CRYPT_DER_BLOB, pbData) }; + DWORD bytesNeeded; + + TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pvStructInfo ? *pcbStructInfo : 0, pcbDecoded); + + if ((ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + NULL, NULL, &bytesNeeded, pcbDecoded))) + { + bytesNeeded += MEMBERSIZE(CRYPT_SIGNED_INFO, cCrlEncoded, content); + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(0, NULL, pvStructInfo, + pcbStructInfo, bytesNeeded))) + { + CRYPT_SIGNED_INFO *info = (CRYPT_SIGNED_INFO *) + ((BYTE *)pvStructInfo - offsetof(CRYPT_SIGNED_INFO, cCrlEncoded)); + + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + &info->cCrlEncoded, info->rgCrlEncoded, &bytesNeeded, + pcbDecoded); + } + } + return ret; +} + static BOOL CRYPT_AsnDecodeCMSSignerId(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -5540,8 +5555,8 @@ BOOL CRYPT_AsnDecodeCMSSignedInfo(const BYTE *pbEncoded, DWORD cbEncoded, MEMBERSIZE(CRYPT_SIGNED_INFO, cCertEncoded, cCrlEncoded), TRUE, TRUE, offsetof(CRYPT_SIGNED_INFO, rgCertEncoded), 0 }, { ASN_CONSTRUCTOR | ASN_CONTEXT | 1, - offsetof(CRYPT_SIGNED_INFO, cCrlEncoded), CRYPT_DecodeDERArray, - sizeof(struct GenericArray), TRUE, TRUE, + offsetof(CRYPT_SIGNED_INFO, cCrlEncoded), CRYPT_AsnDecodeCMSCrlEncoded, + MEMBERSIZE(CRYPT_SIGNED_INFO, cCrlEncoded, content), TRUE, TRUE, offsetof(CRYPT_SIGNED_INFO, rgCrlEncoded), 0 }, { ASN_CONSTRUCTOR | ASN_SETOF, offsetof(CRYPT_SIGNED_INFO, cSignerInfo), CRYPT_DecodeSignerArray, sizeof(struct GenericArray), TRUE, TRUE,

1 0

Juan Lang : crypt32: Explicitly pass array pointer when decoding name constraints' permitted subtrees rather than assuming a particular alignment.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: ab1376ad6c8aec546b81c8f4ffb2df96315e88fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1376ad6c8aec546b81c8f4f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:49:13 2009 -0700 crypt32: Explicitly pass array pointer when decoding name constraints' permitted subtrees rather than assuming a particular alignment. --- dlls/crypt32/decode.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 02f700e..084b149 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5163,6 +5163,41 @@ static BOOL CRYPT_AsnDecodeSubtree(const BYTE *pbEncoded, return ret; } +static BOOL CRYPT_AsnDecodePermittedSubtree(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret = TRUE; + struct AsnArrayDescriptor arrayDesc = { 0, + CRYPT_AsnDecodeSubtree, sizeof(CERT_GENERAL_SUBTREE), TRUE, + offsetof(CERT_GENERAL_SUBTREE, Base.u.pwszURL) }; + DWORD bytesNeeded; + + TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo, pcbDecoded); + + if ((ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + NULL, NULL, &bytesNeeded, pcbDecoded))) + { + bytesNeeded += MEMBERSIZE(CERT_NAME_CONSTRAINTS_INFO, + cPermittedSubtree, cExcludedSubtree); + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(0, NULL, pvStructInfo, + pcbStructInfo, bytesNeeded))) + { + CERT_NAME_CONSTRAINTS_INFO *info = (CERT_NAME_CONSTRAINTS_INFO *) + ((BYTE *)pvStructInfo - + offsetof(CERT_NAME_CONSTRAINTS_INFO, cPermittedSubtree)); + + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + &info->cPermittedSubtree, info->rgPermittedSubtree, &bytesNeeded, + pcbDecoded); + } + } + return ret; +} + static BOOL CRYPT_AsnDecodeSubtreeArray(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -5197,7 +5232,9 @@ static BOOL WINAPI CRYPT_AsnDecodeNameConstraints(DWORD dwCertEncodingType, struct AsnDecodeSequenceItem items[] = { { ASN_CONTEXT | ASN_CONSTRUCTOR | 0, offsetof(CERT_NAME_CONSTRAINTS_INFO, cPermittedSubtree), - CRYPT_AsnDecodeSubtreeArray, sizeof(struct GenericArray), TRUE, TRUE, + CRYPT_AsnDecodePermittedSubtree, + MEMBERSIZE(CERT_NAME_CONSTRAINTS_INFO, cPermittedSubtree, + cExcludedSubtree), TRUE, TRUE, offsetof(CERT_NAME_CONSTRAINTS_INFO, rgPermittedSubtree), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR | 1, offsetof(CERT_NAME_CONSTRAINTS_INFO, cExcludedSubtree),

1 0

Henri Verbeet : secur32: Don' t bother zeroing the handle table in SECUR32_initSchannelSP().
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 3e96881e4c8fbf532a0112bdfc20dbd45f5ecd8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e96881e4c8fbf532a0112bdf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 15 10:36:45 2009 +0200 secur32: Don't bother zeroing the handle table in SECUR32_initSchannelSP(). Handles are initialized when they're allocated. --- dlls/secur32/schannel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 8b710a3..af94024 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1386,7 +1386,7 @@ void SECUR32_initSchannelSP(void) pgnutls_global_set_log_function(schan_gnutls_log); } - schan_handle_table = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 64 * sizeof(*schan_handle_table)); + schan_handle_table = HeapAlloc(GetProcessHeap(), 0, 64 * sizeof(*schan_handle_table)); if (!schan_handle_table) { ERR("Failed to allocate schannel handle table.\n");

1 0

Juan Lang : crypt32: Explicitly pass array pointer when decoding CRL entries rather than assuming a particular alignment .
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: abbbe940ac8b672e08cc23aae127de03d4240d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbbe940ac8b672e08cc23aae… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:42:24 2009 -0700 crypt32: Explicitly pass array pointer when decoding CRL entries rather than assuming a particular alignment. --- dlls/crypt32/decode.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 182 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abbbe940ac8b672e08cc2…

1 0

Juan Lang : crypt32: Explicitly pass array pointer when decoding cert extensions rather than assuming a particular alignment .
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: d2e683d86ae8b41458751f9ab6d520410e69a1cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e683d86ae8b41458751f9ab… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:43:14 2009 -0700 crypt32: Explicitly pass array pointer when decoding cert extensions rather than assuming a particular alignment. --- dlls/crypt32/decode.c | 57 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 1db77e4..c6ca92a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -81,6 +81,10 @@ static BOOL CRYPT_AsnDecodeChoiceOfTimeInternal(const BYTE *pbEncoded, static BOOL CRYPT_AsnDecodePubKeyInfoInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded); +/* Assumes pvStructInfo is a CERT_EXTENSION whose pszObjId is set ahead of time. + */ +static BOOL CRYPT_AsnDecodeExtension(const BYTE *pbEncoded, DWORD cbEncoded, + DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded); /* Like CRYPT_AsnDecodeExtensions, except assumes rgExtension is set ahead of * time, doesn't do memory allocation, and doesn't do exception handling. */ @@ -303,6 +307,7 @@ struct AsnDecodeSequenceItem DWORD size; }; +#define FINALMEMBERSIZE(s, member) (sizeof(s) - offsetof(s, member)) #define MEMBERSIZE(s, member, nextmember) \ (offsetof(s, nextmember) - offsetof(s, member)) @@ -1064,6 +1069,49 @@ static BOOL CRYPT_AsnDecodeValidity(const BYTE *pbEncoded, DWORD cbEncoded, return ret; } +static BOOL CRYPT_AsnDecodeCertExtensionsInternal(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret = TRUE; + struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, + CRYPT_AsnDecodeExtension, sizeof(CERT_EXTENSION), TRUE, + offsetof(CERT_EXTENSION, pszObjId) }; + DWORD itemSize; + + TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo, pcbDecoded); + + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + NULL, NULL, &itemSize, pcbDecoded); + if (ret) + { + DWORD bytesNeeded; + + /* The size expected by the caller includes the combination of + * CERT_INFO's cExtension and rgExtension, in addition to the size of + * all the decoded items. CRYPT_AsnDecodeArrayNoAlloc only returns + * the size of the decoded items, so add the size of cExtension and + * rgExtension. + */ + bytesNeeded = FINALMEMBERSIZE(CERT_INFO, cExtension) + itemSize; + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, NULL, pvStructInfo, + pcbStructInfo, bytesNeeded))) + { + CERT_INFO *info; + + info = (CERT_INFO *)((BYTE *)pvStructInfo - + offsetof(CERT_INFO, cExtension)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, + cbEncoded, &info->cExtension, info->rgExtension, &itemSize, + pcbDecoded); + } + } + return ret; +} + static BOOL CRYPT_AsnDecodeCertExtensions(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -1075,7 +1123,7 @@ static BOOL CRYPT_AsnDecodeCertExtensions(const BYTE *pbEncoded, { BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); - ret = CRYPT_AsnDecodeExtensionsInternal(pbEncoded + 1 + lenBytes, + ret = CRYPT_AsnDecodeCertExtensionsInternal(pbEncoded + 1 + lenBytes, dataLen, dwFlags, pvStructInfo, pcbStructInfo, NULL); if (ret && pcbDecoded) *pcbDecoded = 1 + lenBytes + dataLen; @@ -1117,8 +1165,8 @@ static BOOL CRYPT_AsnDecodeCertInfo(DWORD dwCertEncodingType, CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), TRUE, TRUE, offsetof(CERT_INFO, SubjectUniqueId.pbData), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR | 3, offsetof(CERT_INFO, cExtension), - CRYPT_AsnDecodeCertExtensions, sizeof(CERT_EXTENSIONS), TRUE, TRUE, - offsetof(CERT_INFO, rgExtension), 0 }, + CRYPT_AsnDecodeCertExtensions, FINALMEMBERSIZE(CERT_INFO, cExtension), + TRUE, TRUE, offsetof(CERT_INFO, rgExtension), 0 }, }; TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, @@ -1488,9 +1536,6 @@ static BOOL CRYPT_AsnDecodeOidInternal(const BYTE *pbEncoded, DWORD cbEncoded, return ret; } -/* Warning: assumes pvStructInfo is a CERT_EXTENSION whose pszObjId is set - * ahead of time! - */ static BOOL CRYPT_AsnDecodeExtension(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) {

1 0

Juan Lang : crypt32: Explicitly pass array pointer when decoding CRL entry extensions rather than assuming a particular alignment .
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: e0f3bf6836bf08290bc3ecb9cab349f63759e990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f3bf6836bf08290bc3ecb9c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:43:58 2009 -0700 crypt32: Explicitly pass array pointer when decoding CRL entry extensions rather than assuming a particular alignment. --- dlls/crypt32/decode.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index c6ca92a..6b553d4 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1248,6 +1248,49 @@ static BOOL WINAPI CRYPT_AsnDecodeCert(DWORD dwCertEncodingType, return ret; } +static BOOL CRYPT_AsnDecodeCRLEntryExtensions(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret = TRUE; + struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, + CRYPT_AsnDecodeExtension, sizeof(CERT_EXTENSION), TRUE, + offsetof(CERT_EXTENSION, pszObjId) }; + DWORD itemSize; + + TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo, pcbDecoded); + + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + NULL, NULL, &itemSize, pcbDecoded); + if (ret) + { + DWORD bytesNeeded; + + /* The size expected by the caller includes the combination of + * CRL_ENTRY's cExtension and rgExtension, in addition to the size of + * all the decoded items. CRYPT_AsnDecodeArrayNoAlloc only returns + * the size of the decoded items, so add the size of cExtension and + * rgExtension. + */ + bytesNeeded = FINALMEMBERSIZE(CRL_ENTRY, cExtension) + itemSize; + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, NULL, pvStructInfo, + pcbStructInfo, bytesNeeded))) + { + CRL_ENTRY *entry; + + entry = (CRL_ENTRY *)((BYTE *)pvStructInfo - + offsetof(CRL_ENTRY, cExtension)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, + cbEncoded, &entry->cExtension, entry->rgExtension, &itemSize, + pcbDecoded); + } + } + return ret; +} + static BOOL CRYPT_AsnDecodeCRLEntry(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { @@ -1259,7 +1302,8 @@ static BOOL CRYPT_AsnDecodeCRLEntry(const BYTE *pbEncoded, DWORD cbEncoded, { 0, offsetof(CRL_ENTRY, RevocationDate), CRYPT_AsnDecodeChoiceOfTimeInternal, sizeof(FILETIME), FALSE, FALSE, 0 }, { ASN_SEQUENCEOF, offsetof(CRL_ENTRY, cExtension), - CRYPT_AsnDecodeExtensionsInternal, sizeof(CERT_EXTENSIONS), TRUE, TRUE, + CRYPT_AsnDecodeCRLEntryExtensions, + FINALMEMBERSIZE(CRL_ENTRY, cExtension), TRUE, TRUE, offsetof(CRL_ENTRY, rgExtension), 0 }, }; PCRL_ENTRY entry = pvStructInfo;

1 0

Juan Lang : crypt32: Explicitly pass array pointer when decoding CRL extensions rather than assuming a particular alignment .
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: d1f94671e648091b178382434d549654adebfc17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f94671e648091b178382434… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:44:52 2009 -0700 crypt32: Explicitly pass array pointer when decoding CRL extensions rather than assuming a particular alignment. --- dlls/crypt32/decode.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 6b553d4..6a7270b 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1370,6 +1370,68 @@ static BOOL CRYPT_AsnDecodeCRLEntries(const BYTE *pbEncoded, DWORD cbEncoded, return ret; } +static BOOL CRYPT_AsnDecodeCRLExtensionsInternal(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret = TRUE; + struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, + CRYPT_AsnDecodeExtension, sizeof(CERT_EXTENSION), TRUE, + offsetof(CERT_EXTENSION, pszObjId) }; + DWORD itemSize; + + TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo, pcbDecoded); + + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + NULL, NULL, &itemSize, pcbDecoded); + if (ret) + { + DWORD bytesNeeded; + + /* The size expected by the caller includes the combination of + * CRL_INFO's cExtension and rgExtension, in addition to the size of + * all the decoded items. CRYPT_AsnDecodeArrayNoAlloc only returns + * the size of the decoded items, so add the size of cExtension and + * rgExtension. + */ + bytesNeeded = FINALMEMBERSIZE(CRL_INFO, cExtension) + itemSize; + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, NULL, pvStructInfo, + pcbStructInfo, bytesNeeded))) + { + CRL_INFO *info; + + info = (CRL_INFO *)((BYTE *)pvStructInfo - + offsetof(CRL_INFO, cExtension)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, + cbEncoded, &info->cExtension, info->rgExtension, &itemSize, + pcbDecoded); + } + } + return ret; +} + +static BOOL CRYPT_AsnDecodeCRLExtensions(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret; + DWORD dataLen; + + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + { + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + + ret = CRYPT_AsnDecodeCRLExtensionsInternal(pbEncoded + 1 + lenBytes, + dataLen, dwFlags, pvStructInfo, pcbStructInfo, NULL); + if (ret && pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; + } + return ret; +} + static BOOL CRYPT_AsnDecodeCRLInfo(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) @@ -1391,8 +1453,8 @@ static BOOL CRYPT_AsnDecodeCRLInfo(DWORD dwCertEncodingType, CRYPT_AsnDecodeCRLEntries, MEMBERSIZE(CRL_INFO, cCRLEntry, cExtension), TRUE, TRUE, offsetof(CRL_INFO, rgCRLEntry), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR | 0, offsetof(CRL_INFO, cExtension), - CRYPT_AsnDecodeCertExtensions, sizeof(CERT_EXTENSIONS), TRUE, TRUE, - offsetof(CRL_INFO, rgExtension), 0 }, + CRYPT_AsnDecodeCRLExtensions, FINALMEMBERSIZE(CRL_INFO, cExtension), + TRUE, TRUE, offsetof(CRL_INFO, rgExtension), 0 }, }; BOOL ret = TRUE;

1 0

Juan Lang : crypt32: Simplify CRYPT_AsnDecodeExtensions.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 9afaafc006a4a7f67b8b03e5a375d6a2826b4894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afaafc006a4a7f67b8b03e5a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:45:39 2009 -0700 crypt32: Simplify CRYPT_AsnDecodeExtensions. --- dlls/crypt32/decode.c | 60 ++++++++++++++++++++---------------------------- 1 files changed, 25 insertions(+), 35 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 6a7270b..c99a32e 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -85,12 +85,6 @@ static BOOL CRYPT_AsnDecodePubKeyInfoInternal(const BYTE *pbEncoded, */ static BOOL CRYPT_AsnDecodeExtension(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded); -/* Like CRYPT_AsnDecodeExtensions, except assumes rgExtension is set ahead of - * time, doesn't do memory allocation, and doesn't do exception handling. - */ -static BOOL CRYPT_AsnDecodeExtensionsInternal(const BYTE *pbEncoded, - DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, - DWORD *pcbDecoded); /* Assumes algo->Parameters.pbData is set ahead of time. */ static BOOL CRYPT_AsnDecodeAlgorithmId(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded); @@ -1673,51 +1667,47 @@ static BOOL CRYPT_AsnDecodeExtension(const BYTE *pbEncoded, DWORD cbEncoded, return ret; } -static BOOL CRYPT_AsnDecodeExtensionsInternal(const BYTE *pbEncoded, - DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, - DWORD *pcbDecoded) -{ - BOOL ret = TRUE; - struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, - CRYPT_AsnDecodeExtension, sizeof(CERT_EXTENSION), TRUE, - offsetof(CERT_EXTENSION, pszObjId) }; - PCERT_EXTENSIONS exts = pvStructInfo; - - TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, - pvStructInfo, *pcbStructInfo, pcbDecoded); - - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - NULL, pvStructInfo, pcbStructInfo, pcbDecoded, - exts ? exts->rgExtension : NULL); - return ret; -} - static BOOL WINAPI CRYPT_AsnDecodeExtensions(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) { BOOL ret = TRUE; + TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); + __TRY { - ret = CRYPT_AsnDecodeExtensionsInternal(pbEncoded, cbEncoded, - dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pcbStructInfo, NULL); - if (ret && pvStructInfo) + struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, + CRYPT_AsnDecodeExtension, sizeof(CERT_EXTENSION), TRUE, + offsetof(CERT_EXTENSION, pszObjId) }; + DWORD itemSize; + + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + NULL, NULL, &itemSize, NULL); + if (ret) { - ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, - pcbStructInfo, *pcbStructInfo); - if (ret) + DWORD bytesNeeded; + + /* CRYPT_AsnDecodeArrayNoAlloc only returns the size of the decoded + * items, so add the size of CERT_EXTENSIONS. + */ + bytesNeeded = sizeof(CERT_EXTENSIONS) + itemSize; + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, bytesNeeded))) { CERT_EXTENSIONS *exts; if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) pvStructInfo = *(BYTE **)pvStructInfo; - exts = pvStructInfo; + exts = (CERT_EXTENSIONS *)pvStructInfo; exts->rgExtension = (CERT_EXTENSION *)((BYTE *)exts + sizeof(CERT_EXTENSIONS)); - ret = CRYPT_AsnDecodeExtensionsInternal(pbEncoded, cbEncoded, - dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, - pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, + cbEncoded, &exts->cExtension, exts->rgExtension, &itemSize, + NULL); } } }

1 0

Paul Vriens : dinput/tests: Fix a few intermittent test failures.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 5a40c65cfeadf7c7126a5560b115016744fd2d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a40c65cfeadf7c7126a5560b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 15 09:20:00 2009 +0200 dinput/tests: Fix a few intermittent test failures. --- dlls/dinput/tests/mouse.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 520a867..09b2b27 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -71,6 +71,7 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) HRESULT hr; LPDIRECTINPUTDEVICE pMouse = NULL; DIMOUSESTATE m_state; + HWND hwnd2; hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -89,8 +90,10 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) ok(hr == S_FALSE, "IDirectInputDevice_Acquire() should have failed: %08x\n", hr); /* Foreground coop level requires window to have focus */ - /* This should make dinput loose mouse input */ - SetActiveWindow( 0 ); + /* Create a temporary window, this should make dinput + * loose mouse input */ + hwnd2 = CreateWindow("static", "Temporary", WS_VISIBLE, + 10, 210, 200, 200, NULL, NULL, NULL, NULL); hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr); @@ -105,6 +108,8 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) ok(hr == S_OK, "Acquire() failed: %08x\n", hr); if (pMouse) IUnknown_Release(pMouse); + + DestroyWindow( hwnd2 ); } static void mouse_tests(void)

1 0