Skip to content

W
wine-cw
Commit 6848da72 authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard
Browse files
Options

secur32: Fix a few tests that fail in win2k3.

parent 77d259f4
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
dlls/secur32/tests/schannel.c
View file @ 6848da72
...@@ -221,8 +221,8 @@ static void testAcquireSecurityContext(void) ...@@ -221,8 +221,8 @@ static void testAcquireSecurityContext(void)
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, NULL, NULL, NULL, &cred, &exp); NULL, NULL, NULL, NULL, &cred, &exp);
ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st);
ok(exp.HighPart == 0 && exp.LowPart == 0, /* expriy is indeterminate in win2k3 */
"Expected 0 expiry, got %08lx%08lx\n", exp.HighPart, exp.LowPart); trace("expiry: %08lx%08lx\n", exp.HighPart, exp.LowPart);
pFreeCredentialsHandle(&cred); pFreeCredentialsHandle(&cred);
/* Bad version in SCHANNEL_CRED */ /* Bad version in SCHANNEL_CRED */
...@@ -351,7 +351,9 @@ static void testAcquireSecurityContext(void) ...@@ -351,7 +351,9 @@ static void testAcquireSecurityContext(void)
pFreeCredentialsHandle(&cred); pFreeCredentialsHandle(&cred);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL); NULL, &schanCred, NULL, NULL, &cred, NULL);
ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); ok(st == SEC_E_OK ||
st == SEC_E_UNKNOWN_CREDENTIALS, /* win2k3 */
"AcquireCredentialsHandleA failed: %08x\n", st);
pFreeCredentialsHandle(&cred); pFreeCredentialsHandle(&cred);
schanCred.dwVersion = SCHANNEL_CRED_VERSION; schanCred.dwVersion = SCHANNEL_CRED_VERSION;
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
...@@ -360,8 +362,10 @@ static void testAcquireSecurityContext(void) ...@@ -360,8 +362,10 @@ static void testAcquireSecurityContext(void)
pFreeCredentialsHandle(&cred); pFreeCredentialsHandle(&cred);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL); NULL, &schanCred, NULL, NULL, &cred, NULL);
ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); ok(st == SEC_E_OK ||
test_strength(&cred); st == SEC_E_UNKNOWN_CREDENTIALS, /* win2k3 */
"AcquireCredentialsHandleA failed: %08x\n", st);
if (st == SEC_E_OK) test_strength(&cred);
pFreeCredentialsHandle(&cred); pFreeCredentialsHandle(&cred);
/* How about more than one cert? */ /* How about more than one cert? */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment