Juan Lang : wintrust: Simplify CRYPT_AsnDecodeInt.
Alexandre Julliard
julliard at winehq.org
Mon Oct 19 09:56:07 CDT 2009
Module: wine
Branch: master
Commit: af192c20f960609449ae11fa7a4bc5d148cc90b2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=af192c20f960609449ae11fa7a4bc5d148cc90b2
Author: Juan Lang <juan.lang at gmail.com>
Date: Fri Oct 16 11:52:01 2009 -0700
wintrust: Simplify CRYPT_AsnDecodeInt.
---
dlls/wintrust/asn.c | 62 +++++++++-----------------------------------------
1 files changed, 11 insertions(+), 51 deletions(-)
diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c
index 002eab5..472521f 100644
--- a/dlls/wintrust/asn.c
+++ b/dlls/wintrust/asn.c
@@ -2179,62 +2179,24 @@ BOOL WINAPI WVTAsn1SpcSpOpusInfoDecode(DWORD dwCertEncodingType,
return ret;
}
-static BOOL CRYPT_AsnDecodeInteger(const BYTE *pbEncoded,
- DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo)
+/* Ignores tag. Only allows integers 4 bytes or smaller in size. */
+static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType,
+ LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
+ void *pvStructInfo, DWORD *pcbStructInfo)
{
BOOL ret;
- DWORD bytesNeeded, dataLen;
+ DWORD dataLen;
if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen)))
{
BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]);
- bytesNeeded = dataLen + sizeof(CRYPT_INTEGER_BLOB);
- if (!pvStructInfo)
- *pcbStructInfo = bytesNeeded;
- else if (*pcbStructInfo < bytesNeeded)
+ if (dataLen > sizeof(int))
{
- *pcbStructInfo = bytesNeeded;
- SetLastError(ERROR_MORE_DATA);
+ SetLastError(CRYPT_E_ASN1_LARGE);
ret = FALSE;
}
- else
- {
- CRYPT_INTEGER_BLOB *blob = pvStructInfo;
-
- *pcbStructInfo = bytesNeeded;
- blob->cbData = dataLen;
- assert(blob->pbData);
- if (blob->cbData)
- {
- DWORD i;
-
- for (i = 0; i < blob->cbData; i++)
- {
- blob->pbData[i] = *(pbEncoded + 1 + lenBytes +
- dataLen - i - 1);
- }
- }
- }
- }
- return ret;
-}
-
-/* Ignores tag. Only allows integers 4 bytes or smaller in size. */
-static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType,
- LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
- void *pvStructInfo, DWORD *pcbStructInfo)
-{
- 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);
- ret = CRYPT_AsnDecodeInteger(pbEncoded, cbEncoded, 0, buf, &size);
- if (ret)
- {
- if (!pvStructInfo)
+ else if (!pvStructInfo)
*pcbStructInfo = sizeof(int);
else if (*pcbStructInfo < sizeof(int))
{
@@ -2248,23 +2210,21 @@ static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType,
DWORD i;
*pcbStructInfo = sizeof(int);
- if (blob->pbData[blob->cbData - 1] & 0x80)
+ if (dataLen && pbEncoded[1 + lenBytes] & 0x80)
{
/* initialize to a negative value to sign-extend */
val = -1;
}
else
val = 0;
- for (i = 0; i < blob->cbData; i++)
+ for (i = 0; i < dataLen; i++)
{
val <<= 8;
- val |= blob->pbData[blob->cbData - i - 1];
+ val |= pbEncoded[1 + lenBytes + i];
}
memcpy(pvStructInfo, &val, sizeof(int));
}
}
- else if (GetLastError() == ERROR_MORE_DATA)
- SetLastError(CRYPT_E_ASN1_LARGE);
return ret;
}
More information about the wine-cvs
mailing list