Implement asn.1 decoding of integers, with tests.
This commit is contained in:
parent
eaef08415d
commit
054a8fb604
|
@ -482,6 +482,77 @@ BOOL WINAPI CryptDecodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType,
|
||||
LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
|
||||
PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo)
|
||||
{
|
||||
int val, i;
|
||||
BOOL ret;
|
||||
|
||||
if (!pbEncoded || !cbEncoded)
|
||||
{
|
||||
SetLastError(ERROR_INVALID_PARAMETER);
|
||||
return FALSE;
|
||||
}
|
||||
if (!pvStructInfo)
|
||||
{
|
||||
*pcbStructInfo = sizeof(int);
|
||||
SetLastError(ERROR_MORE_DATA);
|
||||
return FALSE;
|
||||
}
|
||||
if (pbEncoded[0] != ASN_INTEGER)
|
||||
{
|
||||
SetLastError(CRYPT_E_ASN1_BADTAG);
|
||||
return FALSE;
|
||||
}
|
||||
if (pbEncoded[1] == 0)
|
||||
{
|
||||
SetLastError(CRYPT_E_ASN1_CORRUPT);
|
||||
return FALSE;
|
||||
}
|
||||
if (pbEncoded[1] > sizeof(int))
|
||||
{
|
||||
SetLastError(CRYPT_E_ASN1_LARGE);
|
||||
return FALSE;
|
||||
}
|
||||
if (pbEncoded[2] & 0x80)
|
||||
{
|
||||
/* initialize to a negative value to sign-extend */
|
||||
val = -1;
|
||||
}
|
||||
else
|
||||
val = 0;
|
||||
for (i = 0; i < pbEncoded[1]; i++)
|
||||
{
|
||||
val <<= 8;
|
||||
val |= pbEncoded[2 + i];
|
||||
}
|
||||
if (dwFlags & CRYPT_DECODE_ALLOC_FLAG)
|
||||
{
|
||||
if (pDecodePara && pDecodePara->pfnAlloc)
|
||||
*(BYTE **)pvStructInfo = pDecodePara->pfnAlloc(sizeof(int));
|
||||
else
|
||||
*(BYTE **)pvStructInfo = LocalAlloc(0, sizeof(int));
|
||||
if (!*(BYTE **)pvStructInfo)
|
||||
return FALSE;
|
||||
memcpy(*(BYTE **)pvStructInfo, &val, sizeof(int));
|
||||
ret = TRUE;
|
||||
}
|
||||
else if (*pcbStructInfo < sizeof(int))
|
||||
{
|
||||
*pcbStructInfo = sizeof(int);
|
||||
SetLastError(ERROR_MORE_DATA);
|
||||
ret = FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
*pcbStructInfo = sizeof(int);
|
||||
memcpy(pvStructInfo, &val, sizeof(int));
|
||||
ret = TRUE;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
typedef BOOL (WINAPI *CryptDecodeObjectExFunc)(DWORD, LPCSTR, const BYTE *,
|
||||
DWORD, DWORD, PCRYPT_DECODE_PARA, void *, DWORD *);
|
||||
|
||||
|
@ -493,7 +564,7 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
|
|||
HMODULE lib = NULL;
|
||||
CryptDecodeObjectExFunc decodeFunc = NULL;
|
||||
|
||||
FIXME("(0x%08lx, %s, %p, %ld, 0x%08lx, %p, %p, %p): stub\n",
|
||||
TRACE("(0x%08lx, %s, %p, %ld, 0x%08lx, %p, %p, %p): semi-stub\n",
|
||||
dwCertEncodingType, HIWORD(lpszStructType) ? debugstr_a(lpszStructType) :
|
||||
"(integer value)", pbEncoded, cbEncoded, dwFlags, pDecodePara,
|
||||
pvStructInfo, pcbStructInfo);
|
||||
|
@ -512,6 +583,9 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
|
|||
{
|
||||
switch (LOWORD(lpszStructType))
|
||||
{
|
||||
case (WORD)X509_INTEGER:
|
||||
decodeFunc = CRYPT_AsnDecodeInt;
|
||||
break;
|
||||
default:
|
||||
FIXME("%d: unimplemented\n", LOWORD(lpszStructType));
|
||||
}
|
||||
|
|
|
@ -32,9 +32,7 @@ struct encodedInt
|
|||
BYTE encoded[6];
|
||||
};
|
||||
|
||||
static void test_encodeint(void)
|
||||
{
|
||||
static const struct encodedInt ints[] = {
|
||||
static const struct encodedInt ints[] = {
|
||||
{ 1, { 2, 1, 1 } },
|
||||
{ 127, { 2, 1, 0x7f } },
|
||||
{ 128, { 2, 2, 0x00, 0x80 } },
|
||||
|
@ -42,7 +40,10 @@ static void test_encodeint(void)
|
|||
{ -128, { 2, 1, 0x80 } },
|
||||
{ -129, { 2, 2, 0xff, 0x7f } },
|
||||
{ 0xbaddf00d, { 2, 4, 0xba, 0xdd, 0xf0, 0x0d } },
|
||||
};
|
||||
};
|
||||
|
||||
static void test_encodeint(void)
|
||||
{
|
||||
DWORD bufSize = 0;
|
||||
int i;
|
||||
BOOL ret;
|
||||
|
@ -83,6 +84,66 @@ static void test_encodeint(void)
|
|||
}
|
||||
}
|
||||
|
||||
static void test_decodeint(void)
|
||||
{
|
||||
static const char bigInt[] = { 2, 5, 0xff, 0xfe, 0xff, 0xfe, 0xff };
|
||||
static const char testStr[] = { 16, 4, 't', 'e', 's', 't' };
|
||||
BYTE *buf = NULL;
|
||||
DWORD bufSize = 0;
|
||||
int i;
|
||||
BOOL ret;
|
||||
|
||||
/* CryptDecodeObjectEx with NULL bufSize crashes..
|
||||
ret = CryptDecodeObjectEx(3, X509_INTEGER, &ints[0].encoded,
|
||||
ints[0].encoded[1] + 2, 0, NULL, NULL, NULL);
|
||||
*/
|
||||
/* check bogus encoding */
|
||||
ret = CryptDecodeObjectEx(3, X509_INTEGER, (BYTE *)&ints[0].encoded,
|
||||
ints[0].encoded[1] + 2, 0, NULL, NULL, &bufSize);
|
||||
ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND,
|
||||
"Expected ERROR_FILE_NOT_FOUND, got %ld\n", GetLastError());
|
||||
/* check with NULL integer buffer. Windows XP returns an apparently random
|
||||
* error code (0x01c567df).
|
||||
*/
|
||||
ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_INTEGER, NULL, 0, 0,
|
||||
NULL, NULL, &bufSize);
|
||||
ok(!ret, "Expected failure, got success\n");
|
||||
/* check with a valid, but too large, integer */
|
||||
ret = CryptDecodeObjectEx(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
|
||||
X509_INTEGER, bigInt, bigInt[1] + 2, CRYPT_ENCODE_ALLOC_FLAG, NULL,
|
||||
(BYTE *)&buf, &bufSize);
|
||||
ok(!ret && GetLastError() == CRYPT_E_ASN1_LARGE,
|
||||
"Expected CRYPT_E_ASN1_LARGE, got %ld\n", GetLastError());
|
||||
/* check with a DER-encoded string */
|
||||
ret = CryptDecodeObjectEx(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
|
||||
X509_INTEGER, testStr, testStr[1] + 2, CRYPT_ENCODE_ALLOC_FLAG, NULL,
|
||||
(BYTE *)&buf, &bufSize);
|
||||
ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG,
|
||||
"Expected CRYPT_E_ASN1_BADTAG, got %ld\n", GetLastError());
|
||||
for (i = 0; i < sizeof(ints) / sizeof(ints[0]); i++)
|
||||
{
|
||||
/* WinXP succeeds rather than failing with ERROR_MORE_DATA */
|
||||
ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_INTEGER,
|
||||
(BYTE *)&ints[i].encoded, ints[i].encoded[1] + 2, 0, NULL, NULL,
|
||||
&bufSize);
|
||||
ok(ret || GetLastError() == ERROR_MORE_DATA,
|
||||
"Expected success or ERROR_MORE_DATA, got %ld\n", GetLastError());
|
||||
ret = CryptDecodeObjectEx(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
|
||||
X509_INTEGER, (BYTE *)&ints[i].encoded, ints[i].encoded[1] + 2,
|
||||
CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize);
|
||||
ok(ret, "CryptDecodeObjectEx failed: %ld\n", GetLastError());
|
||||
ok(bufSize == sizeof(int), "Expected size %d, got %ld\n", sizeof(int),
|
||||
bufSize);
|
||||
ok(buf != NULL, "Expected allocated buffer\n");
|
||||
if (buf)
|
||||
{
|
||||
ok(!memcmp(buf, &ints[i].val, bufSize), "Expected %d, got %d\n",
|
||||
ints[i].val, *(int *)buf);
|
||||
LocalFree(buf);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void test_registerOIDFunction(void)
|
||||
{
|
||||
static const WCHAR bogusDll[] = { 'b','o','g','u','s','.','d','l','l',0 };
|
||||
|
@ -140,5 +201,6 @@ static void test_registerOIDFunction(void)
|
|||
START_TEST(encode)
|
||||
{
|
||||
test_encodeint();
|
||||
test_decodeint();
|
||||
test_registerOIDFunction();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue