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

crypt32/tests: Don't pass as a parameter a variable that could be local.

This commit is contained in:
Juan Lang 2009-12-05 15:42:06 -08:00 committed by Alexandre Julliard
parent a5facc9bda
commit cdbf6e8614
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/crypt32/tests/cert.c
View File

@ -1639,16 +1639,16 @@ static void verifySig(HCRYPTPROV csp, const BYTE *toSign, size_t toSignLen,
/* Tests signing the certificate described by toBeSigned with the CSP passed in, /* Tests signing the certificate described by toBeSigned with the CSP passed in,
* using the algorithm with OID sigOID. The CSP is assumed to be empty, and a * using the algorithm with OID sigOID. The CSP is assumed to be empty, and a
* keyset named AT_SIGNATURE will be added to it. The signing key will be * keyset named AT_SIGNATURE will be added to it. The signature will be stored
* stored in *key, and the signature will be stored in sig. sigLen should be * in sig. sigLen should be at least 64 bytes.
* at least 64 bytes.
*/ */
static void testSignCert(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, static void testSignCert(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned,
LPCSTR sigOID, HCRYPTKEY *key, BYTE *sig, DWORD *sigLen) LPCSTR sigOID, BYTE *sig, DWORD *sigLen)
{ {
BOOL ret; BOOL ret;
DWORD size = 0; DWORD size = 0;
CRYPT_ALGORITHM_IDENTIFIER algoID = { NULL, { 0, NULL } }; CRYPT_ALGORITHM_IDENTIFIER algoID = { NULL, { 0, NULL } };
HCRYPTKEY key;
/* These all crash /* These all crash
ret = CryptSignCertificate(0, 0, 0, NULL, 0, NULL, NULL, NULL, NULL); ret = CryptSignCertificate(0, 0, 0, NULL, 0, NULL, NULL, NULL, NULL);
@ -1680,7 +1680,7 @@ static void testSignCert(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned,
ok(!ret && (GetLastError() == NTE_BAD_KEYSET || GetLastError() == ok(!ret && (GetLastError() == NTE_BAD_KEYSET || GetLastError() ==
NTE_NO_KEY), "Expected NTE_BAD_KEYSET or NTE_NO_KEY, got %08x\n", NTE_NO_KEY), "Expected NTE_BAD_KEYSET or NTE_NO_KEY, got %08x\n",
GetLastError()); GetLastError());
ret = CryptGenKey(csp, AT_SIGNATURE, 0, key); ret = CryptGenKey(csp, AT_SIGNATURE, 0, &key);
ok(ret, "CryptGenKey failed: %08x\n", GetLastError()); ok(ret, "CryptGenKey failed: %08x\n", GetLastError());
if (ret) if (ret)
{ {
@ -1700,6 +1700,7 @@ static void testSignCert(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned,
size); size);
} }
} }
CryptDestroyKey(key);
} }
} }
@ -1809,7 +1810,6 @@ static void testCertSigs(void)
HCRYPTPROV csp; HCRYPTPROV csp;
CRYPT_DATA_BLOB toBeSigned = { sizeof(emptyCert), emptyCert }; CRYPT_DATA_BLOB toBeSigned = { sizeof(emptyCert), emptyCert };
BOOL ret; BOOL ret;
HCRYPTKEY key;
BYTE sig[64]; BYTE sig[64];
DWORD sigSize = sizeof(sig); DWORD sigSize = sizeof(sig);
@ -1820,10 +1820,9 @@ static void testCertSigs(void)
CRYPT_NEWKEYSET); CRYPT_NEWKEYSET);
ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError());
testSignCert(csp, &toBeSigned, szOID_RSA_SHA1RSA, &key, sig, &sigSize); testSignCert(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, &sigSize);
testVerifyCertSig(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, sigSize); testVerifyCertSig(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, sigSize);
CryptDestroyKey(key);
CryptReleaseContext(csp, 0); CryptReleaseContext(csp, 0);
ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL,
CRYPT_DELETEKEYSET); CRYPT_DELETEKEYSET);