October 2009 - Wine-commits

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

15 Oct '09

Module: wine Branch: master Commit: c7e3ea148470995b2c7ae6f228eadb7313bd5064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e3ea148470995b2c7ae6f22… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:56:38 2009 -0700 crypt32: Explicitly pass array pointer when decoding CTL entry attributes rather than assuming a particular alignment. --- dlls/crypt32/decode.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index fdd0251..8c0b4bd 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -111,7 +111,7 @@ static BOOL CRYPT_AsnDecodeIntegerInternal(const BYTE *pbEncoded, static BOOL CRYPT_AsnDecodeUnsignedIntegerInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded); -static BOOL CRYPT_AsnDecodePKCSAttributesInternal(const BYTE *pbEncoded, +static BOOL CRYPT_AsnDecodePKCSAttributeInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded); @@ -2362,6 +2362,38 @@ static BOOL CRYPT_AsnDecodeCTLUsage(const BYTE *pbEncoded, DWORD cbEncoded, return ret; } +static BOOL CRYPT_AsnDecodeCTLEntryAttributes(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + struct AsnArrayDescriptor arrayDesc = { 0, + CRYPT_AsnDecodePKCSAttributeInternal, sizeof(CRYPT_ATTRIBUTE), TRUE, + offsetof(CRYPT_ATTRIBUTE, pszObjId) }; + DWORD bytesNeeded; + BOOL ret; + + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + NULL, NULL, &bytesNeeded, pcbDecoded); + if (ret) + { + bytesNeeded += FINALMEMBERSIZE(CTL_ENTRY, cAttribute); + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, NULL, pvStructInfo, + pcbStructInfo, bytesNeeded))) + { + CTL_ENTRY *entry; + + entry = (CTL_ENTRY *)((BYTE *)pvStructInfo - + offsetof(CTL_ENTRY, cAttribute)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, + cbEncoded, &entry->cAttribute, entry->rgAttribute, &bytesNeeded, + pcbDecoded); + } + } + return ret; +} + static BOOL CRYPT_AsnDecodeCTLEntry(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { @@ -2370,8 +2402,9 @@ static BOOL CRYPT_AsnDecodeCTLEntry(const BYTE *pbEncoded, DWORD cbEncoded, CRYPT_AsnDecodeOctetsInternal, sizeof(CRYPT_DATA_BLOB), FALSE, TRUE, offsetof(CTL_ENTRY, SubjectIdentifier.pbData), 0 }, { ASN_CONSTRUCTOR | ASN_SETOF, offsetof(CTL_ENTRY, cAttribute), - CRYPT_AsnDecodePKCSAttributesInternal, sizeof(CRYPT_ATTRIBUTES), FALSE, - TRUE, offsetof(CTL_ENTRY, rgAttribute), 0 }, + CRYPT_AsnDecodeCTLEntryAttributes, + FINALMEMBERSIZE(CTL_ENTRY, cAttribute), FALSE, TRUE, + offsetof(CTL_ENTRY, rgAttribute), 0 }, }; BOOL ret = TRUE; CTL_ENTRY *entry = pvStructInfo;

1 0

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

15 Oct '09

Module: wine Branch: master Commit: 77cfb32360801e11b5e631e8fca7db397cc6e5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=77cfb32360801e11b5e631e8f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:57:21 2009 -0700 crypt32: Simplify CRYPT_AsnDecodePKCSAttributes. --- dlls/crypt32/decode.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 8c0b4bd..42513c0 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3135,14 +3135,15 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSAttributes(DWORD dwCertEncodingType, __TRY { + struct AsnArrayDescriptor arrayDesc = { ASN_CONSTRUCTOR | ASN_SETOF, + CRYPT_AsnDecodePKCSAttributeInternal, sizeof(CRYPT_ATTRIBUTE), TRUE, + offsetof(CRYPT_ATTRIBUTE, pszObjId) }; DWORD bytesNeeded; - 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, - NULL))) + if ((ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, + cbEncoded, NULL, NULL, &bytesNeeded, NULL))) { + bytesNeeded += sizeof(CRYPT_ATTRIBUTES); if (!pvStructInfo) *pcbStructInfo = bytesNeeded; else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, @@ -3155,9 +3156,8 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSAttributes(DWORD dwCertEncodingType, attrs = pvStructInfo; attrs->rgAttr = (PCRYPT_ATTRIBUTE)((BYTE *)pvStructInfo + sizeof(CRYPT_ATTRIBUTES)); - ret = CRYPT_AsnDecodePKCSAttributesInternal(pbEncoded, - cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, - &bytesNeeded, NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, + cbEncoded, &attrs->cAttr, attrs->rgAttr, &bytesNeeded, NULL); } } }

1 0

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

15 Oct '09

Module: wine Branch: master Commit: 26bfd0281c9931633b033564844d9db6e61ef47a URL: http://source.winehq.org/git/wine.git/?a=commit;h=26bfd0281c9931633b0335648… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:49:49 2009 -0700 crypt32: Explicitly pass array pointer when decoding name constraints' excluded subtrees rather than assuming a particular alignment. --- dlls/crypt32/decode.c | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 084b149..296799c 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5198,7 +5198,7 @@ static BOOL CRYPT_AsnDecodePermittedSubtree(const BYTE *pbEncoded, return ret; } -static BOOL CRYPT_AsnDecodeSubtreeArray(const BYTE *pbEncoded, +static BOOL CRYPT_AsnDecodeExcludedSubtree(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { @@ -5206,18 +5206,33 @@ static BOOL CRYPT_AsnDecodeSubtreeArray(const BYTE *pbEncoded, struct AsnArrayDescriptor arrayDesc = { 0, CRYPT_AsnDecodeSubtree, sizeof(CERT_GENERAL_SUBTREE), TRUE, offsetof(CERT_GENERAL_SUBTREE, Base.u.pwszURL) }; - struct GenericArray *array = pvStructInfo; + DWORD bytesNeeded; 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); + if ((ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + NULL, NULL, &bytesNeeded, pcbDecoded))) + { + bytesNeeded += FINALMEMBERSIZE(CERT_NAME_CONSTRAINTS_INFO, + 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, cExcludedSubtree)); + + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + &info->cExcludedSubtree, info->rgExcludedSubtree, &bytesNeeded, + pcbDecoded); + } + } return ret; } - static BOOL WINAPI CRYPT_AsnDecodeNameConstraints(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) @@ -5238,7 +5253,9 @@ static BOOL WINAPI CRYPT_AsnDecodeNameConstraints(DWORD dwCertEncodingType, offsetof(CERT_NAME_CONSTRAINTS_INFO, rgPermittedSubtree), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR | 1, offsetof(CERT_NAME_CONSTRAINTS_INFO, cExcludedSubtree), - CRYPT_AsnDecodeSubtreeArray, sizeof(struct GenericArray), TRUE, TRUE, + CRYPT_AsnDecodeExcludedSubtree, + FINALMEMBERSIZE(CERT_NAME_CONSTRAINTS_INFO, cExcludedSubtree), + TRUE, TRUE, offsetof(CERT_NAME_CONSTRAINTS_INFO, rgExcludedSubtree), 0 }, };

1 0

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

15 Oct '09

Module: wine Branch: master Commit: e87dc9c530c737781339d1fa927d4f08d92ae923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e87dc9c530c737781339d1fa9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:50:50 2009 -0700 crypt32: Simplify CRYPT_AsnDecodeDistPointName. --- dlls/crypt32/decode.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 296799c..7e895eb 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -4931,15 +4931,10 @@ static BOOL CRYPT_AsnDecodeDistPointName(const BYTE *pbEncoded, if (dataLen) { - ret = CRYPT_AsnDecodeArray(&arrayDesc, + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded + 1 + lenBytes, cbEncoded - 1 - lenBytes, - 0, NULL, NULL, &nameLen, NULL, NULL); - /* The CERT_ALT_NAME_INFO's size is included by CRYPT_AsnDecodeArray - * as the sizeof(struct GenericArray), so don't include it in the - * total bytes needed. - */ - bytesNeeded = sizeof(CRL_DIST_POINT_NAME) + nameLen - - sizeof(CERT_ALT_NAME_INFO); + NULL, NULL, &nameLen, NULL); + bytesNeeded = sizeof(CRL_DIST_POINT_NAME) + nameLen; } else bytesNeeded = sizeof(CRL_DIST_POINT_NAME); @@ -4961,10 +4956,10 @@ static BOOL CRYPT_AsnDecodeDistPointName(const BYTE *pbEncoded, if (dataLen) { name->dwDistPointNameChoice = CRL_DIST_POINT_FULL_NAME; - ret = CRYPT_AsnDecodeArray(&arrayDesc, + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded + 1 + lenBytes, cbEncoded - 1 - lenBytes, - 0, NULL, &name->u.FullName, &nameLen, NULL, - name->u.FullName.rgAltEntry); + &name->u.FullName.cAltEntry, name->u.FullName.rgAltEntry, + &nameLen, NULL); } else name->dwDistPointNameChoice = CRL_DIST_POINT_NO_NAME;

1 0

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

15 Oct '09

Module: wine Branch: master Commit: 030cd8f594cf9187591cb0a642f2790f7e200cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=030cd8f594cf9187591cb0a64… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:51:30 2009 -0700 crypt32: Explicitly pass array pointer when decoding CMS message signers rather than assuming a particular alignment. --- dlls/crypt32/decode.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 7e895eb..d8f93f6 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5573,14 +5573,28 @@ static BOOL CRYPT_DecodeSignerArray(const BYTE *pbEncoded, DWORD cbEncoded, struct AsnArrayDescriptor arrayDesc = { ASN_CONSTRUCTOR | ASN_SETOF, CRYPT_AsnDecodeCMSSignerInfoInternal, sizeof(CMSG_CMS_SIGNER_INFO), TRUE, offsetof(CMSG_CMS_SIGNER_INFO, SignerId.u.KeyId.pbData) }; - struct GenericArray *array = pvStructInfo; + DWORD bytesNeeded; 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); + if ((ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + NULL, NULL, &bytesNeeded, pcbDecoded))) + { + bytesNeeded += FINALMEMBERSIZE(CRYPT_SIGNED_INFO, cSignerInfo); + 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, cSignerInfo)); + + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + &info->cSignerInfo, info->rgSignerInfo, &bytesNeeded, + pcbDecoded); + } + } return ret; } @@ -5608,7 +5622,8 @@ BOOL CRYPT_AsnDecodeCMSSignedInfo(const BYTE *pbEncoded, DWORD cbEncoded, 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, + CRYPT_DecodeSignerArray, + FINALMEMBERSIZE(CRYPT_SIGNED_INFO, cSignerInfo), TRUE, TRUE, offsetof(CRYPT_SIGNED_INFO, rgSignerInfo), 0 }, };

1 0

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

15 Oct '09

Module: wine Branch: master Commit: 8aefb325234d658bb282b062a708547b83e3dc02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aefb325234d658bb282b062a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:52:14 2009 -0700 crypt32: Explicitly pass array pointer when decoding CTL entries rather than assuming a particular alignment. --- dlls/crypt32/decode.c | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index d8f93f6..60797d5 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2392,14 +2392,36 @@ static BOOL CRYPT_AsnDecodeCTLEntries(const BYTE *pbEncoded, DWORD cbEncoded, struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, CRYPT_AsnDecodeCTLEntry, sizeof(CTL_ENTRY), TRUE, offsetof(CTL_ENTRY, SubjectIdentifier.pbData) }; - struct GenericArray *entries = pvStructInfo; + DWORD bytesNeeded; 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, - entries ? entries->rgItems : NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + NULL, NULL, &bytesNeeded, pcbDecoded); + if (ret) + { + /* The size expected by the caller includes the combination of + * CTL_INFO's cCTLEntry and rgCTLEntry, 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 cCTLEntry and + * rgCTLEntry. + */ + bytesNeeded += MEMBERSIZE(CTL_INFO, cCTLEntry, cExtension); + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, NULL, pvStructInfo, + pcbStructInfo, bytesNeeded))) + { + CTL_INFO *info; + + info = (CTL_INFO *)((BYTE *)pvStructInfo - + offsetof(CTL_INFO, cCTLEntry)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, + cbEncoded, &info->cCTLEntry, info->rgCTLEntry, &bytesNeeded, + pcbDecoded); + } + } return ret; } @@ -2436,7 +2458,8 @@ static BOOL WINAPI CRYPT_AsnDecodeCTL(DWORD dwCertEncodingType, CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), FALSE, TRUE, offsetof(CTL_INFO, SubjectAlgorithm.pszObjId), 0 }, { ASN_SEQUENCEOF, offsetof(CTL_INFO, cCTLEntry), - CRYPT_AsnDecodeCTLEntries, sizeof(struct GenericArray), + CRYPT_AsnDecodeCTLEntries, + MEMBERSIZE(CTL_INFO, cCTLEntry, cExtension), TRUE, TRUE, offsetof(CTL_INFO, rgCTLEntry), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR | 0, offsetof(CTL_INFO, cExtension), CRYPT_AsnDecodeCertExtensions, sizeof(CERT_EXTENSIONS), TRUE, TRUE,

1 0

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

15 Oct '09

Module: wine Branch: master Commit: 3270451ec097f1d346fc83eacab93d021845d773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3270451ec097f1d346fc83eac… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:52:59 2009 -0700 crypt32: Explicitly pass array pointer when decoding CTL 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 60797d5..5aec82d 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2425,6 +2425,68 @@ static BOOL CRYPT_AsnDecodeCTLEntries(const BYTE *pbEncoded, DWORD cbEncoded, return ret; } +static BOOL CRYPT_AsnDecodeCTLExtensionsInternal(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 + * CTL_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(CTL_INFO, cExtension) + itemSize; + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, NULL, pvStructInfo, + pcbStructInfo, bytesNeeded))) + { + CTL_INFO *info; + + info = (CTL_INFO *)((BYTE *)pvStructInfo - + offsetof(CTL_INFO, cExtension)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, + cbEncoded, &info->cExtension, info->rgExtension, &itemSize, + pcbDecoded); + } + } + return ret; +} + +static BOOL CRYPT_AsnDecodeCTLExtensions(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_AsnDecodeCTLExtensionsInternal(pbEncoded + 1 + lenBytes, + dataLen, dwFlags, pvStructInfo, pcbStructInfo, NULL); + if (ret && pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; + } + return ret; +} + static BOOL WINAPI CRYPT_AsnDecodeCTL(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) @@ -2462,8 +2524,8 @@ static BOOL WINAPI CRYPT_AsnDecodeCTL(DWORD dwCertEncodingType, MEMBERSIZE(CTL_INFO, cCTLEntry, cExtension), TRUE, TRUE, offsetof(CTL_INFO, rgCTLEntry), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR | 0, offsetof(CTL_INFO, cExtension), - CRYPT_AsnDecodeCertExtensions, sizeof(CERT_EXTENSIONS), TRUE, TRUE, - offsetof(CTL_INFO, rgExtension), 0 }, + CRYPT_AsnDecodeCTLExtensions, FINALMEMBERSIZE(CTL_INFO, cExtension), + TRUE, TRUE, offsetof(CTL_INFO, rgExtension), 0 }, }; TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,

1 0

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

15 Oct '09

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_AsnDecodeSMIMECapabilities.
by Alexandre Julliard 15 Oct '09

15 Oct '09

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: Explicitly pass array pointer when decoding PKCS attribute values rather than assuming a particular alignment .
by Alexandre Julliard 15 Oct '09

15 Oct '09

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