Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-03 21:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRYPT32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

Browse source 
svn path=/trunk/; revision=66806
This commit is contained in:
Amine Khaldi 2015-03-19 12:37:21 +00:00
parent fd10f42deb
commit 31c9d59bc1
4 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rostests/winetests/crypt32/base64.c
View file

@ -57,7 +57,7 @@ struct BinTests
static const BYTE toEncode1[] = { 0 };
static const BYTE toEncode2[] = { 1,2 };
static const BYTE toEncode3[] = { 1,2,3 };
/* static const BYTE toEncode3[] = { 1,2,3 }; */
static const BYTE toEncode4[] =
"abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890"
"abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890"

16
rostests/winetests/crypt32/ctl.c
View file

@ -390,20 +390,8 @@ static void testAddCTLToStore(void)
signedCTLWithCTLInnerContentAndBadSig,
sizeof(signedCTLWithCTLInnerContentAndBadSig), CERT_STORE_ADD_NEW,
NULL);
if (ret)
{
/* win9x */
ok(GetLastError() == CRYPT_E_NOT_FOUND ||
GetLastError() == OSS_DATA_ERROR /* some win98 */,
"Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError());
}
else
{
ok(!ret && (GetLastError() == CRYPT_E_EXISTS ||
GetLastError() == OSS_DATA_ERROR),
"expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret,
GetLastError());
}
ok(!ret && (GetLastError() == CRYPT_E_EXISTS || GetLastError() == OSS_DATA_ERROR),
"expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret, GetLastError());
CertCloseStore(store, 0);
store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,

3
rostests/winetests/crypt32/encode.c
View file

@ -3732,7 +3732,7 @@ static void compareAltNameEntry(const CERT_ALT_NAME_ENTRY *expected,
case CERT_ALT_NAME_IP_ADDRESS:
ok(U(*got).IPAddress.cbData == U(*expected).IPAddress.cbData,
"Unexpected IP address length %d\n", U(*got).IPAddress.cbData);
ok(!memcmp(U(*got).IPAddress.pbData, U(*got).IPAddress.pbData,
ok(!memcmp(U(*got).IPAddress.pbData, U(*expected).IPAddress.pbData,
U(*got).IPAddress.cbData), "Unexpected value\n");
break;
}
@ -5762,7 +5762,6 @@ static void test_decodeCTL(DWORD dwEncoding)
info.SubjectAlgorithm.Parameters.cbData = 0;
info.ThisUpdate.dwLowDateTime = info.ThisUpdate.dwHighDateTime = 0;
info.NextUpdate.dwLowDateTime = info.NextUpdate.dwHighDateTime = 0;
info.SubjectAlgorithm.pszObjId = oid2;
info.SubjectAlgorithm.pszObjId = NULL;
value1.cbData = sizeof(emptySequence);
value1.pbData = (LPBYTE)emptySequence;

4
rostests/winetests/crypt32/msg.c
View file

@ -2666,12 +2666,12 @@ static void compare_signer_info(const CMSG_SIGNER_INFO *got,
ok(got->Issuer.cbData == expected->Issuer.cbData,
"Expected issuer size %d, got %d\n", expected->Issuer.cbData,
got->Issuer.cbData);
ok(!memcmp(got->Issuer.pbData, got->Issuer.pbData, got->Issuer.cbData),
ok(!memcmp(got->Issuer.pbData, expected->Issuer.pbData, got->Issuer.cbData),
"Unexpected issuer\n");
ok(got->SerialNumber.cbData == expected->SerialNumber.cbData,
"Expected serial number size %d, got %d\n", expected->SerialNumber.cbData,
got->SerialNumber.cbData);
ok(!memcmp(got->SerialNumber.pbData, got->SerialNumber.pbData,
ok(!memcmp(got->SerialNumber.pbData, expected->SerialNumber.pbData,
got->SerialNumber.cbData), "Unexpected serial number\n");
/* FIXME: check more things */
}