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

crypt32: Decode cleanups. 

- implement a helper to decode sequences of like types
- use helper functions wherever applicable when decoding
- correct "expected" vs. "got" usage in tests
- fix a few other small bugs
This commit is contained in:
Juan Lang 2005-12-13 11:11:25 +01:00 committed by Alexandre Julliard
parent 6077c63feb
commit 07dfb1ae27
2 changed files with 298 additions and 605 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

889
dlls/crypt32/encode.c
View File

File diff suppressed because it is too large Load Diff

14
dlls/crypt32/tests/encode.c
View File

@ -777,12 +777,12 @@ static void compareNames(const CERT_NAME_INFO *expected,
{ {
ok(got->cRDN == expected->cRDN, "Expected %ld RDNs, got %ld\n", ok(got->cRDN == expected->cRDN, "Expected %ld RDNs, got %ld\n",
expected->cRDN, got->cRDN); expected->cRDN, got->cRDN);
if (expected->cRDN) if (got->cRDN)
{ {
ok(got->rgRDN[0].cRDNAttr == expected->rgRDN[0].cRDNAttr, ok(got->rgRDN[0].cRDNAttr == expected->rgRDN[0].cRDNAttr,
"Expected %ld RDN attrs, got %ld\n", expected->rgRDN[0].cRDNAttr, "Expected %ld RDN attrs, got %ld\n", expected->rgRDN[0].cRDNAttr,
got->rgRDN[0].cRDNAttr); got->rgRDN[0].cRDNAttr);
if (expected->rgRDN[0].cRDNAttr) if (got->rgRDN[0].cRDNAttr)
{ {
if (expected->rgRDN[0].rgRDNAttr[0].pszObjId && if (expected->rgRDN[0].rgRDNAttr[0].pszObjId &&
strlen(expected->rgRDN[0].rgRDNAttr[0].pszObjId)) strlen(expected->rgRDN[0].rgRDNAttr[0].pszObjId))
@ -802,10 +802,12 @@ static void compareNames(const CERT_NAME_INFO *expected,
"Unexpected data size, got %ld, expected %ld\n", "Unexpected data size, got %ld, expected %ld\n",
got->rgRDN[0].rgRDNAttr[0].Value.cbData, got->rgRDN[0].rgRDNAttr[0].Value.cbData,
expected->rgRDN[0].rgRDNAttr[0].Value.cbData); expected->rgRDN[0].rgRDNAttr[0].Value.cbData);
if (expected->rgRDN[0].rgRDNAttr[0].Value.pbData) if (got->rgRDN[0].rgRDNAttr[0].Value.cbData &&
got->rgRDN[0].rgRDNAttr[0].Value.pbData)
ok(!memcmp(got->rgRDN[0].rgRDNAttr[0].Value.pbData, ok(!memcmp(got->rgRDN[0].rgRDNAttr[0].Value.pbData,
expected->rgRDN[0].rgRDNAttr[0].Value.pbData, expected->rgRDN[0].rgRDNAttr[0].Value.pbData,
expected->rgRDN[0].rgRDNAttr[0].Value.cbData), min(got->rgRDN[0].rgRDNAttr[0].Value.cbData,
expected->rgRDN[0].rgRDNAttr[0].Value.cbData)),
"Unexpected value\n"); "Unexpected value\n");
} }
} }
@ -837,7 +839,7 @@ static void test_decodeName(DWORD dwEncoding)
rdn.rgRDNAttr = (CERT_RDN_ATTR *)&names[i].attr; rdn.rgRDNAttr = (CERT_RDN_ATTR *)&names[i].attr;
if (buf) if (buf)
{ {
compareNames((CERT_NAME_INFO *)buf, &info); compareNames(&info, (CERT_NAME_INFO *)buf);
LocalFree(buf); LocalFree(buf);
} }
} }
@ -894,7 +896,7 @@ static void test_decodeName(DWORD dwEncoding)
rdn.cRDNAttr = sizeof(attrs) / sizeof(attrs[0]); rdn.cRDNAttr = sizeof(attrs) / sizeof(attrs[0]);
rdn.rgRDNAttr = attrs; rdn.rgRDNAttr = attrs;
compareNames((CERT_NAME_INFO *)buf, &info); compareNames(&info, (CERT_NAME_INFO *)buf);
LocalFree(buf); LocalFree(buf);
} }
} }