Paul Vriens : advapi32/tests: Restore default cryptographic provider after the tests.
Alexandre Julliard
julliard at winehq.org
Mon Mar 15 12:19:30 CDT 2010
Module: wine
Branch: master
Commit: 0b994d0aee643c59b985613802d3d4aa069f3554
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b994d0aee643c59b985613802d3d4aa069f3554
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Mon Mar 8 11:16:15 2010 +0100
advapi32/tests: Restore default cryptographic provider after the tests.
---
dlls/advapi32/tests/crypt.c | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c
index 2a5993c..12288fd 100644
--- a/dlls/advapi32/tests/crypt.c
+++ b/dlls/advapi32/tests/crypt.c
@@ -856,6 +856,8 @@ static void test_set_provider_ex(void)
{
DWORD result;
DWORD notNull = 5;
+ LPSTR curProvName = NULL;
+ DWORD curlen;
/* results */
LPSTR pszProvName = NULL;
@@ -867,6 +869,13 @@ static void test_set_provider_ex(void)
return;
}
+ /* store the current one */
+ pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, NULL, &curlen);
+ if (!(curProvName = LocalAlloc(LMEM_ZEROINIT, curlen)))
+ return;
+ result = pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, curProvName, &curlen);
+ ok(result, "%d\n", GetLastError());
+
/* check pdwReserved for NULL */
result = pCryptSetProviderExA(MS_DEF_PROV, PROV_RSA_FULL, ¬Null, CRYPT_MACHINE_DEFAULT);
ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "expected %i, got %d\n",
@@ -880,6 +889,7 @@ static void test_set_provider_ex(void)
ok( GetLastError() == ERROR_ACCESS_DENIED || broken(GetLastError() == ERROR_INVALID_PARAMETER),
"wrong error %u\n", GetLastError() );
skip("Not enough rights to remove the default provider\n");
+ LocalFree(curProvName);
return;
}
@@ -889,13 +899,19 @@ static void test_set_provider_ex(void)
/* call CryptGetDefaultProvider to see if they match */
result = pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, NULL, &cbProvName);
if (!(pszProvName = LocalAlloc(LMEM_ZEROINIT, cbProvName)))
- return;
+ goto reset;
result = pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, pszProvName, &cbProvName);
ok(result && !strcmp(MS_DEF_PROV, pszProvName), "expected %s, got %s\n", MS_DEF_PROV, pszProvName);
ok(result && cbProvName==(strlen(MS_DEF_PROV) + 1), "expected %i, got %d\n", (lstrlenA(MS_DEF_PROV) + 1), cbProvName);
LocalFree(pszProvName);
+
+reset:
+ /* Set the provider back to it's original */
+ result = pCryptSetProviderExA(curProvName, PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT);
+ ok(result, "%d\n", GetLastError());
+ LocalFree(curProvName);
}
static void test_machine_guid(void)
More information about the wine-cvs
mailing list