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

Improve CryptAlgIdToOID/CryptOIDToAlgId tests, and prevent a crash in 

CryptOIDToAlgId.
This commit is contained in:
Juan Lang 2005-09-03 09:36:55 +00:00 committed by Alexandre Julliard
parent f7413fd63f
commit 160b9149a1
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/crypt32/main.c
View File

@ -294,10 +294,13 @@ DWORD WINAPI CertOIDToAlgId(LPCSTR pszObjId)
{ {
int i; int i;
for (i = 0; i < sizeof(oidToAlgID) / sizeof(oidToAlgID[0]); i++) if (pszObjId)
{ {
if (!strcmp(pszObjId, oidToAlgID[i].oid)) for (i = 0; i < sizeof(oidToAlgID) / sizeof(oidToAlgID[0]); i++)
return oidToAlgID[i].algID; {
if (!strcmp(pszObjId, oidToAlgID[i].oid))
return oidToAlgID[i].algID;
}
} }
return 0; return 0;
} }

33
dlls/crypt32/tests/main.c
View File

@ -87,12 +87,21 @@ static const struct OIDToAlgID algIDToOID[] = {
static void testOIDToAlgID(void) static void testOIDToAlgID(void)
{ {
int i; int i;
DWORD alg;
/* Test with a bogus one */
SetLastError(0xdeadbeef);
alg = CertOIDToAlgId("1.2.3");
ok(!alg && GetLastError() == 0xdeadbeef,
"Didn't expect last error (%08lx) to be set\n", GetLastError());
for (i = 0; i < sizeof(oidToAlgID) / sizeof(oidToAlgID[0]); i++) for (i = 0; i < sizeof(oidToAlgID) / sizeof(oidToAlgID[0]); i++)
{ {
DWORD alg = CertOIDToAlgId(oidToAlgID[i].oid); alg = CertOIDToAlgId(oidToAlgID[i].oid);
/* Not all Windows installations support all these, so make sure it's
ok(alg == oidToAlgID[i].algID, * at least not the wrong one.
*/
ok(alg == 0 || alg == oidToAlgID[i].algID,
"Expected %ld, got %ld\n", oidToAlgID[i].algID, alg); "Expected %ld, got %ld\n", oidToAlgID[i].algID, alg);
} }
} }
@ -100,16 +109,20 @@ static void testOIDToAlgID(void)
static void testAlgIDToOID(void) static void testAlgIDToOID(void)
{ {
int i; int i;
LPCSTR oid;
/* Test with a bogus one */
SetLastError(0xdeadbeef);
oid = CertAlgIdToOID(ALG_CLASS_SIGNATURE | ALG_TYPE_ANY | 80);
ok(!oid && GetLastError() == 0xdeadbeef,
"Didn't expect last error (%08lx) to be set\n", GetLastError());
for (i = 0; i < sizeof(algIDToOID) / sizeof(algIDToOID[0]); i++) for (i = 0; i < sizeof(algIDToOID) / sizeof(algIDToOID[0]); i++)
{ {
LPCSTR oid = CertAlgIdToOID(algIDToOID[i].algID); oid = CertAlgIdToOID(algIDToOID[i].algID);
/* Allow failure, not every version of Windows supports every algo */
if ((!oid || !algIDToOID[i].oid) && oid != algIDToOID[i].oid && if (oid)
algIDToOID[i].algID) ok(!strcmp(oid, algIDToOID[i].oid),
printf("Expected %s, got %s\n", algIDToOID[i].oid, oid); "Expected %s, got %s\n", algIDToOID[i].oid, oid);
else if (oid && algIDToOID[i].oid && strcmp(oid, algIDToOID[i].oid))
printf("Expected %s, got %s\n", algIDToOID[i].oid, oid);
} }
} }