ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Allow indefinite-length encoding of sequence items.

This commit is contained in:
Juan Lang 2007-09-17 17:26:51 -07:00 committed by Alexandre Julliard
parent be91ad3604
commit 34aaabca83
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/crypt32/decode.c
View File

@ -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,