September 2007 - Wine-commits

Juan Lang : crypt32: Move a comment that belonged elsewhere.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 9d0dccf164c508c3d98ec03bb78aab5752763bc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0dccf164c508c3d98ec03bb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:04:02 2007 -0700 crypt32: Move a comment that belonged elsewhere. --- dlls/crypt32/decode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index f89fbe5..9cc4c0c 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -289,6 +289,7 @@ struct AsnDecodeSequenceItem * pvStructInfo. nextData is a pointer to the memory location at which the * first decoded item with a dynamic pointer should point. * 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, @@ -407,7 +408,6 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, * startingPointer is an optional pointer to the first place where dynamic * data will be stored. If you know the starting offset, you may pass it * here. Otherwise, pass NULL, and one will be inferred from the items. - * Each item decoder is never called with CRYPT_DECODE_ALLOC_FLAG set. */ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, struct AsnDecodeSequenceItem items[], DWORD cItem, const BYTE *pbEncoded,

1 0

Juan Lang : crypt32: Introduce a space checking helper for functions that don' t allocate memory and use it where appropriate.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 8c5bd5f5ca6c2543d7a20a2761e0f5b78bff4f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5bd5f5ca6c2543d7a20a276… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:04:40 2007 -0700 crypt32: Introduce a space checking helper for functions that don't allocate memory and use it where appropriate. --- dlls/crypt32/decode.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 9cc4c0c..02bb308 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -250,6 +250,27 @@ static BOOL CRYPT_DecodeEnsureSpace(DWORD dwFlags, return ret; } +/* Helper function to check *pcbStructInfo and set it to the required size. + * Assumes pvStructInfo is not NULL. + */ +static BOOL CRYPT_DecodeCheckSpace(DWORD *pcbStructInfo, DWORD bytesNeeded) +{ + BOOL ret; + + if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + *pcbStructInfo = bytesNeeded; + ret = TRUE; + } + return ret; +} + /* tag: * The expected tag of the item. If tag is 0, decodeFunc is called * regardless of the tag value seen. @@ -705,8 +726,7 @@ static BOOL WINAPI CRYPT_AsnDecodeDerBlob(DWORD dwCertEncodingType, if (!pvStructInfo) *pcbStructInfo = bytesNeeded; - else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, - pvStructInfo, pcbStructInfo, bytesNeeded))) + else if ((ret = CRYPT_DecodeCheckSpace(pcbStructInfo, bytesNeeded))) { CRYPT_DER_BLOB *blob; @@ -3055,8 +3075,7 @@ static BOOL CRYPT_AsnDecodeIntInternal(const BYTE *pbEncoded, DWORD cbEncoded, { if (!pvStructInfo) *pcbStructInfo = sizeof(int); - else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, NULL, - pvStructInfo, pcbStructInfo, sizeof(int)))) + else if ((ret = CRYPT_DecodeCheckSpace(pcbStructInfo, sizeof(int)))) { int val, i; @@ -3515,8 +3534,8 @@ static BOOL CRYPT_AsnDecodeUtcTimeInternal(const BYTE *pbEncoded, { if (!pvStructInfo) *pcbStructInfo = sizeof(FILETIME); - else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, NULL, - pvStructInfo, pcbStructInfo, sizeof(FILETIME)))) + else if ((ret = CRYPT_DecodeCheckSpace(pcbStructInfo, + sizeof(FILETIME)))) ret = SystemTimeToFileTime(&sysTime, (FILETIME *)pvStructInfo); } @@ -3621,14 +3640,10 @@ static BOOL CRYPT_AsnDecodeGeneralizedTime(const BYTE *pbEncoded, { if (!pvStructInfo) *pcbStructInfo = sizeof(FILETIME); - else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, NULL, - pvStructInfo, pcbStructInfo, sizeof(FILETIME)))) - { - if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) - pvStructInfo = *(BYTE **)pvStructInfo; + else if ((ret = CRYPT_DecodeCheckSpace(pcbStructInfo, + sizeof(FILETIME)))) ret = SystemTimeToFileTime(&sysTime, (FILETIME *)pvStructInfo); - } } } }

1 0

Juan Lang : crypt32: Use internal decode int function a couple more places.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 205c733b1309f0291bcaa2b0a0027ac8257128af URL: http://source.winehq.org/git/wine.git/?a=commit;h=205c733b1309f0291bcaa2b0a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:05:34 2007 -0700 crypt32: Use internal decode int function a couple more places. --- dlls/crypt32/decode.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 02bb308..0d38efd 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -115,6 +115,8 @@ static BOOL WINAPI CRYPT_AsnDecodeBits(DWORD dwCertEncodingType, static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo); +static BOOL CRYPT_AsnDecodeIntInternal(const BYTE *pbEncoded, DWORD cbEncoded, + DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded); /* Like CRYPT_AsnDecodeInteger, but assumes the CRYPT_INTEGER_BLOB's pbData * member has been initialized, doesn't do exception handling, and doesn't do * memory allocation. Also doesn't check tag, assumes the caller has checked @@ -844,9 +846,8 @@ static BOOL WINAPI CRYPT_AsnDecodeCertVersion(DWORD dwCertEncodingType, { BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); - ret = CRYPT_AsnDecodeInt(dwCertEncodingType, X509_INTEGER, - pbEncoded + 1 + lenBytes, dataLen, dwFlags, pDecodePara, - pvStructInfo, pcbStructInfo); + ret = CRYPT_AsnDecodeIntInternal(pbEncoded + 1 + lenBytes, dataLen, + dwFlags, pvStructInfo, pcbStructInfo, NULL); } return ret; } @@ -2670,9 +2671,8 @@ static BOOL WINAPI CRYPT_AsnDecodePathLenConstraint(DWORD dwCertEncodingType, (struct PATH_LEN_CONSTRAINT *)pvStructInfo; DWORD size = sizeof(constraint->dwPathLenConstraint); - ret = CRYPT_AsnDecodeInt(dwCertEncodingType, X509_INTEGER, - pbEncoded, cbEncoded, 0, NULL, - &constraint->dwPathLenConstraint, &size); + ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, 0, + &constraint->dwPathLenConstraint, &size, NULL); if (ret) constraint->fPathLenConstraint = TRUE; TRACE("got an int, dwPathLenConstraint is %d\n",

1 0

Juan Lang : crypt32: Temporarily change prototype of AsnDecodeIntInternal to the CryptDecodeObjectEx form .
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: f2bff633acb55d3ee8d12ee207aafd510058034b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2bff633acb55d3ee8d12ee20… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:06:53 2007 -0700 crypt32: Temporarily change prototype of AsnDecodeIntInternal to the CryptDecodeObjectEx form. --- dlls/crypt32/decode.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 0d38efd..eed7d88 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -115,8 +115,9 @@ static BOOL WINAPI CRYPT_AsnDecodeBits(DWORD dwCertEncodingType, static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo); -static BOOL CRYPT_AsnDecodeIntInternal(const BYTE *pbEncoded, DWORD cbEncoded, - DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded); +static BOOL WINAPI CRYPT_AsnDecodeIntInternal(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo); /* Like CRYPT_AsnDecodeInteger, but assumes the CRYPT_INTEGER_BLOB's pbData * member has been initialized, doesn't do exception handling, and doesn't do * memory allocation. Also doesn't check tag, assumes the caller has checked @@ -846,8 +847,9 @@ static BOOL WINAPI CRYPT_AsnDecodeCertVersion(DWORD dwCertEncodingType, { BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); - ret = CRYPT_AsnDecodeIntInternal(pbEncoded + 1 + lenBytes, dataLen, - dwFlags, pvStructInfo, pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeIntInternal(dwCertEncodingType, NULL, + pbEncoded + 1 + lenBytes, dataLen, dwFlags, pDecodePara, pvStructInfo, + pcbStructInfo); } return ret; } @@ -2671,8 +2673,9 @@ static BOOL WINAPI CRYPT_AsnDecodePathLenConstraint(DWORD dwCertEncodingType, (struct PATH_LEN_CONSTRAINT *)pvStructInfo; DWORD size = sizeof(constraint->dwPathLenConstraint); - ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, 0, - &constraint->dwPathLenConstraint, &size, NULL); + ret = CRYPT_AsnDecodeIntInternal(dwCertEncodingType, NULL, + pbEncoded, cbEncoded, dwFlags, pDecodePara, + &constraint->dwPathLenConstraint, &size); if (ret) constraint->fPathLenConstraint = TRUE; TRACE("got an int, dwPathLenConstraint is %d\n", @@ -3054,8 +3057,10 @@ static BOOL WINAPI CRYPT_AsnDecodeBits(DWORD dwCertEncodingType, return ret; } -static BOOL CRYPT_AsnDecodeIntInternal(const BYTE *pbEncoded, DWORD cbEncoded, - DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) +static BOOL WINAPI CRYPT_AsnDecodeIntInternal(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, + DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, + DWORD *pcbStructInfo) { BOOL ret; BYTE buf[sizeof(CRYPT_INTEGER_BLOB) + sizeof(int)]; @@ -3109,8 +3114,9 @@ static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, { DWORD bytesNeeded; - ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, - dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL); + ret = CRYPT_AsnDecodeIntInternal(dwCertEncodingType, lpszStructType, + pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, + &bytesNeeded); if (ret) { if (!pvStructInfo) @@ -3120,9 +3126,10 @@ static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, { if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) pvStructInfo = *(BYTE **)pvStructInfo; - ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, - dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, - &bytesNeeded, NULL); + ret = CRYPT_AsnDecodeIntInternal(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo, + &bytesNeeded); } } }

1 0

Juan Lang : crypt32: Separate DecodeInt into an internal and external version.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 5fbca384e4eb15af4f96fe3e27f6001eee4c5597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fbca384e4eb15af4f96fe3e2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:03:28 2007 -0700 crypt32: Separate DecodeInt into an internal and external version. --- dlls/crypt32/decode.c | 93 +++++++++++++++++++++++++++++------------------- 1 files changed, 56 insertions(+), 37 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index c5cf989..f89fbe5 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3034,59 +3034,78 @@ static BOOL WINAPI CRYPT_AsnDecodeBits(DWORD dwCertEncodingType, return ret; } +static BOOL CRYPT_AsnDecodeIntInternal(const BYTE *pbEncoded, DWORD cbEncoded, + DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) +{ + BOOL ret; + BYTE buf[sizeof(CRYPT_INTEGER_BLOB) + sizeof(int)]; + CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)buf; + DWORD size = sizeof(buf); + + blob->pbData = buf + sizeof(CRYPT_INTEGER_BLOB); + if (pbEncoded[0] != ASN_INTEGER) + { + SetLastError(CRYPT_E_ASN1_BADTAG); + ret = FALSE; + } + else + ret = CRYPT_AsnDecodeIntegerInternal(X509_ASN_ENCODING, NULL, + pbEncoded, cbEncoded, 0, NULL, &buf, &size); + if (ret) + { + if (!pvStructInfo) + *pcbStructInfo = sizeof(int); + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, NULL, + pvStructInfo, pcbStructInfo, sizeof(int)))) + { + int val, i; + + if (blob->pbData[blob->cbData - 1] & 0x80) + { + /* initialize to a negative value to sign-extend */ + val = -1; + } + else + val = 0; + for (i = 0; i < blob->cbData; i++) + { + val <<= 8; + val |= blob->pbData[blob->cbData - i - 1]; + } + memcpy(pvStructInfo, &val, sizeof(int)); + } + } + else if (GetLastError() == ERROR_MORE_DATA) + SetLastError(CRYPT_E_ASN1_LARGE); + return ret; +} + static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) { BOOL ret; - if (!pvStructInfo) - { - *pcbStructInfo = sizeof(int); - return TRUE; - } __TRY { - BYTE buf[sizeof(CRYPT_INTEGER_BLOB) + sizeof(int)]; - CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)buf; - DWORD size = sizeof(buf); + DWORD bytesNeeded; - blob->pbData = buf + sizeof(CRYPT_INTEGER_BLOB); - if (pbEncoded[0] != ASN_INTEGER) - { - SetLastError(CRYPT_E_ASN1_BADTAG); - ret = FALSE; - } - else - ret = CRYPT_AsnDecodeIntegerInternal(dwCertEncodingType, - X509_MULTI_BYTE_INTEGER, pbEncoded, cbEncoded, 0, NULL, &buf, - &size); + ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL); if (ret) { - if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, - pvStructInfo, pcbStructInfo, sizeof(int)))) + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, bytesNeeded))) { - int val, i; - if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) pvStructInfo = *(BYTE **)pvStructInfo; - if (blob->pbData[blob->cbData - 1] & 0x80) - { - /* initialize to a negative value to sign-extend */ - val = -1; - } - else - val = 0; - for (i = 0; i < blob->cbData; i++) - { - val <<= 8; - val |= blob->pbData[blob->cbData - i - 1]; - } - memcpy(pvStructInfo, &val, sizeof(int)); + ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, + &bytesNeeded, NULL); } } - else if (GetLastError() == ERROR_MORE_DATA) - SetLastError(CRYPT_E_ASN1_LARGE); } __EXCEPT_PAGE_FAULT {

1 0

Juan Lang : crypt32: Allow items in an array to be indefinite-length encoded.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 52be131a2904989ffad66acf0eae9269fed83c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52be131a2904989ffad66acf0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:02:19 2007 -0700 crypt32: Allow items in an array to be indefinite-length encoded. --- dlls/crypt32/decode.c | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a5229b5..01d1092 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -574,23 +574,25 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, doneDecoding = TRUE; if (!doneDecoding) { - DWORD itemDataLen, itemDecoded, size = 0; + DWORD itemEncoded, itemDataLen, itemDecoded, size = 0; /* Each item decoded may not tolerate extraneous bytes, - * so get the length of the next element and pass it - * directly. + * so get the length of the next element if known. */ - ret = CRYPT_GetLen(ptr, cbEncoded - (ptr - pbEncoded), - &itemDataLen); + if ((ret = CRYPT_GetLengthIndefinite(ptr, + cbEncoded - (ptr - pbEncoded), &itemDataLen))) + { + if (itemDataLen == CMSG_INDEFINITE_LENGTH) + itemEncoded = cbEncoded - (ptr - pbEncoded); + else + itemEncoded = 1 + itemLenBytes + itemDataLen; + } if (ret) - ret = arrayDesc->decodeFunc(ptr, - 1 + itemLenBytes + itemDataLen, + ret = arrayDesc->decodeFunc(ptr, itemEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &size, &itemDecoded); if (ret) { - DWORD nextLen; - cItems++; if (itemSizes != &itemSize) itemSizes = CryptMemRealloc(itemSizes, @@ -607,14 +609,10 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, if (itemSizes) { decoded += itemDecoded; - itemSizes[cItems - 1].encodedLen = - 1 + itemLenBytes + itemDataLen; + itemSizes[cItems - 1].encodedLen = itemEncoded; itemSizes[cItems - 1].size = size; bytesNeeded += size; - ret = CRYPT_GetLen(ptr, - cbEncoded - (ptr - pbEncoded), &nextLen); - if (ret) - ptr += nextLen + 1 + GET_LEN_BYTES(ptr[1]); + ptr += itemEncoded; } else ret = FALSE;

1 0

Juan Lang : crypt32: Use simpler form for internal time decoding functions.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: a538e95c1d77694ce4a4f2ddc40de11c534d8131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a538e95c1d77694ce4a4f2ddc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 17:02:58 2007 -0700 crypt32: Use simpler form for internal time decoding functions. --- dlls/crypt32/decode.c | 300 ++++++++++++++++++++++++++----------------------- 1 files changed, 159 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a538e95c1d77694ce4a4f…

1 0

Juan Lang : crypt32: Support indefinite-length encoded arrays.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 5d168bd4c0fe9725114a652175ffcab01a25fb91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d168bd4c0fe9725114a65217… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 16:58:25 2007 -0700 crypt32: Support indefinite-length encoded arrays. --- dlls/crypt32/decode.c | 101 ++++++++++++++++++++++++++---------------- dlls/crypt32/tests/encode.c | 1 - 2 files changed, 62 insertions(+), 40 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 7161058..a5229b5 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -536,7 +536,7 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, { DWORD dataLen; - if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + if ((ret = CRYPT_GetLengthIndefinite(pbEncoded, cbEncoded, &dataLen))) { DWORD bytesNeeded, cItems = 0, decoded; BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); @@ -549,53 +549,76 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, if (dataLen) { const BYTE *ptr; + BOOL doneDecoding = FALSE; - for (ptr = pbEncoded + 1 + lenBytes; ret && - ptr - pbEncoded - 1 - lenBytes < dataLen; ) + for (ptr = pbEncoded + 1 + lenBytes; ret && !doneDecoding; ) { - DWORD itemLenBytes, itemDataLen, itemDecoded, size = 0; + DWORD itemLenBytes; itemLenBytes = GET_LEN_BYTES(ptr[1]); - /* Each item decoded may not tolerate extraneous bytes, so - * get the length of the next element and pass it directly. - */ - ret = CRYPT_GetLen(ptr, cbEncoded - (ptr - pbEncoded), - &itemDataLen); - if (ret) - ret = arrayDesc->decodeFunc(ptr, - 1 + itemLenBytes + itemDataLen, - dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &size, - &itemDecoded); - if (ret) + if (dataLen == CMSG_INDEFINITE_LENGTH) { - DWORD nextLen; - - cItems++; - if (itemSizes != &itemSize) - itemSizes = CryptMemRealloc(itemSizes, - cItems * sizeof(struct AsnArrayItemSize)); - else if (cItems > 1) + if (ptr[0] == 0) { - itemSizes = - CryptMemAlloc( - cItems * sizeof(struct AsnArrayItemSize)); - if (itemSizes) - memcpy(itemSizes, &itemSize, sizeof(itemSize)); + doneDecoding = TRUE; + if (itemLenBytes != 1 || ptr[1] != 0) + { + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } + else + decoded += 2; } - if (itemSizes) + } + else if (ptr - pbEncoded - 1 - lenBytes >= dataLen) + doneDecoding = TRUE; + if (!doneDecoding) + { + DWORD itemDataLen, itemDecoded, size = 0; + + /* Each item decoded may not tolerate extraneous bytes, + * so get the length of the next element and pass it + * directly. + */ + ret = CRYPT_GetLen(ptr, cbEncoded - (ptr - pbEncoded), + &itemDataLen); + if (ret) + ret = arrayDesc->decodeFunc(ptr, + 1 + itemLenBytes + itemDataLen, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &size, + &itemDecoded); + if (ret) { - decoded += itemDecoded; - itemSizes[cItems - 1].encodedLen = 1 + itemLenBytes - + itemDataLen; - itemSizes[cItems - 1].size = size; - bytesNeeded += size; - ret = CRYPT_GetLen(ptr, - cbEncoded - (ptr - pbEncoded), &nextLen); - if (ret) - ptr += nextLen + 1 + GET_LEN_BYTES(ptr[1]); + DWORD nextLen; + + cItems++; + if (itemSizes != &itemSize) + itemSizes = CryptMemRealloc(itemSizes, + cItems * sizeof(struct AsnArrayItemSize)); + else if (cItems > 1) + { + itemSizes = + CryptMemAlloc( + cItems * sizeof(struct AsnArrayItemSize)); + if (itemSizes) + memcpy(itemSizes, &itemSize, + sizeof(itemSize)); + } + if (itemSizes) + { + decoded += itemDecoded; + itemSizes[cItems - 1].encodedLen = + 1 + itemLenBytes + itemDataLen; + itemSizes[cItems - 1].size = size; + bytesNeeded += size; + ret = CRYPT_GetLen(ptr, + cbEncoded - (ptr - pbEncoded), &nextLen); + if (ret) + ptr += nextLen + 1 + GET_LEN_BYTES(ptr[1]); + } + else + ret = FALSE; } - else - ret = FALSE; } } } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 37046b0..13d288b 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1015,7 +1015,6 @@ static void test_decodeName(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, X509_NAME, emptyIndefiniteSequence, sizeof(emptyIndefiniteSequence), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Juan Lang : crypt32: Set bytes decoded in all success paths.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 159a369318ce4e0a1e9223bd92c6cdcf920bd40f URL: http://source.winehq.org/git/wine.git/?a=commit;h=159a369318ce4e0a1e9223bd9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 16:05:06 2007 -0700 crypt32: Set bytes decoded in all success paths. --- 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 67f79d5..7161058 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -457,6 +457,8 @@ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, bytesNeeded += items[i].size; structSize += items[i].minSize; } + if (ret && pcbDecoded) + *pcbDecoded = 1 + lenBytes + cbDecoded; if (!pvStructInfo) *pcbStructInfo = bytesNeeded; else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, @@ -474,8 +476,6 @@ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeSequenceItems(dwFlags, items, cItem, ptr, cbEncoded, dwFlags, pvStructInfo, nextData, &cbDecoded); - if (ret && pcbDecoded) - *pcbDecoded = 1 + lenBytes + cbDecoded; } } } @@ -601,6 +601,8 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, } if (ret) { + if (pcbDecoded) + *pcbDecoded = decoded; if (!pvStructInfo) *pcbStructInfo = bytesNeeded; else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, @@ -611,8 +613,6 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, const BYTE *ptr; struct GenericArray *array; - if (pcbDecoded) - *pcbDecoded = decoded; if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) pvStructInfo = *(BYTE **)pvStructInfo; array = (struct GenericArray *)pvStructInfo; @@ -1157,6 +1157,8 @@ static BOOL CRYPT_AsnDecodeOidIgnoreTag(const BYTE *pbEncoded, DWORD cbEncoded, } } } + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; if (!pvStructInfo) *pcbStructInfo = bytesNeeded; else if (*pcbStructInfo < bytesNeeded) @@ -1198,8 +1200,6 @@ static BOOL CRYPT_AsnDecodeOidIgnoreTag(const BYTE *pbEncoded, DWORD cbEncoded, else *(LPSTR *)pvStructInfo = NULL; *pcbStructInfo = bytesNeeded; - if (pcbDecoded) - *pcbDecoded = 1 + lenBytes + dataLen; } } return ret; @@ -1837,6 +1837,8 @@ static BOOL CRYPT_AsnDecodeCopyBytesInternal(const BYTE *pbEncoded, if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) bytesNeeded += cbEncoded; + if (pcbDecoded) + *pcbDecoded = cbEncoded; if (!pvStructInfo) *pcbStructInfo = bytesNeeded; else if (*pcbStructInfo < bytesNeeded) @@ -1858,8 +1860,6 @@ static BOOL CRYPT_AsnDecodeCopyBytesInternal(const BYTE *pbEncoded, assert(blob->pbData); memcpy(blob->pbData, pbEncoded, blob->cbData); } - if (pcbDecoded) - *pcbDecoded = cbEncoded; } return ret; }

1 0

Juan Lang : crypt32: Remove an unneeded WINAPI.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 54a51afcd77891353400499fc3bd69c81cf5cdf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a51afcd77891353400499fc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:08:23 2007 -0700 crypt32: Remove an unneeded WINAPI. --- dlls/crypt32/decode.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 21383ba..0421bd0 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -137,8 +137,7 @@ static BOOL WINAPI CRYPT_AsnDecodeUnsignedIntegerInternal( * length or if the length is too large for cbEncoded, sets an appropriate * error code and returns FALSE. */ -static BOOL WINAPI CRYPT_GetLen(const BYTE *pbEncoded, DWORD cbEncoded, - DWORD *len) +static BOOL CRYPT_GetLen(const BYTE *pbEncoded, DWORD cbEncoded, DWORD *len) { BOOL ret;

1 0