September 2007 - Wine-Commits

Juan Lang : crypt32: Allow indefinite-length encoding of sequence items.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: 34aaabca830018d6a5212e0a91f3a25032601fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34aaabca830018d6a5212e0a9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:26:51 2007 -0700 crypt32: Allow indefinite-length encoding of sequence items. --- dlls/crypt32/decode.c | 40 +++++++++++++++++++++++++++++++--------- 1 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 7b231ea..0de2e6a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -310,8 +310,8 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], { DWORD nextItemLen; - if ((ret = CRYPT_GetLen(ptr, cbEncoded - (ptr - pbEncoded), - &nextItemLen))) + if ((ret = CRYPT_GetLengthIndefinite(ptr, + cbEncoded - (ptr - pbEncoded), &nextItemLen))) { BYTE nextItemLenBytes = GET_LEN_BYTES(ptr[1]); @@ -326,15 +326,21 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], } if (items[i].decodeFunc) { + DWORD nextItemEncodedLen, nextItemDecoded; + + if (nextItemLen == CMSG_INDEFINITE_LENGTH) + nextItemEncodedLen = cbEncoded - (ptr - pbEncoded); + else + nextItemEncodedLen = 1 + nextItemLenBytes + + nextItemLen; if (pvStructInfo) TRACE("decoding item %d\n", i); else TRACE("sizing item %d\n", i); - ret = items[i].decodeFunc(ptr, - 1 + nextItemLenBytes + nextItemLen, + ret = items[i].decodeFunc(ptr, nextItemEncodedLen, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo ? (BYTE *)pvStructInfo + items[i].offset - : NULL, &items[i].size, NULL); + : NULL, &items[i].size, &nextItemDecoded); if (ret) { /* Account for alignment padding */ @@ -345,10 +351,20 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], if (nextData && items[i].hasPointer && items[i].size > items[i].minSize) nextData += items[i].size - items[i].minSize; - ptr += 1 + nextItemLenBytes + nextItemLen; - decoded += 1 + nextItemLenBytes + nextItemLen; - TRACE("item %d: decoded %d bytes\n", i, - 1 + nextItemLenBytes + nextItemLen); + if (nextItemDecoded > nextItemEncodedLen) + { + WARN("decoded length %d exceeds encoded %d\n", + nextItemDecoded, nextItemEncodedLen); + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } + else + { + ptr += nextItemDecoded; + decoded += nextItemDecoded; + TRACE("item %d: decoded %d bytes\n", i, + nextItemDecoded); + } } else if (items[i].optional && GetLastError() == CRYPT_E_ASN1_BADTAG) @@ -362,6 +378,12 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], TRACE("item %d failed: %08x\n", i, GetLastError()); } + else if (nextItemLen == CMSG_INDEFINITE_LENGTH) + { + ERR("can't use indefinite length encoding without a decoder\n"); + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } else { TRACE("item %d: decoded %d bytes\n", i,

1 0

Juan Lang : crypt32: Simplify DecodePathLenConstraint.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: be91ad360437363bf91aae977a95d8244df8dee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be91ad360437363bf91aae977… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:21:43 2007 -0700 crypt32: Simplify DecodePathLenConstraint. --- dlls/crypt32/decode.c | 54 ++++++++++++++++++++---------------------------- 1 files changed, 23 insertions(+), 31 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 9fba88c..7b231ea 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2602,43 +2602,35 @@ static BOOL CRYPT_AsnDecodePathLenConstraint(const BYTE *pbEncoded, DWORD *pcbDecoded) { BOOL ret = TRUE; + DWORD bytesNeeded = sizeof(struct PATH_LEN_CONSTRAINT), size; TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo, pcbDecoded); - if (cbEncoded) + if (!pvStructInfo) { - if (pbEncoded[0] == ASN_INTEGER) - { - DWORD bytesNeeded = sizeof(struct PATH_LEN_CONSTRAINT); - - if (!pvStructInfo) - *pcbStructInfo = bytesNeeded; - else if (*pcbStructInfo < bytesNeeded) - { - SetLastError(ERROR_MORE_DATA); - *pcbStructInfo = bytesNeeded; - ret = FALSE; - } - else - { - struct PATH_LEN_CONSTRAINT *constraint = - (struct PATH_LEN_CONSTRAINT *)pvStructInfo; - DWORD size = sizeof(constraint->dwPathLenConstraint); + ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, dwFlags, NULL, + &size, pcbDecoded); + *pcbStructInfo = bytesNeeded; + } + else if (*pcbStructInfo < bytesNeeded) + { + SetLastError(ERROR_MORE_DATA); + *pcbStructInfo = bytesNeeded; + ret = FALSE; + } + else + { + struct PATH_LEN_CONSTRAINT *constraint = + (struct PATH_LEN_CONSTRAINT *)pvStructInfo; - ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, dwFlags, - &constraint->dwPathLenConstraint, &size, pcbDecoded); - if (ret) - constraint->fPathLenConstraint = TRUE; - TRACE("got an int, dwPathLenConstraint is %d\n", - constraint->dwPathLenConstraint); - } - } - else - { - SetLastError(CRYPT_E_ASN1_CORRUPT); - ret = FALSE; - } + size = sizeof(constraint->dwPathLenConstraint); + ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, dwFlags, + &constraint->dwPathLenConstraint, &size, pcbDecoded); + if (ret) + constraint->fPathLenConstraint = TRUE; + TRACE("got an int, dwPathLenConstraint is %d\n", + constraint->dwPathLenConstraint); } TRACE("returning %d (%08x)\n", ret, GetLastError()); return ret;

1 0

Juan Lang : crypt32: Allow a sequence to have an indefinite-length encoding .
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: 4fd90ddad335c3eb6f9ae74bebce95d65d97e960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd90ddad335c3eb6f9ae74be… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:20:52 2007 -0700 crypt32: Allow a sequence to have an indefinite-length encoding. --- dlls/crypt32/decode.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index fab4b9a..9fba88c 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -425,13 +425,15 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], { DWORD dataLen; - if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + if ((ret = CRYPT_GetLengthIndefinite(pbEncoded, cbEncoded, &dataLen))) { DWORD lenBytes = GET_LEN_BYTES(pbEncoded[1]), cbDecoded; const BYTE *ptr = pbEncoded + 1 + lenBytes; cbEncoded -= 1 + lenBytes; - if (cbEncoded < dataLen) + if (dataLen == CMSG_INDEFINITE_LENGTH) + cbEncoded = dataLen; + else if (cbEncoded < dataLen) { TRACE("dataLen %d exceeds cbEncoded %d, failing\n", dataLen, cbEncoded); @@ -439,11 +441,33 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], ret = FALSE; } else + cbEncoded = dataLen; + if (ret) + { ret = CRYPT_AsnDecodeSequenceItems(items, cItem, ptr, cbEncoded, dwFlags, NULL, NULL, &cbDecoded); - if (ret && cbDecoded != dataLen) + if (ret && dataLen == CMSG_INDEFINITE_LENGTH) + { + if (cbDecoded > cbEncoded - 2) + { + /* Not enough space for 0 TLV */ + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } + else if (*(ptr + cbDecoded) != 0 || + *(ptr + cbDecoded + 1) != 0) + { + TRACE("expected 0 TLV\n"); + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } + else + cbDecoded += 2; + } + } + if (ret && cbDecoded != cbEncoded) { - TRACE("expected %d decoded, got %d, failing\n", dataLen, + TRACE("expected %d decoded, got %d, failing\n", cbEncoded, cbDecoded); SetLastError(CRYPT_E_ASN1_CORRUPT); ret = FALSE;

1 0

Juan Lang : crypt32: Set *pcbDecoded in every function.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: 2e8ae598e11ee1c87e51b02ce7bea63f52b94646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e8ae598e11ee1c87e51b02ce… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:18:53 2007 -0700 crypt32: Set *pcbDecoded in every function. --- dlls/crypt32/decode.c | 53 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 9cc5a89..fab4b9a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -397,7 +397,7 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], ret = FALSE; } } - if (ret) + if (cbDecoded) *cbDecoded = decoded; TRACE("returning %d\n", ret); return ret; @@ -702,6 +702,8 @@ static BOOL CRYPT_AsnDecodeDerBlob(const BYTE *pbEncoded, DWORD cbEncoded, if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) bytesNeeded += 1 + lenBytes + dataLen; + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; if (!pvStructInfo) *pcbStructInfo = bytesNeeded; else if ((ret = CRYPT_DecodeCheckSpace(pcbStructInfo, bytesNeeded))) @@ -810,7 +812,6 @@ static BOOL WINAPI CRYPT_AsnDecodeCertSignedContent(DWORD dwCertEncodingType, return ret; } -/* Internal function */ static BOOL CRYPT_AsnDecodeCertVersion(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { @@ -822,7 +823,9 @@ static BOOL CRYPT_AsnDecodeCertVersion(const BYTE *pbEncoded, DWORD cbEncoded, BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); ret = CRYPT_AsnDecodeIntInternal(pbEncoded + 1 + lenBytes, dataLen, - dwFlags, pvStructInfo, pcbStructInfo, pcbDecoded); + dwFlags, pvStructInfo, pcbStructInfo, NULL); + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; } return ret; } @@ -857,7 +860,9 @@ static BOOL CRYPT_AsnDecodeCertExtensions(const BYTE *pbEncoded, BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); ret = CRYPT_AsnDecodeExtensionsInternal(pbEncoded + 1 + lenBytes, - dataLen, dwFlags, pvStructInfo, pcbStructInfo, pcbDecoded); + dataLen, dwFlags, pvStructInfo, pcbStructInfo, NULL); + if (ret && pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; } return ret; } @@ -1409,6 +1414,8 @@ static BOOL CRYPT_AsnDecodeNameValueInternal(const BYTE *pbEncoded, return FALSE; } + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; if (!value) *pcbStructInfo = bytesNeeded; else if (*pcbStructInfo < bytesNeeded) @@ -1581,6 +1588,8 @@ static BOOL CRYPT_AsnDecodeUnicodeNameValueInternal(const BYTE *pbEncoded, return FALSE; } + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; if (!value) *pcbStructInfo = bytesNeeded; else if (*pcbStructInfo < bytesNeeded) @@ -2122,6 +2131,8 @@ static BOOL CRYPT_AsnDecodeBool(const BYTE *pbEncoded, DWORD cbEncoded, SetLastError(CRYPT_E_ASN1_CORRUPT); return FALSE; } + if (pcbDecoded) + *pcbDecoded = 3; if (!pvStructInfo) { *pcbStructInfo = sizeof(BOOL); @@ -2413,7 +2424,9 @@ static BOOL CRYPT_AsnDecodePKCSContent(const BYTE *pbEncoded, DWORD cbEncoded, if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &innerLen))) { ret = CRYPT_AsnDecodeCopyBytes(pbEncoded, dataLen, dwFlags, - pvStructInfo, pcbStructInfo, pcbDecoded); + pvStructInfo, pcbStructInfo, NULL); + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; } } return ret; @@ -2590,7 +2603,7 @@ static BOOL CRYPT_AsnDecodePathLenConstraint(const BYTE *pbEncoded, DWORD size = sizeof(constraint->dwPathLenConstraint); ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, dwFlags, - &constraint->dwPathLenConstraint, &size, NULL); + &constraint->dwPathLenConstraint, &size, pcbDecoded); if (ret) constraint->fPathLenConstraint = TRUE; TRACE("got an int, dwPathLenConstraint is %d\n", @@ -2776,10 +2789,14 @@ static BOOL CRYPT_AsnDecodeOctetsInternal(const BYTE *pbEncoded, if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) { + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) bytesNeeded = sizeof(CRYPT_DATA_BLOB); else bytesNeeded = dataLen + sizeof(CRYPT_DATA_BLOB); + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; if (!pvStructInfo) *pcbStructInfo = bytesNeeded; else if (*pcbStructInfo < bytesNeeded) @@ -2791,7 +2808,6 @@ static BOOL CRYPT_AsnDecodeOctetsInternal(const BYTE *pbEncoded, else { CRYPT_DATA_BLOB *blob; - BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); blob = (CRYPT_DATA_BLOB *)pvStructInfo; blob->cbData = dataLen; @@ -2872,6 +2888,7 @@ static BOOL CRYPT_AsnDecodeBitsInternal(const BYTE *pbEncoded, DWORD cbEncoded, if (pbEncoded[0] == ASN_BITSTRING) { DWORD bytesNeeded, dataLen; + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) { @@ -2879,6 +2896,8 @@ static BOOL CRYPT_AsnDecodeBitsInternal(const BYTE *pbEncoded, DWORD cbEncoded, bytesNeeded = sizeof(CRYPT_BIT_BLOB); else bytesNeeded = dataLen - 1 + sizeof(CRYPT_BIT_BLOB); + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; if (!pvStructInfo) *pcbStructInfo = bytesNeeded; else if (*pcbStructInfo < bytesNeeded) @@ -2893,12 +2912,10 @@ static BOOL CRYPT_AsnDecodeBitsInternal(const BYTE *pbEncoded, DWORD cbEncoded, blob = (CRYPT_BIT_BLOB *)pvStructInfo; blob->cbData = dataLen - 1; - blob->cUnusedBits = *(pbEncoded + 1 + - GET_LEN_BYTES(pbEncoded[1])); + blob->cUnusedBits = *(pbEncoded + 1 + lenBytes); if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) { - blob->pbData = (BYTE *)pbEncoded + 2 + - GET_LEN_BYTES(pbEncoded[1]); + blob->pbData = (BYTE *)pbEncoded + 2 + lenBytes; } else { @@ -2907,8 +2924,8 @@ static BOOL CRYPT_AsnDecodeBitsInternal(const BYTE *pbEncoded, DWORD cbEncoded, { BYTE mask = 0xff << blob->cUnusedBits; - memcpy(blob->pbData, pbEncoded + 2 + - GET_LEN_BYTES(pbEncoded[1]), blob->cbData); + memcpy(blob->pbData, pbEncoded + 2 + lenBytes, + blob->cbData); blob->pbData[blob->cbData - 1] &= mask; } } @@ -3060,6 +3077,8 @@ static BOOL CRYPT_AsnDecodeIntegerInternal(const BYTE *pbEncoded, BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); bytesNeeded = dataLen + sizeof(CRYPT_INTEGER_BLOB); + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; if (!pvStructInfo) *pcbStructInfo = bytesNeeded; else if (*pcbStructInfo < bytesNeeded) @@ -3150,6 +3169,8 @@ static BOOL CRYPT_AsnDecodeUnsignedIntegerInternal(const BYTE *pbEncoded, { BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; bytesNeeded = dataLen + sizeof(CRYPT_INTEGER_BLOB); if (!pvStructInfo) *pcbStructInfo = bytesNeeded; @@ -3405,6 +3426,8 @@ static BOOL CRYPT_AsnDecodeUtcTimeInternal(const BYTE *pbEncoded, else { ret = TRUE; + if (pcbDecoded) + *pcbDecoded = 2 + len; pbEncoded += 2; CRYPT_TIME_GET_DIGITS(pbEncoded, len, 2, sysTime.wYear); if (sysTime.wYear >= 50) @@ -3506,6 +3529,8 @@ static BOOL CRYPT_AsnDecodeGeneralizedTime(const BYTE *pbEncoded, SYSTEMTIME sysTime = { 0 }; ret = TRUE; + if (pcbDecoded) + *pcbDecoded = 2 + len; pbEncoded += 2; CRYPT_TIME_GET_DIGITS(pbEncoded, len, 4, sysTime.wYear); CRYPT_TIME_GET_DIGITS(pbEncoded, len, 2, sysTime.wMonth); @@ -3741,6 +3766,8 @@ static BOOL CRYPT_AsnDecodeDistPointName(const BYTE *pbEncoded, } else bytesNeeded = sizeof(CRL_DIST_POINT_NAME); + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; if (!pvStructInfo) *pcbStructInfo = bytesNeeded; else if (*pcbStructInfo < bytesNeeded)

1 0

Juan Lang : crypt32: Use internal form for all internal decoding functions.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: e03864a205ec084fb313ccdea855f4ca4179bd65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e03864a205ec084fb313ccdea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:13:12 2007 -0700 crypt32: Use internal form for all internal decoding functions. --- dlls/crypt32/decode.c | 613 ++++++++++++++++++++----------------------------- 1 files changed, 251 insertions(+), 362 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e03864a205ec084fb313c…

1 0

Juan Lang : crypt32: Get rid of encoding type argument to AsnDecodeSequence , it isn't used.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: ce47433d94d2dffc6f0bb45f053375d2942400f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce47433d94d2dffc6f0bb45f0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:12:27 2007 -0700 crypt32: Get rid of encoding type argument to AsnDecodeSequence, it isn't used. --- dlls/crypt32/decode.c | 152 +++++++++++++++++++++++-------------------------- 1 files changed, 72 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce47433d94d2dffc6f0bb…

1 0

Juan Lang : crypt32: Get rid of encoding type from AsnDecodeSequenceItems, it's never checked.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: 19fd9872a669147e14cff3adc4dbdcc7e5f74fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fd9872a669147e14cff3adc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:11:54 2007 -0700 crypt32: Get rid of encoding type from AsnDecodeSequenceItems, it's never checked. --- dlls/crypt32/decode.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 77265c3..2c22459 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -315,10 +315,9 @@ struct AsnDecodeSequenceItem * Upon decoding, *cbDecoded is the total number of bytes decoded. * Each item decoder is never called with CRYPT_DECODE_ALLOC_FLAG set. */ -static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, - struct AsnDecodeSequenceItem items[], DWORD cItem, const BYTE *pbEncoded, - DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, BYTE *nextData, - DWORD *cbDecoded) +static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], + DWORD cItem, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, BYTE *nextData, DWORD *cbDecoded) { BOOL ret; DWORD i, decoded = 0; @@ -353,7 +352,7 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, TRACE("decoding item %d\n", i); else TRACE("sizing item %d\n", i); - ret = items[i].decodeFunc(dwCertEncodingType, + ret = items[i].decodeFunc(X509_ASN_ENCODING, NULL, ptr, 1 + nextItemLenBytes + nextItemLen, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo ? (BYTE *)pvStructInfo + items[i].offset @@ -463,8 +462,8 @@ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, ret = FALSE; } else - ret = CRYPT_AsnDecodeSequenceItems(dwFlags, items, cItem, ptr, - cbEncoded, dwFlags, NULL, NULL, &cbDecoded); + ret = CRYPT_AsnDecodeSequenceItems(items, cItem, + ptr, cbEncoded, dwFlags, NULL, NULL, &cbDecoded); if (ret && cbDecoded != dataLen) { TRACE("expected %d decoded, got %d, failing\n", dataLen, @@ -497,7 +496,7 @@ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, else nextData = (BYTE *)pvStructInfo + structSize; memset(pvStructInfo, 0, structSize); - ret = CRYPT_AsnDecodeSequenceItems(dwFlags, items, cItem, + ret = CRYPT_AsnDecodeSequenceItems(items, cItem, ptr, cbEncoded, dwFlags, pvStructInfo, nextData, &cbDecoded); }

1 0

Juan Lang : crypt32: Don't use exception handler when decoding time zone, caller already does.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: 21246938c4ce4442e9e5ed59efd4fa721b42166a URL: http://source.winehq.org/git/wine.git/?a=commit;h=21246938c4ce4442e9e5ed59e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:08:52 2007 -0700 crypt32: Don't use exception handler when decoding time zone, caller already does. --- dlls/crypt32/decode.c | 72 +++++++++++++++++++++---------------------------- 1 files changed, 31 insertions(+), 41 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index e96757f..77265c3 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3443,65 +3443,55 @@ static BOOL WINAPI CRYPT_AsnDecodeEnumerated(DWORD dwCertEncodingType, static BOOL CRYPT_AsnDecodeTimeZone(const BYTE *pbEncoded, DWORD len, SYSTEMTIME *sysTime) { - BOOL ret; + BOOL ret = TRUE; - __TRY + if (len >= 3 && (*pbEncoded == '+' || *pbEncoded == '-')) { - ret = TRUE; - if (len >= 3 && (*pbEncoded == '+' || *pbEncoded == '-')) - { - WORD hours, minutes = 0; - BYTE sign = *pbEncoded++; + WORD hours, minutes = 0; + BYTE sign = *pbEncoded++; - len--; - CRYPT_TIME_GET_DIGITS(pbEncoded, len, 2, hours); - if (ret && hours >= 24) + len--; + CRYPT_TIME_GET_DIGITS(pbEncoded, len, 2, hours); + if (ret && hours >= 24) + { + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } + else if (len >= 2) + { + CRYPT_TIME_GET_DIGITS(pbEncoded, len, 2, minutes); + if (ret && minutes >= 60) { SetLastError(CRYPT_E_ASN1_CORRUPT); ret = FALSE; } - else if (len >= 2) + } + if (ret) + { + if (sign == '+') { - CRYPT_TIME_GET_DIGITS(pbEncoded, len, 2, minutes); - if (ret && minutes >= 60) - { - SetLastError(CRYPT_E_ASN1_CORRUPT); - ret = FALSE; - } + sysTime->wHour += hours; + sysTime->wMinute += minutes; } - if (ret) + else { - if (sign == '+') + if (hours > sysTime->wHour) { - sysTime->wHour += hours; - sysTime->wMinute += minutes; + sysTime->wDay--; + sysTime->wHour = 24 - (hours - sysTime->wHour); } else + sysTime->wHour -= hours; + if (minutes > sysTime->wMinute) { - if (hours > sysTime->wHour) - { - sysTime->wDay--; - sysTime->wHour = 24 - (hours - sysTime->wHour); - } - else - sysTime->wHour -= hours; - if (minutes > sysTime->wMinute) - { - sysTime->wHour--; - sysTime->wMinute = 60 - (minutes - sysTime->wMinute); - } - else - sysTime->wMinute -= minutes; + sysTime->wHour--; + sysTime->wMinute = 60 - (minutes - sysTime->wMinute); } + else + sysTime->wMinute -= minutes; } } } - __EXCEPT_PAGE_FAULT - { - SetLastError(STATUS_ACCESS_VIOLATION); - ret = FALSE; - } - __ENDTRY return ret; }

1 0

Juan Lang : crypt32: Use AsnDecodeIntInternal where an internal function is called for.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: 89a541a493ca5352d2cae6c3ef88e3f627d2f176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a541a493ca5352d2cae6c3e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:07:35 2007 -0700 crypt32: Use AsnDecodeIntInternal where an internal function is called for. --- dlls/crypt32/decode.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index eed7d88..120d890 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1064,7 +1064,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCRLInfo(DWORD dwCertEncodingType, { struct AsnDecodeSequenceItem items[] = { { ASN_INTEGER, offsetof(CRL_INFO, dwVersion), - CRYPT_AsnDecodeInt, sizeof(DWORD), TRUE, FALSE, 0, 0 }, + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), TRUE, FALSE, 0, 0 }, { ASN_SEQUENCEOF, offsetof(CRL_INFO, SignatureAlgorithm), CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), FALSE, TRUE, offsetof(CRL_INFO, SignatureAlgorithm.pszObjId), 0 }, @@ -2590,8 +2590,8 @@ BOOL CRYPT_AsnDecodePKCSDigestedData(const BYTE *pbEncoded, DWORD cbEncoded, { BOOL ret; struct AsnDecodeSequenceItem items[] = { - { ASN_INTEGER, offsetof(CRYPT_DIGESTED_DATA, version), CRYPT_AsnDecodeInt, - sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { ASN_INTEGER, offsetof(CRYPT_DIGESTED_DATA, version), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, { ASN_SEQUENCEOF, offsetof(CRYPT_DIGESTED_DATA, DigestAlgorithm), CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), FALSE, TRUE, offsetof(CRYPT_DIGESTED_DATA, DigestAlgorithm.pszObjId), @@ -2797,7 +2797,7 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey(DWORD dwCertEncodingType, FALSE, TRUE, offsetof(struct DECODED_RSA_PUB_KEY, modulus.pbData), 0 }, { ASN_INTEGER, offsetof(struct DECODED_RSA_PUB_KEY, pubexp), - CRYPT_AsnDecodeInt, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, }; struct DECODED_RSA_PUB_KEY *decodedKey = NULL; DWORD size = 0; @@ -4042,7 +4042,7 @@ static BOOL CRYPT_AsnDecodePKCSSignerInfoInternal(const BYTE *pbEncoded, CMSG_SIGNER_INFO *info = (CMSG_SIGNER_INFO *)pvStructInfo; struct AsnDecodeSequenceItem items[] = { { ASN_INTEGER, offsetof(CMSG_SIGNER_INFO, dwVersion), - CRYPT_AsnDecodeInt, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, { ASN_SEQUENCEOF, offsetof(CMSG_SIGNER_INFO, Issuer), CRYPT_AsnDecodeIssuerSerialNumber, sizeof(CERT_ISSUER_SERIAL_NUMBER), FALSE, TRUE, offsetof(CMSG_SIGNER_INFO, Issuer.pbData), 0 }, @@ -4143,8 +4143,8 @@ BOOL CRYPT_AsnDecodePKCSSignedInfo(const BYTE *pbEncoded, DWORD cbEncoded, { BOOL ret = FALSE; struct AsnDecodeSequenceItem items[] = { - { ASN_INTEGER, offsetof(CRYPT_SIGNED_INFO, version), CRYPT_AsnDecodeInt, - sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { ASN_INTEGER, offsetof(CRYPT_SIGNED_INFO, version), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, /* Placeholder for the hash algorithms - redundant with those in the * signers, so just ignore them. */

1 0

Juan Lang : crypt32: Implement DecodeAltName with DecodeAltNameInternal.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: ad94982284f4d7db57c4c1c4f66b80be01f9b3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad94982284f4d7db57c4c1c4f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:08:24 2007 -0700 crypt32: Implement DecodeAltName with DecodeAltNameInternal. --- dlls/crypt32/decode.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 120d890..e96757f 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2622,12 +2622,30 @@ static BOOL WINAPI CRYPT_AsnDecodeAltName(DWORD dwCertEncodingType, __TRY { - struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, - CRYPT_AsnDecodeAltNameEntry, sizeof(CERT_ALT_NAME_ENTRY), TRUE, - offsetof(CERT_ALT_NAME_ENTRY, u.pwszURL) }; + DWORD bytesNeeded; - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); + if ((ret = CRYPT_AsnDecodeAltNameInternal(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, &bytesNeeded))) + { + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, bytesNeeded))) + { + CERT_ALT_NAME_INFO *name; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + name = (CERT_ALT_NAME_INFO *)pvStructInfo; + name->rgAltEntry = (PCERT_ALT_NAME_ENTRY) + ((BYTE *)pvStructInfo + sizeof(CERT_ALT_NAME_INFO)); + ret = CRYPT_AsnDecodeAltNameInternal(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo, + &bytesNeeded); + } + } } __EXCEPT_PAGE_FAULT {

1 0