From 49c32e6d38bd8f3a0d3b8ca6342f4a9721ebae3f Mon Sep 17 00:00:00 2001 From: Juan Lang Date: Mon, 17 Sep 2007 17:11:54 -0700 Subject: [PATCH] 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 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(DWOR 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(DWOR 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.4.1