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

crypt32: Use correct encoded length when decoding a sequence.

This commit is contained in:
Juan Lang 2007-09-17 17:28:09 -07:00 committed by Alexandre Julliard
parent f534a67bfc
commit 43e6b48b33
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/crypt32/decode.c
View File

@ -454,7 +454,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[],
cbEncoded -= 1 + lenBytes; cbEncoded -= 1 + lenBytes;
if (dataLen == CMSG_INDEFINITE_LENGTH) if (dataLen == CMSG_INDEFINITE_LENGTH)
cbEncoded = dataLen; dataLen = cbEncoded;
else if (cbEncoded < dataLen) else if (cbEncoded < dataLen)
{ {
TRACE("dataLen %d exceeds cbEncoded %d, failing\n", dataLen, TRACE("dataLen %d exceeds cbEncoded %d, failing\n", dataLen,
@ -462,12 +462,10 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[],
SetLastError(CRYPT_E_ASN1_CORRUPT); SetLastError(CRYPT_E_ASN1_CORRUPT);
ret = FALSE; ret = FALSE;
} }
else
cbEncoded = dataLen;
if (ret) if (ret)
{ {
ret = CRYPT_AsnDecodeSequenceItems(items, cItem, ret = CRYPT_AsnDecodeSequenceItems(items, cItem,
ptr, cbEncoded, dwFlags, NULL, NULL, &cbDecoded); ptr, dataLen, dwFlags, NULL, NULL, &cbDecoded);
if (ret && dataLen == CMSG_INDEFINITE_LENGTH) if (ret && dataLen == CMSG_INDEFINITE_LENGTH)
{ {
if (cbDecoded > cbEncoded - 2) if (cbDecoded > cbEncoded - 2)
@ -487,9 +485,9 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[],
cbDecoded += 2; cbDecoded += 2;
} }
} }
if (ret && cbDecoded != cbEncoded) if (ret && cbDecoded != dataLen)
{ {
TRACE("expected %d decoded, got %d, failing\n", cbEncoded, TRACE("expected %d decoded, got %d, failing\n", dataLen,
cbDecoded); cbDecoded);
SetLastError(CRYPT_E_ASN1_CORRUPT); SetLastError(CRYPT_E_ASN1_CORRUPT);
ret = FALSE; ret = FALSE;
@ -520,7 +518,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[],
nextData = (BYTE *)pvStructInfo + structSize; nextData = (BYTE *)pvStructInfo + structSize;
memset(pvStructInfo, 0, structSize); memset(pvStructInfo, 0, structSize);
ret = CRYPT_AsnDecodeSequenceItems(items, cItem, ret = CRYPT_AsnDecodeSequenceItems(items, cItem,
ptr, cbEncoded, dwFlags, pvStructInfo, nextData, ptr, dataLen, dwFlags, pvStructInfo, nextData,
&cbDecoded); &cbDecoded);
} }
} }