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

rsaenh: Convert handle type from unsigned int to HCRYPTKEY.

This commit is contained in:
Yuval Fledel 2007-04-21 22:48:57 +03:00 committed by Alexandre Julliard
parent 4d7d6e96a0
commit 1cdc057091
3 changed files with 55 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/rsaenh/handle.c
View File

@ -96,12 +96,12 @@ void destroy_handle_table(HANDLETABLE *lpTable)
* non zero, if handle is valid. * non zero, if handle is valid.
* zero, if handle is not valid. * zero, if handle is not valid.
*/ */
int is_valid_handle(HANDLETABLE *lpTable, unsigned int handle, DWORD dwType) int is_valid_handle(HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType)
{ {
unsigned int index = HANDLE2INDEX(handle); unsigned int index = HANDLE2INDEX(handle);
int ret = 0; int ret = 0;
TRACE("(lpTable=%p, handle=%d)\n", lpTable, handle); TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle);
EnterCriticalSection(&lpTable->mutex); EnterCriticalSection(&lpTable->mutex);
@ -259,7 +259,7 @@ static int grow_handle_table(HANDLETABLE *lpTable)
* non zero, if successful * non zero, if successful
* zero, if not successful (no free handle) * zero, if not successful (no free handle)
*/ */
static int alloc_handle(HANDLETABLE *lpTable, OBJECTHDR *lpObject, unsigned int *lpHandle) static int alloc_handle(HANDLETABLE *lpTable, OBJECTHDR *lpObject, HCRYPTKEY *lpHandle)
{ {
int ret = 0; int ret = 0;
@ -269,7 +269,7 @@ static int alloc_handle(HANDLETABLE *lpTable, OBJECTHDR *lpObject, unsigned int
if (lpTable->iFirstFree >= lpTable->iEntries) if (lpTable->iFirstFree >= lpTable->iEntries)
if (!grow_handle_table(lpTable)) if (!grow_handle_table(lpTable))
{ {
*lpHandle = (unsigned int)INVALID_HANDLE_VALUE; *lpHandle = (HCRYPTKEY)INVALID_HANDLE_VALUE;
goto exit; goto exit;
} }
@ -306,13 +306,13 @@ exit:
* non zero, if successful * non zero, if successful
* zero, if not successful (invalid handle) * zero, if not successful (invalid handle)
*/ */
int release_handle(HANDLETABLE *lpTable, unsigned int handle, DWORD dwType) int release_handle(HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType)
{ {
unsigned int index = HANDLE2INDEX(handle); unsigned int index = HANDLE2INDEX(handle);
OBJECTHDR *pObject; OBJECTHDR *pObject;
int ret = 0; int ret = 0;
TRACE("(lpTable=%p, hande=%d)\n", lpTable, handle); TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle);
EnterCriticalSection(&lpTable->mutex); EnterCriticalSection(&lpTable->mutex);
@ -322,7 +322,7 @@ int release_handle(HANDLETABLE *lpTable, unsigned int handle, DWORD dwType)
pObject = lpTable->paEntries[index].pObject; pObject = lpTable->paEntries[index].pObject;
if (InterlockedDecrement(&pObject->refcount) == 0) if (InterlockedDecrement(&pObject->refcount) == 0)
{ {
TRACE("destroying handle %d\n", handle); TRACE("destroying handle %ld\n", handle);
if (pObject->destructor) if (pObject->destructor)
pObject->destructor(pObject); pObject->destructor(pObject);
} }
@ -351,11 +351,11 @@ exit:
* non zero, if successful * non zero, if successful
* zero, if not successful (invalid handle) * zero, if not successful (invalid handle)
*/ */
int lookup_handle(HANDLETABLE *lpTable, unsigned int handle, DWORD dwType, OBJECTHDR **lplpObject) int lookup_handle(HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject)
{ {
int ret = 0; int ret = 0;
TRACE("(lpTable=%p, handle=%d, lplpObject=%p)\n", lpTable, handle, lplpObject); TRACE("(lpTable=%p, handle=%ld, lplpObject=%p)\n", lpTable, handle, lplpObject);
EnterCriticalSection(&lpTable->mutex); EnterCriticalSection(&lpTable->mutex);
if (!is_valid_handle(lpTable, handle, dwType)) if (!is_valid_handle(lpTable, handle, dwType))
@ -386,17 +386,17 @@ exit:
* non zero, if successful * non zero, if successful
* zero, if not successful (invalid handle or out of memory) * zero, if not successful (invalid handle or out of memory)
*/ */
int copy_handle(HANDLETABLE *lpTable, unsigned int handle, DWORD dwType, unsigned int *copy) int copy_handle(HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy)
{ {
OBJECTHDR *pObject; OBJECTHDR *pObject;
int ret; int ret;
TRACE("(lpTable=%p, handle=%d, copy=%p)\n", lpTable, handle, copy); TRACE("(lpTable=%p, handle=%ld, copy=%p)\n", lpTable, handle, copy);
EnterCriticalSection(&lpTable->mutex); EnterCriticalSection(&lpTable->mutex);
if (!lookup_handle(lpTable, handle, dwType, &pObject)) if (!lookup_handle(lpTable, handle, dwType, &pObject))
{ {
*copy = (unsigned int)INVALID_HANDLE_VALUE; *copy = (HCRYPTKEY)INVALID_HANDLE_VALUE;
LeaveCriticalSection(&lpTable->mutex); LeaveCriticalSection(&lpTable->mutex);
return 0; return 0;
} }
@ -429,18 +429,18 @@ int copy_handle(HANDLETABLE *lpTable, unsigned int handle, DWORD dwType, unsigne
* INVALID_HANDLE_VALUE, if something went wrong. * INVALID_HANDLE_VALUE, if something went wrong.
* a handle to the new object, if successful. * a handle to the new object, if successful.
*/ */
unsigned int new_object(HANDLETABLE *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, HCRYPTKEY new_object(HANDLETABLE *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor,
OBJECTHDR **ppObject) OBJECTHDR **ppObject)
{ {
OBJECTHDR *pObject; OBJECTHDR *pObject;
unsigned int hObject; HCRYPTKEY hObject;
if (ppObject) if (ppObject)
*ppObject = NULL; *ppObject = NULL;
pObject = HeapAlloc(GetProcessHeap(), 0, cbSize); pObject = HeapAlloc(GetProcessHeap(), 0, cbSize);
if (!pObject) if (!pObject)
return (unsigned int)INVALID_HANDLE_VALUE; return (HCRYPTKEY)INVALID_HANDLE_VALUE;
pObject->dwType = dwType; pObject->dwType = dwType;
pObject->refcount = 0; pObject->refcount = 0;

12
dlls/rsaenh/handle.h
View File

@ -24,6 +24,8 @@
#ifndef __WINE_HANDLE_H #ifndef __WINE_HANDLE_H
#define __WINE_HANDLE_H #define __WINE_HANDLE_H
#include "wincrypt.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -58,12 +60,12 @@ int alloc_handle_table (HANDLETABLE **lplpTable);
void init_handle_table (HANDLETABLE *lpTable); void init_handle_table (HANDLETABLE *lpTable);
int release_handle_table(HANDLETABLE *lpTable); int release_handle_table(HANDLETABLE *lpTable);
void destroy_handle_table(HANDLETABLE *lpTable); void destroy_handle_table(HANDLETABLE *lpTable);
int release_handle (HANDLETABLE *lpTable, unsigned int handle, DWORD dwType); int release_handle (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType);
int copy_handle (HANDLETABLE *lpTable, unsigned int handle, DWORD dwType, unsigned int *copy); int copy_handle (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy);
int lookup_handle (HANDLETABLE *lpTable, unsigned int handle, DWORD dwType, OBJECTHDR **lplpObject); int lookup_handle (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject);
int is_valid_handle (HANDLETABLE *lpTable, unsigned int handle, DWORD dwType); int is_valid_handle (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType);
unsigned int new_object (HANDLETABLE *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, HCRYPTKEY new_object (HANDLETABLE *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor,
OBJECTHDR **ppObject); OBJECTHDR **ppObject);
#ifdef __cplusplus #ifdef __cplusplus

66
dlls/rsaenh/rsaenh.c
View File

@ -919,7 +919,7 @@ static void destroy_key_container(OBJECTHDR *pObjectHdr)
HeapFree(GetProcessHeap(), 0, pbKey); HeapFree(GetProcessHeap(), 0, pbKey);
} }
} }
release_handle(&handle_table, (unsigned int)pKeyContainer->hKeyExchangeKeyPair, release_handle(&handle_table, pKeyContainer->hKeyExchangeKeyPair,
RSAENH_MAGIC_KEY); RSAENH_MAGIC_KEY);
} }
@ -951,7 +951,7 @@ static void destroy_key_container(OBJECTHDR *pObjectHdr)
HeapFree(GetProcessHeap(), 0, pbKey); HeapFree(GetProcessHeap(), 0, pbKey);
} }
} }
release_handle(&handle_table, (unsigned int)pKeyContainer->hSignatureKeyPair, release_handle(&handle_table, pKeyContainer->hSignatureKeyPair,
RSAENH_MAGIC_KEY); RSAENH_MAGIC_KEY);
} }
@ -1487,7 +1487,7 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer,
*phProv = read_key_container(szKeyContainerName, dwFlags, pVTable); *phProv = read_key_container(szKeyContainerName, dwFlags, pVTable);
if (*phProv != (HCRYPTPROV)INVALID_HANDLE_VALUE) if (*phProv != (HCRYPTPROV)INVALID_HANDLE_VALUE)
{ {
release_handle(&handle_table, (unsigned int)*phProv, RSAENH_MAGIC_CONTAINER); release_handle(&handle_table, *phProv, RSAENH_MAGIC_CONTAINER);
TRACE("Can't create new keyset, already exists\n"); TRACE("Can't create new keyset, already exists\n");
SetLastError(NTE_EXISTS); SetLastError(NTE_EXISTS);
return FALSE; return FALSE;
@ -1505,12 +1505,12 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer,
break; break;
default: default:
*phProv = (unsigned int)INVALID_HANDLE_VALUE; *phProv = (HCRYPTPROV)INVALID_HANDLE_VALUE;
SetLastError(NTE_BAD_FLAGS); SetLastError(NTE_BAD_FLAGS);
return FALSE; return FALSE;
} }
if (*phProv != (unsigned int)INVALID_HANDLE_VALUE) { if (*phProv != (HCRYPTPROV)INVALID_HANDLE_VALUE) {
SetLastError(ERROR_SUCCESS); SetLastError(ERROR_SUCCESS);
return TRUE; return TRUE;
} else { } else {
@ -2288,7 +2288,7 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat
TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%d, hPubKey=%08lx, dwFlags=%08x, phKey=%p)\n", TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%d, hPubKey=%08lx, dwFlags=%08x, phKey=%p)\n",
hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey);
if (!lookup_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER, if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER,
(OBJECTHDR**)&pKeyContainer)) (OBJECTHDR**)&pKeyContainer))
{ {
SetLastError(NTE_BAD_UID); SetLastError(NTE_BAD_UID);
@ -2328,14 +2328,14 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat
TRACE("installing signing key\n"); TRACE("installing signing key\n");
RSAENH_CPDestroyKey(hProv, pKeyContainer->hSignatureKeyPair); RSAENH_CPDestroyKey(hProv, pKeyContainer->hSignatureKeyPair);
copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY,
(unsigned int*)&pKeyContainer->hSignatureKeyPair); &pKeyContainer->hSignatureKeyPair);
break; break;
case AT_KEYEXCHANGE: case AT_KEYEXCHANGE:
case CALG_RSA_KEYX: case CALG_RSA_KEYX:
TRACE("installing key exchange key\n"); TRACE("installing key exchange key\n");
RSAENH_CPDestroyKey(hProv, pKeyContainer->hKeyExchangeKeyPair); RSAENH_CPDestroyKey(hProv, pKeyContainer->hKeyExchangeKeyPair);
copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY,
(unsigned int*)&pKeyContainer->hKeyExchangeKeyPair); &pKeyContainer->hKeyExchangeKeyPair);
break; break;
} }
} }
@ -2367,7 +2367,7 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat
TRACE("installing public key\n"); TRACE("installing public key\n");
RSAENH_CPDestroyKey(hProv, pKeyContainer->hKeyExchangeKeyPair); RSAENH_CPDestroyKey(hProv, pKeyContainer->hKeyExchangeKeyPair);
copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY,
(unsigned int*)&pKeyContainer->hKeyExchangeKeyPair); &pKeyContainer->hKeyExchangeKeyPair);
break; break;
} }
} }
@ -2444,7 +2444,7 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP
TRACE("(hProv=%08lx, aiAlgid=%d, dwFlags=%08x, phKey=%p)\n", hProv, Algid, dwFlags, phKey); TRACE("(hProv=%08lx, aiAlgid=%d, dwFlags=%08x, phKey=%p)\n", hProv, Algid, dwFlags, phKey);
if (!lookup_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER, if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER,
(OBJECTHDR**)&pKeyContainer)) (OBJECTHDR**)&pKeyContainer))
{ {
/* MSDN: hProv not containing valid context handle */ /* MSDN: hProv not containing valid context handle */
@ -2463,7 +2463,7 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP
if (Algid == AT_SIGNATURE) { if (Algid == AT_SIGNATURE) {
RSAENH_CPDestroyKey(hProv, pKeyContainer->hSignatureKeyPair); RSAENH_CPDestroyKey(hProv, pKeyContainer->hSignatureKeyPair);
copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY,
(unsigned int*)&pKeyContainer->hSignatureKeyPair); &pKeyContainer->hSignatureKeyPair);
} }
} }
break; break;
@ -2477,7 +2477,7 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP
if (Algid == AT_KEYEXCHANGE) { if (Algid == AT_KEYEXCHANGE) {
RSAENH_CPDestroyKey(hProv, pKeyContainer->hKeyExchangeKeyPair); RSAENH_CPDestroyKey(hProv, pKeyContainer->hKeyExchangeKeyPair);
copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY,
(unsigned int*)&pKeyContainer->hKeyExchangeKeyPair); &pKeyContainer->hKeyExchangeKeyPair);
} }
} }
break; break;
@ -2515,7 +2515,7 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP
return FALSE; return FALSE;
} }
return *phKey != (unsigned int)INVALID_HANDLE_VALUE; return *phKey != (HCRYPTKEY)INVALID_HANDLE_VALUE;
} }
/****************************************************************************** /******************************************************************************
@ -2536,7 +2536,7 @@ BOOL WINAPI RSAENH_CPGenRandom(HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer)
{ {
TRACE("(hProv=%08lx, dwLen=%d, pbBuffer=%p)\n", hProv, dwLen, pbBuffer); TRACE("(hProv=%08lx, dwLen=%d, pbBuffer=%p)\n", hProv, dwLen, pbBuffer);
if (!is_valid_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER)) if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER))
{ {
/* MSDN: hProv not containing valid context handle */ /* MSDN: hProv not containing valid context handle */
SetLastError(NTE_BAD_UID); SetLastError(NTE_BAD_UID);
@ -2575,7 +2575,7 @@ BOOL WINAPI RSAENH_CPGetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa
TRACE("(hProv=%08lx, hHash=%08lx, dwParam=%08x, pbData=%p, pdwDataLen=%p, dwFlags=%08x)\n", TRACE("(hProv=%08lx, hHash=%08lx, dwParam=%08x, pbData=%p, pdwDataLen=%p, dwFlags=%08x)\n",
hProv, hHash, dwParam, pbData, pdwDataLen, dwFlags); hProv, hHash, dwParam, pbData, pdwDataLen, dwFlags);
if (!is_valid_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER)) if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER))
{ {
SetLastError(NTE_BAD_UID); SetLastError(NTE_BAD_UID);
return FALSE; return FALSE;
@ -2587,7 +2587,7 @@ BOOL WINAPI RSAENH_CPGetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa
return FALSE; return FALSE;
} }
if (!lookup_handle(&handle_table, (unsigned int)hHash, RSAENH_MAGIC_HASH, if (!lookup_handle(&handle_table, hHash, RSAENH_MAGIC_HASH,
(OBJECTHDR**)&pCryptHash)) (OBJECTHDR**)&pCryptHash))
{ {
SetLastError(NTE_BAD_HASH); SetLastError(NTE_BAD_HASH);
@ -2673,7 +2673,7 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam
TRACE("(hProv=%08lx, hKey=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n", hProv, hKey, TRACE("(hProv=%08lx, hKey=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n", hProv, hKey,
dwParam, pbData, dwFlags); dwParam, pbData, dwFlags);
if (!is_valid_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER)) if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER))
{ {
SetLastError(NTE_BAD_UID); SetLastError(NTE_BAD_UID);
return FALSE; return FALSE;
@ -2684,7 +2684,7 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam
return FALSE; return FALSE;
} }
if (!lookup_handle(&handle_table, (unsigned int)hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pCryptKey)) if (!lookup_handle(&handle_table, hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pCryptKey))
{ {
SetLastError(NTE_BAD_KEY); SetLastError(NTE_BAD_KEY);
return FALSE; return FALSE;
@ -2773,7 +2773,7 @@ BOOL WINAPI RSAENH_CPGetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam
TRACE("(hProv=%08lx, hKey=%08lx, dwParam=%08x, pbData=%p, pdwDataLen=%p dwFlags=%08x)\n", TRACE("(hProv=%08lx, hKey=%08lx, dwParam=%08x, pbData=%p, pdwDataLen=%p dwFlags=%08x)\n",
hProv, hKey, dwParam, pbData, pdwDataLen, dwFlags); hProv, hKey, dwParam, pbData, pdwDataLen, dwFlags);
if (!is_valid_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER)) if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER))
{ {
SetLastError(NTE_BAD_UID); SetLastError(NTE_BAD_UID);
return FALSE; return FALSE;
@ -2784,7 +2784,7 @@ BOOL WINAPI RSAENH_CPGetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam
return FALSE; return FALSE;
} }
if (!lookup_handle(&handle_table, (unsigned int)hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pCryptKey)) if (!lookup_handle(&handle_table, hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pCryptKey))
{ {
SetLastError(NTE_BAD_KEY); SetLastError(NTE_BAD_KEY);
return FALSE; return FALSE;
@ -2888,7 +2888,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData,
return FALSE; return FALSE;
} }
if (!lookup_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER, if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER,
(OBJECTHDR**)&pKeyContainer)) (OBJECTHDR**)&pKeyContainer))
{ {
/* MSDN: hProv not containing valid context handle */ /* MSDN: hProv not containing valid context handle */
@ -3042,13 +3042,13 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD
TRACE("(hProv=%08lx, Algid=%d, hBaseData=%08lx, dwFlags=%08x phKey=%p)\n", hProv, Algid, TRACE("(hProv=%08lx, Algid=%d, hBaseData=%08lx, dwFlags=%08x phKey=%p)\n", hProv, Algid,
hBaseData, dwFlags, phKey); hBaseData, dwFlags, phKey);
if (!is_valid_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER)) if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER))
{ {
SetLastError(NTE_BAD_UID); SetLastError(NTE_BAD_UID);
return FALSE; return FALSE;
} }
if (!lookup_handle(&handle_table, (unsigned int)hBaseData, RSAENH_MAGIC_HASH, if (!lookup_handle(&handle_table, hBaseData, RSAENH_MAGIC_HASH,
(OBJECTHDR**)&pCryptHash)) (OBJECTHDR**)&pCryptHash))
{ {
SetLastError(NTE_BAD_HASH); SetLastError(NTE_BAD_HASH);
@ -3184,7 +3184,7 @@ BOOL WINAPI RSAENH_CPGetUserKey(HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *ph
TRACE("(hProv=%08lx, dwKeySpec=%08x, phUserKey=%p)\n", hProv, dwKeySpec, phUserKey); TRACE("(hProv=%08lx, dwKeySpec=%08x, phUserKey=%p)\n", hProv, dwKeySpec, phUserKey);
if (!lookup_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER, if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER,
(OBJECTHDR**)&pKeyContainer)) (OBJECTHDR**)&pKeyContainer))
{ {
/* MSDN: hProv not containing valid context handle */ /* MSDN: hProv not containing valid context handle */
@ -3196,12 +3196,12 @@ BOOL WINAPI RSAENH_CPGetUserKey(HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *ph
{ {
case AT_KEYEXCHANGE: case AT_KEYEXCHANGE:
copy_handle(&handle_table, pKeyContainer->hKeyExchangeKeyPair, RSAENH_MAGIC_KEY, copy_handle(&handle_table, pKeyContainer->hKeyExchangeKeyPair, RSAENH_MAGIC_KEY,
(unsigned int*)phUserKey); phUserKey);
break; break;
case AT_SIGNATURE: case AT_SIGNATURE:
copy_handle(&handle_table, pKeyContainer->hSignatureKeyPair, RSAENH_MAGIC_KEY, copy_handle(&handle_table, pKeyContainer->hSignatureKeyPair, RSAENH_MAGIC_KEY,
(unsigned int*)phUserKey); phUserKey);
break; break;
default: default:
@ -3252,7 +3252,7 @@ BOOL WINAPI RSAENH_CPHashData(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST BYTE *pb
return FALSE; return FALSE;
} }
if (!lookup_handle(&handle_table, (unsigned int)hHash, RSAENH_MAGIC_HASH, if (!lookup_handle(&handle_table, hHash, RSAENH_MAGIC_HASH,
(OBJECTHDR**)&pCryptHash)) (OBJECTHDR**)&pCryptHash))
{ {
SetLastError(NTE_BAD_HASH); SetLastError(NTE_BAD_HASH);
@ -3302,7 +3302,7 @@ BOOL WINAPI RSAENH_CPHashSessionKey(HCRYPTPROV hProv, HCRYPTHASH hHash, HCRYPTKE
TRACE("(hProv=%08lx, hHash=%08lx, hKey=%08lx, dwFlags=%08x)\n", hProv, hHash, hKey, dwFlags); TRACE("(hProv=%08lx, hHash=%08lx, hKey=%08lx, dwFlags=%08x)\n", hProv, hHash, hKey, dwFlags);
if (!lookup_handle(&handle_table, (unsigned int)hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pKey) || if (!lookup_handle(&handle_table, hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pKey) ||
(GET_ALG_CLASS(pKey->aiAlgid) != ALG_CLASS_DATA_ENCRYPT)) (GET_ALG_CLASS(pKey->aiAlgid) != ALG_CLASS_DATA_ENCRYPT))
{ {
SetLastError(NTE_BAD_KEY); SetLastError(NTE_BAD_KEY);
@ -3343,7 +3343,7 @@ BOOL WINAPI RSAENH_CPReleaseContext(HCRYPTPROV hProv, DWORD dwFlags)
{ {
TRACE("(hProv=%08lx, dwFlags=%08x)\n", hProv, dwFlags); TRACE("(hProv=%08lx, dwFlags=%08x)\n", hProv, dwFlags);
if (!release_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER)) if (!release_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER))
{ {
/* MSDN: hProv not containing valid context handle */ /* MSDN: hProv not containing valid context handle */
SetLastError(NTE_BAD_UID); SetLastError(NTE_BAD_UID);
@ -3389,7 +3389,7 @@ BOOL WINAPI RSAENH_CPSetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa
TRACE("(hProv=%08lx, hHash=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n", TRACE("(hProv=%08lx, hHash=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n",
hProv, hHash, dwParam, pbData, dwFlags); hProv, hHash, dwParam, pbData, dwFlags);
if (!is_valid_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER)) if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER))
{ {
SetLastError(NTE_BAD_UID); SetLastError(NTE_BAD_UID);
return FALSE; return FALSE;
@ -3400,7 +3400,7 @@ BOOL WINAPI RSAENH_CPSetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa
return FALSE; return FALSE;
} }
if (!lookup_handle(&handle_table, (unsigned int)hHash, RSAENH_MAGIC_HASH, if (!lookup_handle(&handle_table, hHash, RSAENH_MAGIC_HASH,
(OBJECTHDR**)&pCryptHash)) (OBJECTHDR**)&pCryptHash))
{ {
SetLastError(NTE_BAD_HASH); SetLastError(NTE_BAD_HASH);
@ -3494,7 +3494,7 @@ BOOL WINAPI RSAENH_CPSignHash(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwKeySpe
if (!RSAENH_CPGetUserKey(hProv, dwKeySpec, &hCryptKey)) return FALSE; if (!RSAENH_CPGetUserKey(hProv, dwKeySpec, &hCryptKey)) return FALSE;
if (!lookup_handle(&handle_table, (unsigned int)hCryptKey, RSAENH_MAGIC_KEY, if (!lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY,
(OBJECTHDR**)&pCryptKey)) (OBJECTHDR**)&pCryptKey))
{ {
SetLastError(NTE_NO_KEY); SetLastError(NTE_NO_KEY);
@ -3579,7 +3579,7 @@ BOOL WINAPI RSAENH_CPVerifySignature(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST B
return FALSE; return FALSE;
} }
if (!lookup_handle(&handle_table, (unsigned int)hPubKey, RSAENH_MAGIC_KEY, if (!lookup_handle(&handle_table, hPubKey, RSAENH_MAGIC_KEY,
(OBJECTHDR**)&pCryptKey)) (OBJECTHDR**)&pCryptKey))
{ {
SetLastError(NTE_BAD_KEY); SetLastError(NTE_BAD_KEY);