[PATCH 1/2] advapi32: Return ERROR_INVALID_PARAMETER for invalid crypt objects' handles.
Paul Gofman
pgofman at codeweavers.com
Wed Feb 17 12:25:28 CST 2021
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
---
Supersedes 199774-199776
v2:
- don't pass error code to helper and always return _INVALID_PARAMETER
(renamed patch accordingly).
- add tests showing that _INVALID_PARAMETER is returned on Windows
where we were previously returning _INVALID_HANDLE.
- squash with patch 1.
dlls/advapi32/crypt.c | 410 +++++++++++++++++++-----------------
dlls/advapi32/tests/crypt.c | 55 ++++-
2 files changed, 264 insertions(+), 201 deletions(-)
diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c
index a9314d31472..e56a90795a8 100644
--- a/dlls/advapi32/crypt.c
+++ b/dlls/advapi32/crypt.c
@@ -57,6 +57,31 @@ static HWND crypt_hWindow;
#define CRYPT_Alloc(size) (LocalAlloc(LMEM_ZEROINIT, size))
#define CRYPT_Free(buffer) (LocalFree(buffer))
+static void *pointer_from_handle(UINT_PTR handle, DWORD magic)
+{
+ if (!handle || *(DWORD *)handle != magic)
+ {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return NULL;
+ }
+ return (void *)handle;
+}
+
+static PCRYPTPROV provider_from_handle(HCRYPTPROV handle)
+{
+ return pointer_from_handle(handle, MAGIC_CRYPTPROV);
+}
+
+static PCRYPTHASH hash_from_handle(HCRYPTHASH handle)
+{
+ return pointer_from_handle(handle, MAGIC_CRYPTHASH);
+}
+
+static PCRYPTKEY key_from_handle(HCRYPTKEY handle)
+{
+ return pointer_from_handle(handle, MAGIC_CRYPTKEY);
+}
+
static inline PWSTR CRYPT_GetProvKeyName(PCWSTR pProvName)
{
static const WCHAR KEYSTR[] = L"Software\\Microsoft\\Cryptography\\Defaults\\Provider\\";
@@ -578,21 +603,12 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer,
*/
BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFlags)
{
- PCRYPTPROV pProv = (PCRYPTPROV)hProv;
+ PCRYPTPROV pProv = provider_from_handle(hProv);
TRACE("(0x%lx, %p, %08x)\n", hProv, pdwReserved, dwFlags);
if (!pProv)
- {
- SetLastError(NTE_BAD_UID);
- return FALSE;
- }
-
- if (pProv->dwMagic != MAGIC_CRYPTPROV)
- {
- SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
- }
InterlockedIncrement(&pProv->refcount);
return TRUE;
@@ -613,22 +629,13 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl
*/
BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags)
{
- PCRYPTPROV pProv = (PCRYPTPROV)hProv;
+ PCRYPTPROV pProv = provider_from_handle(hProv);
BOOL ret = TRUE;
TRACE("(0x%lx, %08x)\n", hProv, dwFlags);
if (!pProv)
- {
- SetLastError(ERROR_INVALID_PARAMETER);
- return FALSE;
- }
-
- if (pProv->dwMagic != MAGIC_CRYPTPROV)
- {
- SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
- }
if (InterlockedDecrement(&pProv->refcount) == 0)
{
@@ -665,21 +672,12 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags)
*/
BOOL WINAPI CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer)
{
- PCRYPTPROV prov = (PCRYPTPROV)hProv;
+ PCRYPTPROV prov = provider_from_handle(hProv);
TRACE("(0x%lx, %d, %p)\n", hProv, dwLen, pbBuffer);
- if (!hProv)
- {
- SetLastError(ERROR_INVALID_HANDLE);
- return FALSE;
- }
-
- if (prov->dwMagic != MAGIC_CRYPTPROV)
- {
- SetLastError(ERROR_INVALID_PARAMETER);
+ if (!prov)
return FALSE;
- }
return prov->pFuncs->pCPGenRandom(prov->hPrivate, dwLen, pbBuffer);
}
@@ -704,45 +702,51 @@ BOOL WINAPI CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer)
* If the algorithm is a keyed hash, hKey is the key.
*/
BOOL WINAPI CryptCreateHash (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey,
- DWORD dwFlags, HCRYPTHASH *phHash)
+ DWORD dwFlags, HCRYPTHASH *phHash)
{
- PCRYPTPROV prov = (PCRYPTPROV)hProv;
- PCRYPTKEY key = (PCRYPTKEY)hKey;
- PCRYPTHASH hash;
+ PCRYPTKEY key = NULL;
+ PCRYPTPROV prov;
+ PCRYPTHASH hash;
- TRACE("(0x%lx, 0x%x, 0x%lx, %08x, %p)\n", hProv, Algid, hKey, dwFlags, phHash);
+ TRACE("(0x%lx, 0x%x, 0x%lx, %08x, %p)\n", hProv, Algid, hKey, dwFlags, phHash);
- if (!prov || !phHash || prov->dwMagic != MAGIC_CRYPTPROV ||
- (key && key->dwMagic != MAGIC_CRYPTKEY))
- {
- SetLastError(ERROR_INVALID_PARAMETER);
- return FALSE;
- }
- if (dwFlags)
- {
- SetLastError(NTE_BAD_FLAGS);
- return FALSE;
- }
- if ( !(hash = CRYPT_Alloc(sizeof(CRYPTHASH))) )
- {
- SetLastError(ERROR_NOT_ENOUGH_MEMORY);
- return FALSE;
- }
+ if (!(prov = provider_from_handle(hProv)))
+ return FALSE;
+
+ if (hKey && !(key = key_from_handle(hKey)))
+ return FALSE;
+
+ if (!phHash)
+ {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return FALSE;
+ }
+
+ if (dwFlags)
+ {
+ SetLastError(NTE_BAD_FLAGS);
+ return FALSE;
+ }
+ if ( !(hash = CRYPT_Alloc(sizeof(CRYPTHASH))) )
+ {
+ SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+ return FALSE;
+ }
- hash->pProvider = prov;
- hash->dwMagic = MAGIC_CRYPTHASH;
- if (prov->pFuncs->pCPCreateHash(prov->hPrivate, Algid,
- key ? key->hPrivate : 0, 0, &hash->hPrivate))
+ hash->pProvider = prov;
+ hash->dwMagic = MAGIC_CRYPTHASH;
+ if (prov->pFuncs->pCPCreateHash(prov->hPrivate, Algid,
+ key ? key->hPrivate : 0, 0, &hash->hPrivate))
{
*phHash = (HCRYPTHASH)hash;
return TRUE;
}
- /* CSP error! */
- hash->dwMagic = 0;
- CRYPT_Free(hash);
- *phHash = 0;
- return FALSE;
+ /* CSP error! */
+ hash->dwMagic = 0;
+ CRYPT_Free(hash);
+ *phHash = 0;
+ return FALSE;
}
/******************************************************************************
@@ -764,25 +768,29 @@ BOOL WINAPI CryptCreateHash (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey,
* Failure: FALSE
*/
BOOL WINAPI CryptDecrypt (HCRYPTKEY hKey, HCRYPTHASH hHash, BOOL Final,
- DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen)
+ DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen)
{
- PCRYPTPROV prov;
- PCRYPTKEY key = (PCRYPTKEY)hKey;
- PCRYPTHASH hash = (PCRYPTHASH)hHash;
+ PCRYPTHASH hash = NULL;
+ PCRYPTPROV prov;
+ PCRYPTKEY key;
- TRACE("(0x%lx, 0x%lx, %d, %08x, %p, %p)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen);
+ TRACE("(0x%lx, 0x%lx, %d, %08x, %p, %p)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen);
- if (!key || !pbData || !pdwDataLen ||
- !key->pProvider || key->dwMagic != MAGIC_CRYPTKEY ||
- key->pProvider->dwMagic != MAGIC_CRYPTPROV)
- {
- SetLastError(ERROR_INVALID_PARAMETER);
- return FALSE;
- }
+ if (!(key = key_from_handle(hKey)))
+ return FALSE;
- prov = key->pProvider;
- return prov->pFuncs->pCPDecrypt(prov->hPrivate, key->hPrivate, hash ? hash->hPrivate : 0,
- Final, dwFlags, pbData, pdwDataLen);
+ if (hHash && !(hash = hash_from_handle(hHash)))
+ return FALSE;
+
+ if (!pbData || !pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV)
+ {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return FALSE;
+ }
+
+ prov = key->pProvider;
+ return prov->pFuncs->pCPDecrypt(prov->hPrivate, key->hPrivate, hash ? hash->hPrivate : 0,
+ Final, dwFlags, pbData, pdwDataLen);
}
/******************************************************************************
@@ -802,43 +810,44 @@ BOOL WINAPI CryptDecrypt (HCRYPTKEY hKey, HCRYPTHASH hHash, BOOL Final,
* Failure: FALSE
*/
BOOL WINAPI CryptDeriveKey (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseData,
- DWORD dwFlags, HCRYPTKEY *phKey)
+ DWORD dwFlags, HCRYPTKEY *phKey)
{
- PCRYPTPROV prov = (PCRYPTPROV)hProv;
- PCRYPTHASH hash = (PCRYPTHASH)hBaseData;
- PCRYPTKEY key;
+ PCRYPTPROV prov;
+ PCRYPTHASH hash;
+ PCRYPTKEY key;
- TRACE("(0x%lx, 0x%08x, 0x%lx, 0x%08x, %p)\n", hProv, Algid, hBaseData, dwFlags, phKey);
+ TRACE("(0x%lx, 0x%08x, 0x%lx, 0x%08x, %p)\n", hProv, Algid, hBaseData, dwFlags, phKey);
- if (!prov || !hash)
- {
- SetLastError(ERROR_INVALID_HANDLE);
- return FALSE;
- }
- if (!phKey || prov->dwMagic != MAGIC_CRYPTPROV || hash->dwMagic != MAGIC_CRYPTHASH)
- {
- SetLastError(ERROR_INVALID_PARAMETER);
- return FALSE;
- }
- if ( !(key = CRYPT_Alloc(sizeof(CRYPTKEY))) )
- {
- SetLastError(ERROR_NOT_ENOUGH_MEMORY);
- return FALSE;
- }
+ if (!(prov = provider_from_handle(hProv)))
+ return FALSE;
- key->pProvider = prov;
- key->dwMagic = MAGIC_CRYPTKEY;
- if (prov->pFuncs->pCPDeriveKey(prov->hPrivate, Algid, hash->hPrivate, dwFlags, &key->hPrivate))
+ if (!(hash = hash_from_handle(hBaseData)))
+ return FALSE;
+
+ if (!phKey)
+ {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return FALSE;
+ }
+ if ( !(key = CRYPT_Alloc(sizeof(CRYPTKEY))) )
+ {
+ SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+ return FALSE;
+ }
+
+ key->pProvider = prov;
+ key->dwMagic = MAGIC_CRYPTKEY;
+ if (prov->pFuncs->pCPDeriveKey(prov->hPrivate, Algid, hash->hPrivate, dwFlags, &key->hPrivate))
{
*phKey = (HCRYPTKEY)key;
return TRUE;
}
- /* CSP error! */
- key->dwMagic = 0;
- CRYPT_Free(key);
- *phKey = 0;
- return FALSE;
+ /* CSP error! */
+ key->dwMagic = 0;
+ CRYPT_Free(key);
+ *phKey = 0;
+ return FALSE;
}
/******************************************************************************
@@ -855,20 +864,16 @@ BOOL WINAPI CryptDeriveKey (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseData
*/
BOOL WINAPI CryptDestroyHash (HCRYPTHASH hHash)
{
- PCRYPTHASH hash = (PCRYPTHASH)hHash;
+ PCRYPTHASH hash;
PCRYPTPROV prov;
BOOL ret;
TRACE("(0x%lx)\n", hHash);
- if (!hash)
- {
- SetLastError(ERROR_INVALID_HANDLE);
+ if (!(hash = hash_from_handle(hHash)))
return FALSE;
- }
- if (!hash->pProvider || hash->dwMagic != MAGIC_CRYPTHASH ||
- hash->pProvider->dwMagic != MAGIC_CRYPTPROV)
+ if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -895,20 +900,16 @@ BOOL WINAPI CryptDestroyHash (HCRYPTHASH hHash)
*/
BOOL WINAPI CryptDestroyKey (HCRYPTKEY hKey)
{
- PCRYPTKEY key = (PCRYPTKEY)hKey;
PCRYPTPROV prov;
+ PCRYPTKEY key;
BOOL ret;
TRACE("(0x%lx)\n", hKey);
- if (!key)
- {
- SetLastError(ERROR_INVALID_HANDLE);
+ if (!(key = key_from_handle(hKey)))
return FALSE;
- }
- if (!key->pProvider || key->dwMagic != MAGIC_CRYPTKEY ||
- key->pProvider->dwMagic != MAGIC_CRYPTPROV)
+ if (!key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -944,9 +945,10 @@ BOOL WINAPI CryptDuplicateHash (HCRYPTHASH hHash, DWORD *pdwReserved,
TRACE("(0x%lx, %p, %08x, %p)\n", hHash, pdwReserved, dwFlags, phHash);
- orghash = (PCRYPTHASH)hHash;
- if (!orghash || pdwReserved || !phHash || !orghash->pProvider ||
- orghash->dwMagic != MAGIC_CRYPTHASH || orghash->pProvider->dwMagic != MAGIC_CRYPTPROV)
+ if (!(orghash = hash_from_handle(hHash)))
+ return FALSE;
+
+ if (pdwReserved || !phHash || !orghash->pProvider || orghash->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -999,10 +1001,10 @@ BOOL WINAPI CryptDuplicateKey (HCRYPTKEY hKey, DWORD *pdwReserved, DWORD dwFlags
TRACE("(0x%lx, %p, %08x, %p)\n", hKey, pdwReserved, dwFlags, phKey);
- orgkey = (PCRYPTKEY)hKey;
- if (!orgkey || pdwReserved || !phKey || !orgkey->pProvider ||
- orgkey->dwMagic != MAGIC_CRYPTKEY ||
- orgkey->pProvider->dwMagic != MAGIC_CRYPTPROV)
+ if (!(orgkey = key_from_handle(hKey)))
+ return FALSE;
+
+ if (pdwReserved || !phKey || !orgkey->pProvider || orgkey->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -1059,14 +1061,19 @@ BOOL WINAPI CryptDuplicateKey (HCRYPTKEY hKey, DWORD *pdwReserved, DWORD dwFlags
BOOL WINAPI CryptEncrypt (HCRYPTKEY hKey, HCRYPTHASH hHash, BOOL Final,
DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen, DWORD dwBufLen)
{
+ PCRYPTHASH hash = NULL;
PCRYPTPROV prov;
- PCRYPTKEY key = (PCRYPTKEY)hKey;
- PCRYPTHASH hash = (PCRYPTHASH)hHash;
+ PCRYPTKEY key;
TRACE("(0x%lx, 0x%lx, %d, %08x, %p, %p, %d)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen, dwBufLen);
- if (!key || !pdwDataLen || !key->pProvider ||
- key->dwMagic != MAGIC_CRYPTKEY || key->pProvider->dwMagic != MAGIC_CRYPTPROV)
+ if (!(key = key_from_handle(hKey)))
+ return FALSE;
+
+ if (hHash && !(hash = hash_from_handle(hHash)))
+ return FALSE;
+
+ if (!pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -1367,12 +1374,17 @@ BOOL WINAPI CryptExportKey (HCRYPTKEY hKey, HCRYPTKEY hExpKey, DWORD dwBlobType,
DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen)
{
PCRYPTPROV prov;
- PCRYPTKEY key = (PCRYPTKEY)hKey, expkey = (PCRYPTKEY)hExpKey;
+ PCRYPTKEY key, expkey = NULL;
TRACE("(0x%lx, 0x%lx, %d, %08x, %p, %p)\n", hKey, hExpKey, dwBlobType, dwFlags, pbData, pdwDataLen);
- if (!key || !pdwDataLen || !key->pProvider ||
- key->dwMagic != MAGIC_CRYPTKEY || key->pProvider->dwMagic != MAGIC_CRYPTPROV)
+ if (!(key = key_from_handle(hKey)))
+ return FALSE;
+
+ if (hExpKey && !(expkey = key_from_handle(hExpKey)))
+ return FALSE;
+
+ if (!pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -1400,12 +1412,15 @@ BOOL WINAPI CryptExportKey (HCRYPTKEY hKey, HCRYPTKEY hExpKey, DWORD dwBlobType,
*/
BOOL WINAPI CryptGenKey (HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYPTKEY *phKey)
{
- PCRYPTPROV prov = (PCRYPTPROV)hProv;
+ PCRYPTPROV prov;
PCRYPTKEY key;
TRACE("(0x%lx, %d, %08x, %p)\n", hProv, Algid, dwFlags, phKey);
- if (!phKey || !prov || prov->dwMagic != MAGIC_CRYPTPROV)
+ if (!(prov = provider_from_handle(hProv)))
+ return FALSE;
+
+ if (!phKey)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -1560,12 +1575,15 @@ BOOL WINAPI CryptGetHashParam (HCRYPTHASH hHash, DWORD dwParam, BYTE *pbData,
DWORD *pdwDataLen, DWORD dwFlags)
{
PCRYPTPROV prov;
- PCRYPTHASH hash = (PCRYPTHASH)hHash;
+ PCRYPTHASH hash;
TRACE("(0x%lx, %d, %p, %p, %08x)\n", hHash, dwParam, pbData, pdwDataLen, dwFlags);
- if (!hash || !pdwDataLen || !hash->pProvider ||
- hash->dwMagic != MAGIC_CRYPTHASH || hash->pProvider->dwMagic != MAGIC_CRYPTPROV)
+ if (!(hash = hash_from_handle(hHash)))
+ return FALSE;
+
+
+ if (!pdwDataLen || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -1599,12 +1617,14 @@ BOOL WINAPI CryptGetKeyParam (HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData,
DWORD *pdwDataLen, DWORD dwFlags)
{
PCRYPTPROV prov;
- PCRYPTKEY key = (PCRYPTKEY)hKey;
+ PCRYPTKEY key;
TRACE("(0x%lx, %d, %p, %p, %08x)\n", hKey, dwParam, pbData, pdwDataLen, dwFlags);
- if (!key || !pdwDataLen || !key->pProvider ||
- key->dwMagic != MAGIC_CRYPTKEY || key->pProvider->dwMagic != MAGIC_CRYPTPROV)
+ if (!(key = key_from_handle(hKey)))
+ return FALSE;
+
+ if (!pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -1637,15 +1657,12 @@ BOOL WINAPI CryptGetKeyParam (HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData,
BOOL WINAPI CryptGetProvParam (HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData,
DWORD *pdwDataLen, DWORD dwFlags)
{
- PCRYPTPROV prov = (PCRYPTPROV)hProv;
+ PCRYPTPROV prov;
TRACE("(0x%lx, %d, %p, %p, %08x)\n", hProv, dwParam, pbData, pdwDataLen, dwFlags);
- if (!prov || prov->dwMagic != MAGIC_CRYPTPROV)
- {
- SetLastError(ERROR_INVALID_PARAMETER);
+ if (!(prov = provider_from_handle(hProv)))
return FALSE;
- }
return prov->pFuncs->pCPGetProvParam(prov->hPrivate, dwParam, pbData, pdwDataLen, dwFlags);
}
@@ -1666,17 +1683,15 @@ BOOL WINAPI CryptGetProvParam (HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData,
*/
BOOL WINAPI CryptGetUserKey (HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *phUserKey)
{
- PCRYPTPROV prov = (PCRYPTPROV)hProv;
+ PCRYPTPROV prov;
PCRYPTKEY key;
TRACE("(0x%lx, %d, %p)\n", hProv, dwKeySpec, phUserKey);
- if (!prov)
- {
- SetLastError(ERROR_INVALID_HANDLE);
+ if (!(prov = provider_from_handle(hProv)))
return FALSE;
- }
- if (!phUserKey || prov->dwMagic != MAGIC_CRYPTPROV)
+
+ if (!phUserKey)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -1719,18 +1734,15 @@ BOOL WINAPI CryptGetUserKey (HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *phUse
*/
BOOL WINAPI CryptHashData (HCRYPTHASH hHash, const BYTE *pbData, DWORD dwDataLen, DWORD dwFlags)
{
- PCRYPTHASH hash = (PCRYPTHASH)hHash;
+ PCRYPTHASH hash;
PCRYPTPROV prov;
TRACE("(0x%lx, %p, %d, %08x)\n", hHash, pbData, dwDataLen, dwFlags);
- if (!hash)
- {
- SetLastError(ERROR_INVALID_HANDLE);
+ if (!(hash = hash_from_handle(hHash)))
return FALSE;
- }
- if (!hash->pProvider || hash->dwMagic != MAGIC_CRYPTHASH ||
- hash->pProvider->dwMagic != MAGIC_CRYPTPROV)
+
+ if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -1756,20 +1768,19 @@ BOOL WINAPI CryptHashData (HCRYPTHASH hHash, const BYTE *pbData, DWORD dwDataLen
*/
BOOL WINAPI CryptHashSessionKey (HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags)
{
- PCRYPTHASH hash = (PCRYPTHASH)hHash;
- PCRYPTKEY key = (PCRYPTKEY)hKey;
+ PCRYPTHASH hash;
+ PCRYPTKEY key;
PCRYPTPROV prov;
TRACE("(0x%lx, 0x%lx, %08x)\n", hHash, hKey, dwFlags);
- if (!hash || !key)
- {
- SetLastError(ERROR_INVALID_HANDLE);
+ if (!(hash = hash_from_handle(hHash)))
return FALSE;
- }
- if (!hash->pProvider || hash->dwMagic != MAGIC_CRYPTHASH ||
- hash->pProvider->dwMagic != MAGIC_CRYPTPROV || key->dwMagic != MAGIC_CRYPTKEY)
+ if (!(key = key_from_handle(hKey)))
+ return FALSE;
+
+ if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -1799,14 +1810,18 @@ BOOL WINAPI CryptHashSessionKey (HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags
BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen,
HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey)
{
- PCRYPTPROV prov = (PCRYPTPROV)hProv;
- PCRYPTKEY pubkey = (PCRYPTKEY)hPubKey, importkey;
+ PCRYPTPROV prov;
+ PCRYPTKEY pubkey = NULL, importkey;
TRACE("(0x%lx, %p, %d, 0x%lx, %08x, %p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey);
- if (!prov || !pbData || !dwDataLen || !phKey ||
- prov->dwMagic != MAGIC_CRYPTPROV ||
- (pubkey && pubkey->dwMagic != MAGIC_CRYPTKEY))
+ if (!(prov = provider_from_handle(hProv)))
+ return FALSE;
+
+ if (hPubKey && !(pubkey = key_from_handle(hPubKey)))
+ return FALSE;
+
+ if (!pbData || !dwDataLen || !phKey)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -1857,19 +1872,16 @@ BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLe
BOOL WINAPI CryptSignHashW (HCRYPTHASH hHash, DWORD dwKeySpec, LPCWSTR sDescription,
DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen)
{
- PCRYPTHASH hash = (PCRYPTHASH)hHash;
+ PCRYPTHASH hash;
PCRYPTPROV prov;
TRACE("(0x%lx, %d, %s, %08x, %p, %p)\n",
hHash, dwKeySpec, debugstr_w(sDescription), dwFlags, pbSignature, pdwSigLen);
- if (!hash)
- {
- SetLastError(ERROR_INVALID_HANDLE);
+ if (!(hash = hash_from_handle(hHash)))
return FALSE;
- }
- if (!pdwSigLen || !hash->pProvider || hash->dwMagic != MAGIC_CRYPTHASH ||
- hash->pProvider->dwMagic != MAGIC_CRYPTPROV)
+
+ if (!pdwSigLen || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -1919,12 +1931,14 @@ BOOL WINAPI CryptSignHashA (HCRYPTHASH hHash, DWORD dwKeySpec, LPCSTR sDescripti
BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, const BYTE *pbData, DWORD dwFlags)
{
PCRYPTPROV prov;
- PCRYPTHASH hash = (PCRYPTHASH)hHash;
+ PCRYPTHASH hash;
TRACE("(0x%lx, %d, %p, %08x)\n", hHash, dwParam, pbData, dwFlags);
- if (!hash || !pbData || !hash->pProvider ||
- hash->dwMagic != MAGIC_CRYPTHASH || hash->pProvider->dwMagic != MAGIC_CRYPTPROV)
+ if (!(hash = hash_from_handle(hHash)))
+ return FALSE;
+
+ if (!pbData || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -1953,12 +1967,14 @@ BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, const BYTE *pbDa
BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, const BYTE *pbData, DWORD dwFlags)
{
PCRYPTPROV prov;
- PCRYPTKEY key = (PCRYPTKEY)hKey;
+ PCRYPTKEY key;
TRACE("(0x%lx, %d, %p, %08x)\n", hKey, dwParam, pbData, dwFlags);
- if (!key || !pbData || !key->pProvider ||
- key->dwMagic != MAGIC_CRYPTKEY || key->pProvider->dwMagic != MAGIC_CRYPTPROV)
+ if (!(key = key_from_handle(hKey)))
+ return FALSE;
+
+ if (!pbData || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
@@ -2126,20 +2142,13 @@ BOOL WINAPI CryptSetProviderExA (LPCSTR pszProvName, DWORD dwProvType, DWORD *pd
*/
BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, const BYTE *pbData, DWORD dwFlags)
{
- PCRYPTPROV prov = (PCRYPTPROV)hProv;
+ PCRYPTPROV prov;
TRACE("(0x%lx, %d, %p, %08x)\n", hProv, dwParam, pbData, dwFlags);
- if (!prov)
- {
- SetLastError(ERROR_INVALID_HANDLE);
+ if (!(prov = provider_from_handle(hProv)))
return FALSE;
- }
- if (prov->dwMagic != MAGIC_CRYPTPROV)
- {
- SetLastError(ERROR_INVALID_PARAMETER);
- return FALSE;
- }
+
if (dwParam == PP_USE_HARDWARE_RNG)
{
FIXME("PP_USE_HARDWARE_RNG: What do I do with this?\n");
@@ -2186,15 +2195,20 @@ BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, const BYTE *pbDa
BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, const BYTE *pbSignature, DWORD dwSigLen,
HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags)
{
- PCRYPTHASH hash = (PCRYPTHASH)hHash;
- PCRYPTKEY key = (PCRYPTKEY)hPubKey;
+ PCRYPTHASH hash;
+ PCRYPTKEY key;
PCRYPTPROV prov;
TRACE("(0x%lx, %p, %d, 0x%lx, %s, %08x)\n", hHash, pbSignature,
dwSigLen, hPubKey, debugstr_w(sDescription), dwFlags);
- if (!hash || !key || key->dwMagic != MAGIC_CRYPTKEY || hash->dwMagic != MAGIC_CRYPTHASH ||
- !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV ||
+ if (!(hash = hash_from_handle(hHash)))
+ return FALSE;
+
+ if (!(key = key_from_handle(hPubKey)))
+ return FALSE;
+
+ if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV ||
!key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV)
{
SetLastError(ERROR_INVALID_PARAMETER);
diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c
index f34c99ee9bf..a6e3d447ba8 100644
--- a/dlls/advapi32/tests/crypt.c
+++ b/dlls/advapi32/tests/crypt.c
@@ -152,6 +152,9 @@ static void test_CryptReleaseContext(void)
ret = CryptContextAddRef(prov, NULL, 0);
ok(ret, "got %u\n", GetLastError());
+ ret = CryptContextAddRef(0, NULL, 0);
+ ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError());
+
ret = CryptReleaseContext(prov, 0);
ok(ret, "got %u\n", GetLastError());
@@ -272,18 +275,49 @@ static void test_incorrect_api_usage(void)
result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash);
ok (result, "%d\n", GetLastError());
if (!result) return;
- CryptDestroyHash(hHash);
- result = CryptCreateHash(0, CALG_SHA, 0, 0, &hHash);
+ result = CryptDeriveKey(0, CALG_RC4, hHash, 0, &hKey2);
ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
- result = CryptGenKey(0, CALG_RC4, 0, &hKey);
+ result = CryptDeriveKey(hProv, CALG_RC4, 0, 0, &hKey2);
+ ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+
+ result = CryptHashData(0, &temp, 1, 0);
ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
result = CryptGenKey(hProv, CALG_RC4, 0, &hKey);
ok (result, "%d\n", GetLastError());
if (!result) return;
+ result = pCryptHashSessionKey(hHash, 0, 0);
+ ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+
+ result = pCryptHashSessionKey(0, hKey, 0);
+ ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+
+ result = CryptDestroyHash(hHash);
+ ok (result, "%08x\n", GetLastError());
+
+ result = CryptDestroyHash(0);
+ ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+
+ result = CryptCreateHash(0, CALG_SHA, 0, 0, &hHash);
+ ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+
+ result = CryptGenKey(0, CALG_RC4, 0, &hKey);
+ ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+
+ dwLen = 1;
+ result = CryptDecrypt(hKey, 0, TRUE, 0, &temp, &dwLen);
+ ok (result, "%d\n", GetLastError());
+ result = CryptDecrypt(0, 0, TRUE, 0, &temp, &dwLen);
+ ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+
+ result = CryptEncrypt(hKey, 0, TRUE, 0, &temp, &dwLen, sizeof(temp));
+ ok (result, "%d\n", GetLastError());
+ result = CryptEncrypt(0, 0, TRUE, 0, &temp, &dwLen, sizeof(temp));
+ ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+
result = CryptDestroyKey(hKey);
ok (result, "%d\n", GetLastError());
@@ -294,6 +328,9 @@ static void test_incorrect_api_usage(void)
result = CryptDestroyKey(hKey2);
ok (result, "%d\n", GetLastError());
+ result = CryptDestroyKey(0);
+ ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+
dwTemp = CRYPT_MODE_ECB;
result = CryptSetKeyParam(hKey2, KP_MODE, (BYTE*)&dwTemp, sizeof(DWORD));
ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
@@ -309,6 +346,9 @@ static void test_incorrect_api_usage(void)
ok(result, "got %u\n", GetLastError());
if (!result) return;
+ result = pCryptGenRandom(0, 1, &temp);
+ ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+
result = pCryptGenRandom(hProv, 1, &temp);
ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
@@ -353,6 +393,9 @@ static void test_incorrect_api_usage(void)
dwLen = 1;
result = CryptGetProvParam(hProv, 0, &temp, &dwLen, 0);
ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+
+ result = CryptGetUserKey(0, 0, &hKey2);
+ ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
result = CryptGetUserKey(hProv, 0, &hKey2);
ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
@@ -372,6 +415,9 @@ static void test_incorrect_api_usage(void)
result = pCryptSignHashW(hHash, 0, NULL, 0, &temp, &dwLen);
ok (!result && (GetLastError() == ERROR_INVALID_PARAMETER ||
GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), "%d\n", GetLastError());
+ result = pCryptSignHashW(hHash, 0, NULL, 0, &temp, &dwLen);
+ ok (!result && (GetLastError() == ERROR_INVALID_PARAMETER ||
+ GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), "%d\n", GetLastError());
}
else
win_skip("CryptSignHashW is not available\n");
@@ -382,6 +428,9 @@ static void test_incorrect_api_usage(void)
result = CryptSetHashParam(hHash, 0, &temp, 1);
ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+ result = CryptSetProvParam(0, 0, &temp, 1);
+ ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+
result = CryptSetProvParam(hProv, 0, &temp, 1);
ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
--
2.29.2
More information about the wine-devel
mailing list