October 2009 - Wine-Commits

Juan Lang : crypt32: Correct a sequence item size.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: fd2a4c4330235ec9eb9a2da3501e06d80d86ca1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2a4c4330235ec9eb9a2da35… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:03:25 2009 -0700 crypt32: Correct a sequence item size. --- dlls/crypt32/decode.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index d9475c4..925f632 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3802,7 +3802,8 @@ static BOOL CRYPT_AsnDecodeCertPolicy(const BYTE *pbEncoded, DWORD cbEncoded, CRYPT_AsnDecodeOidInternal, sizeof(LPSTR), FALSE, TRUE, offsetof(CERT_POLICY_INFO, pszPolicyIdentifier), 0 }, { ASN_SEQUENCEOF, offsetof(CERT_POLICY_INFO, cPolicyQualifier), - CRYPT_AsnDecodePolicyQualifiers, sizeof(struct GenericArray), TRUE, + CRYPT_AsnDecodePolicyQualifiers, + FINALMEMBERSIZE(CERT_POLICY_INFO, cPolicyQualifier), TRUE, TRUE, offsetof(CERT_POLICY_INFO, rgPolicyQualifier), 0 }, }; CERT_POLICY_INFO *info = pvStructInfo;

1 0

Juan Lang : crypt32: Pass decode flags to CRYPT_AsnDecodeArrayNoAlloc.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: a8f5934f44979093bb133ca385173e02883a78bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f5934f44979093bb133ca38… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:02:18 2009 -0700 crypt32: Pass decode flags to CRYPT_AsnDecodeArrayNoAlloc. --- dlls/crypt32/decode.c | 57 +++++++++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8f5934f44979093bb133…

1 0

Juan Lang : crypt32: Further simplify calling CRYPT_AsnDecodeArrayNoAlloc.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 136eedb9af789b5732080a744caa1b8b79afb81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=136eedb9af789b5732080a744… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:01:48 2009 -0700 crypt32: Further simplify calling CRYPT_AsnDecodeArrayNoAlloc. --- dlls/crypt32/decode.c | 293 ++++--------------------------------------------- 1 files changed, 22 insertions(+), 271 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=136eedb9af789b5732080…

1 0

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

Oct. 15, 2009

Module: wine Branch: master Commit: c64f31087fb2849968a57ae9b4a0db2b3369ecaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64f31087fb2849968a57ae9b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:59:50 2009 -0700 crypt32: Simplify calling CRYPT_AsnDecodeArrayNoAlloc. --- dlls/crypt32/decode.c | 119 ++++++++++++++++++++++--------------------------- 1 files changed, 53 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c64f31087fb2849968a57…

1 0

Juan Lang : crypt32: Let CRYPT_AsnDecodeArrayNoAlloc calculate array size rather than requiring every caller to do so .
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 271b47717172f76e9d268a83e5febafe0eb68a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=271b47717172f76e9d268a83e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:01:00 2009 -0700 crypt32: Let CRYPT_AsnDecodeArrayNoAlloc calculate array size rather than requiring every caller to do so. --- dlls/crypt32/decode.c | 182 +++++++++++++++++-------------------------------- 1 files changed, 63 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=271b47717172f76e9d268…

1 0

Juan Lang : crypt32: Add array descriptor members describing offsets of outer structure.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 3c14587e1803396ae51b8adc1a84f431152d6f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c14587e1803396ae51b8adc1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:58:49 2009 -0700 crypt32: Add array descriptor members describing offsets of outer structure. --- dlls/crypt32/decode.c | 78 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 70 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c14587e1803396ae51b8…

1 0

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

Oct. 15, 2009

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

Oct. 15, 2009

Module: wine Branch: master Commit: 6d74aac002e1168ee995e40369d207b7f7990bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d74aac002e1168ee995e4036… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:54:23 2009 -0700 crypt32: Explicitly pass array pointer when decoding policy qualifier notice numbers rather than assuming a particular alignment. --- dlls/crypt32/decode.c | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 9eb9bb8..72386fb 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2663,21 +2663,45 @@ static BOOL CRYPT_AsnDecodeIA5String(const BYTE *pbEncoded, return ret; } -static BOOL CRYPT_AsnDecodeIntArray(const BYTE *pbEncoded, +static BOOL CRYPT_AsnDecodeNoticeNumbers(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, CRYPT_AsnDecodeIntInternal, sizeof(int), FALSE, 0 }; - struct GenericArray *array = pvStructInfo; + DWORD bytesNeeded; BOOL ret; TRACE("(%p, %d, %08x, %p, %d)\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, pvStructInfo ? *pcbDecoded : 0); - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - NULL, pvStructInfo, pcbStructInfo, pcbDecoded, - array ? array->rgItems : NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, + NULL, NULL, &bytesNeeded, pcbDecoded); + if (ret) + { + /* The size expected by the caller includes the combination of + * CERT_POLICY_QUALIFIER_NOTICE_REFERENCE's cNoticeNumbers and + * rgNoticeNumbers, 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 cNoticeNumbers and rgNoticeNumbers. + */ + bytesNeeded += FINALMEMBERSIZE(CERT_POLICY_QUALIFIER_NOTICE_REFERENCE, + cNoticeNumbers); + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, NULL, pvStructInfo, + pcbStructInfo, bytesNeeded))) + { + CERT_POLICY_QUALIFIER_NOTICE_REFERENCE *ref; + + ref = (CERT_POLICY_QUALIFIER_NOTICE_REFERENCE *) + ((BYTE *)pvStructInfo - + offsetof(CERT_POLICY_QUALIFIER_NOTICE_REFERENCE, cNoticeNumbers)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, + cbEncoded, &ref->cNoticeNumbers, ref->rgNoticeNumbers, + &bytesNeeded, pcbDecoded); + } + } TRACE("returning %d\n", ret); return ret; } @@ -2692,7 +2716,8 @@ static BOOL CRYPT_AsnDecodeNoticeReference(const BYTE *pbEncoded, pszOrganization), CRYPT_AsnDecodeIA5String, sizeof(LPSTR), FALSE, TRUE, offsetof(CERT_POLICY_QUALIFIER_NOTICE_REFERENCE, pszOrganization), 0 }, { ASN_SEQUENCEOF, offsetof(CERT_POLICY_QUALIFIER_NOTICE_REFERENCE, - cNoticeNumbers), CRYPT_AsnDecodeIntArray, sizeof(struct GenericArray), + cNoticeNumbers), CRYPT_AsnDecodeNoticeNumbers, + FINALMEMBERSIZE(CERT_POLICY_QUALIFIER_NOTICE_REFERENCE, cNoticeNumbers), FALSE, TRUE, offsetof(CERT_POLICY_QUALIFIER_NOTICE_REFERENCE, rgNoticeNumbers), 0 }, };

1 0

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

Oct. 15, 2009

Module: wine Branch: master Commit: 117ea9ee91728801ccd15fda724d96a293f129f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=117ea9ee91728801ccd15fda7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:55:05 2009 -0700 crypt32: Explicitly pass array pointer when decoding basic constraints' subtrees rather than assuming a particular alignment. --- dlls/crypt32/decode.c | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 72386fb..7475a83 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3804,14 +3804,39 @@ static BOOL CRYPT_AsnDecodeSubtreeConstraints(const BYTE *pbEncoded, struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, CRYPT_AsnDecodeCopyBytes, sizeof(CERT_NAME_BLOB), TRUE, offsetof(CERT_NAME_BLOB, 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 + * CERT_BASIC_CONSTRAINTS_INFO's cSubtreesConstraint and + * rgSubtreesConstraint, 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 cSubtreesConstraint and + * rgSubtreesConstraint. + */ + bytesNeeded += FINALMEMBERSIZE(CERT_BASIC_CONSTRAINTS_INFO, + cSubtreesConstraint); + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, NULL, pvStructInfo, + pcbStructInfo, bytesNeeded))) + { + CERT_BASIC_CONSTRAINTS_INFO *constraint; + + constraint = (CERT_BASIC_CONSTRAINTS_INFO *) + ((BYTE *)pvStructInfo - + offsetof(CERT_BASIC_CONSTRAINTS_INFO, cSubtreesConstraint)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, + cbEncoded, &constraint->cSubtreesConstraint, + constraint->rgSubtreesConstraint, &bytesNeeded, pcbDecoded); + } + } TRACE("Returning %d (%08x)\n", ret, GetLastError()); return ret; } @@ -3833,7 +3858,8 @@ static BOOL WINAPI CRYPT_AsnDecodeBasicConstraints(DWORD dwCertEncodingType, sizeof(struct PATH_LEN_CONSTRAINT), TRUE, FALSE, 0, 0 }, { ASN_SEQUENCEOF, offsetof(CERT_BASIC_CONSTRAINTS_INFO, cSubtreesConstraint), CRYPT_AsnDecodeSubtreeConstraints, - sizeof(struct GenericArray), TRUE, TRUE, + FINALMEMBERSIZE(CERT_BASIC_CONSTRAINTS_INFO, cSubtreesConstraint), + TRUE, TRUE, offsetof(CERT_BASIC_CONSTRAINTS_INFO, rgSubtreesConstraint), 0 }, };

1 0

Juan Lang : crypt32: Remove a redundant trace.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 362abb6fa97c93c2b5f8c5a1c7a2dedc491eaf43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=362abb6fa97c93c2b5f8c5a1c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 12:53:33 2009 -0700 crypt32: Remove a redundant trace. --- dlls/crypt32/decode.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 5aec82d..9eb9bb8 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2528,9 +2528,6 @@ static BOOL WINAPI CRYPT_AsnDecodeCTL(DWORD dwCertEncodingType, TRUE, TRUE, offsetof(CTL_INFO, rgExtension), 0 }, }; - TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, *pcbStructInfo); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL);

1 0