Juan Lang : crypt32: Get rid of encoding type from AsnDecodeSequenceItems, it's never checked.
Alexandre Julliard
julliard at winehq.org
Tue Sep 18 05:31:27 CDT 2007
Module: wine
Branch: master
Commit: 19fd9872a669147e14cff3adc4dbdcc7e5f74fa9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fd9872a669147e14cff3adc4dbdcc7e5f74fa9
Author: Juan Lang <juan.lang at 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);
}
More information about the wine-cvs
mailing list