October 2009 - Wine-Commits

Juan Lang : crypt32: Explicitly pass array pointer when decoding PKCS attribute values rather than assuming a particular alignment .
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 65296a476d08bb8f332b81f4d519361e02a069d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65296a476d08bb8f332b81f4d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:47:27 2009 -0700 crypt32: Explicitly pass array pointer when decoding PKCS attribute values 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 50d99b4..a9f3383 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2884,6 +2884,37 @@ static BOOL WINAPI CRYPT_AsnDecodePolicyQualifierUserNotice( return ret; } +static BOOL CRYPT_AsnDecodePKCSAttributeValue(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 += FINALMEMBERSIZE(CRYPT_ATTRIBUTE, cValue); + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(0, NULL, pvStructInfo, + pcbStructInfo, bytesNeeded))) + { + CRYPT_ATTRIBUTE *attr = (CRYPT_ATTRIBUTE *)((BYTE *)pvStructInfo - + offsetof(CRYPT_ATTRIBUTE, cValue)); + + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + &attr->cValue, attr->rgValue, pcbStructInfo, pcbDecoded); + } + } + return ret; +} + static BOOL CRYPT_AsnDecodePKCSAttributeInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -2894,8 +2925,9 @@ static BOOL CRYPT_AsnDecodePKCSAttributeInternal(const BYTE *pbEncoded, CRYPT_AsnDecodeOidIgnoreTag, 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 }, + CRYPT_AsnDecodePKCSAttributeValue, + FINALMEMBERSIZE(CRYPT_ATTRIBUTE, cValue), FALSE, + TRUE, offsetof(CRYPT_ATTRIBUTE, rgValue), 0 }, }; PCRYPT_ATTRIBUTE attr = pvStructInfo;

1 0

Juan Lang : crypt32: Simplify CRYPT_AsnDecodeSMIMECapabilities.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: b8f696ff626c3dd85bcd9ce046f4b7378f097a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f696ff626c3dd85bcd9ce04… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:46:53 2009 -0700 crypt32: Simplify CRYPT_AsnDecodeSMIMECapabilities. --- dlls/crypt32/decode.c | 31 +++++++++---------------------- 1 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 922b8c1..50d99b4 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2500,22 +2500,6 @@ static BOOL CRYPT_AsnDecodeSMIMECapability(const BYTE *pbEncoded, return ret; } -static BOOL CRYPT_AsnDecodeSMIMECapabilitiesInternal(const BYTE *pbEncoded, - DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, - DWORD *pcbDecoded) -{ - struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, - CRYPT_AsnDecodeSMIMECapability, sizeof(CRYPT_SMIME_CAPABILITY), TRUE, - offsetof(CRYPT_SMIME_CAPABILITY, pszObjId) }; - PCRYPT_SMIME_CAPABILITIES capabilities = pvStructInfo; - BOOL ret; - - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - NULL, pvStructInfo, pcbStructInfo, pcbDecoded, - capabilities ? capabilities->rgCapability : NULL); - return ret; -} - static BOOL WINAPI CRYPT_AsnDecodeSMIMECapabilities(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) @@ -2528,11 +2512,14 @@ static BOOL WINAPI CRYPT_AsnDecodeSMIMECapabilities(DWORD dwCertEncodingType, __TRY { DWORD bytesNeeded; + struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, + CRYPT_AsnDecodeSMIMECapability, sizeof(CRYPT_SMIME_CAPABILITY), TRUE, + offsetof(CRYPT_SMIME_CAPABILITY, pszObjId) }; - if ((ret = CRYPT_AsnDecodeSMIMECapabilitiesInternal(pbEncoded, - cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, - NULL))) + if ((ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + NULL, NULL, &bytesNeeded, NULL))) { + bytesNeeded += sizeof(CRYPT_SMIME_CAPABILITIES); if (!pvStructInfo) *pcbStructInfo = bytesNeeded; else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, @@ -2546,9 +2533,9 @@ static BOOL WINAPI CRYPT_AsnDecodeSMIMECapabilities(DWORD dwCertEncodingType, capabilities->rgCapability = (PCRYPT_SMIME_CAPABILITY)((BYTE *)pvStructInfo + sizeof(CRYPT_SMIME_CAPABILITIES)); - ret = CRYPT_AsnDecodeSMIMECapabilitiesInternal(pbEncoded, - cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, - &bytesNeeded, NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, + pbEncoded, cbEncoded, &capabilities->cCapability, + capabilities->rgCapability, pcbStructInfo, NULL); } } }

1 0

Juan Lang : crypt32: Let decoder helpers do more sanity checking.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 6ef1c3e09f8f4e1b62cc1bdded8030928443241b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef1c3e09f8f4e1b62cc1bdde… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:46:16 2009 -0700 crypt32: Let decoder helpers do more sanity checking. --- dlls/crypt32/decode.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index c99a32e..922b8c1 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -604,7 +604,12 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, cbEncoded, dwFlags, pDecodePara, pvStructInfo, *pcbStructInfo, startingPointer); - if (!arrayDesc->tag || pbEncoded[0] == arrayDesc->tag) + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + ret = FALSE; + } + else if (!arrayDesc->tag || pbEncoded[0] == arrayDesc->tag) { DWORD dataLen; @@ -765,7 +770,12 @@ static BOOL CRYPT_AsnDecodeArrayNoAlloc(const struct AsnArrayDescriptor *arrayDe TRACE("%p, %p, %d, %p, %p, %d\n", arrayDesc, pbEncoded, cbEncoded, pcItems, rgItems, pcItems ? *pcbItems : 0); - if (!arrayDesc->tag || pbEncoded[0] == arrayDesc->tag) + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + ret = FALSE; + } + else if (!arrayDesc->tag || pbEncoded[0] == arrayDesc->tag) { DWORD dataLen; @@ -2494,7 +2504,7 @@ static BOOL CRYPT_AsnDecodeSMIMECapabilitiesInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { - struct AsnArrayDescriptor arrayDesc = { 0, + struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, CRYPT_AsnDecodeSMIMECapability, sizeof(CRYPT_SMIME_CAPABILITY), TRUE, offsetof(CRYPT_SMIME_CAPABILITY, pszObjId) }; PCRYPT_SMIME_CAPABILITIES capabilities = pvStructInfo; @@ -2519,11 +2529,7 @@ static BOOL WINAPI CRYPT_AsnDecodeSMIMECapabilities(DWORD dwCertEncodingType, { DWORD bytesNeeded; - if (!cbEncoded) - SetLastError(CRYPT_E_ASN1_EOD); - else if (pbEncoded[0] != ASN_SEQUENCEOF) - SetLastError(CRYPT_E_ASN1_CORRUPT); - else if ((ret = CRYPT_AsnDecodeSMIMECapabilitiesInternal(pbEncoded, + if ((ret = CRYPT_AsnDecodeSMIMECapabilitiesInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL))) { @@ -2989,9 +2995,7 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSAttributes(DWORD dwCertEncodingType, { DWORD bytesNeeded; - if (!cbEncoded) - SetLastError(CRYPT_E_ASN1_EOD); - else if (pbEncoded[0] != (ASN_CONSTRUCTOR | ASN_SETOF)) + if (pbEncoded[0] != (ASN_CONSTRUCTOR | ASN_SETOF)) SetLastError(CRYPT_E_ASN1_CORRUPT); else if ((ret = CRYPT_AsnDecodePKCSAttributesInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded,

1 0

Juan Lang : crypt32: Simplify CRYPT_AsnDecodeExtensions.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

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

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

Oct. 15, 2009

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 extensions rather than assuming a particular alignment .
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

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: Explicitly pass array pointer when decoding cert extensions rather than assuming a particular alignment .
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

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 entries rather than assuming a particular alignment .
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

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 CRL entry extensions rather than assuming a particular alignment .
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

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

Henri Verbeet : secur32: Don' t try to cleanup uninitialized handles in SECUR32_deinitSchannelSP().
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 226519efbc38c438a5db28ba476ece6ef9d9529b URL: http://source.winehq.org/git/wine.git/?a=commit;h=226519efbc38c438a5db28ba4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 15 10:36:44 2009 +0200 secur32: Don't try to cleanup uninitialized handles in SECUR32_deinitSchannelSP(). --- dlls/secur32/schannel.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 380cfed..8b710a3 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1415,13 +1415,13 @@ fail: void SECUR32_deinitSchannelSP(void) { - int i = schan_handle_table_size; + SIZE_T i = schan_handle_count; if (!libgnutls_handle) return; /* deinitialized sessions first because a pointer to the credentials * are stored for the session by calling gnutls_credentials_set. */ - while (--i) + while (i--) { if (schan_handle_table[i].type == SCHAN_HANDLE_CTX) { @@ -1430,8 +1430,8 @@ void SECUR32_deinitSchannelSP(void) HeapFree(GetProcessHeap(), 0, ctx); } } - i = schan_handle_table_size; - while (--i) + i = schan_handle_count; + while (i--) { if (schan_handle_table[i].type != SCHAN_HANDLE_FREE) {

1 0