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

rsaenh: Properly destroy hashes created by CPCreateHash() (Valgrind). 

Signed-off-by: Sven Baars <sbaars@codeweavers.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sven Baars 2022-02-15 12:45:47 +01:00 committed by Alexandre Julliard
parent bb4c43de94
commit f0987134b4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/rsaenh/rsaenh.c
View File

@ -594,13 +594,14 @@ static BOOL copy_hmac_info(PHMAC_INFO *dst, const HMAC_INFO *src) {
* Destructor for hash objects * Destructor for hash objects
* *
* PARAMS * PARAMS
* pCryptHash [I] Pointer to the hash object to be destroyed. * pCryptHash [I] Pointer to the hash object to be destroyed.
* Will be invalid after function returns! * Will be invalid after function returns!
*/ */
static void destroy_hash(OBJECTHDR *pObject) static void destroy_hash(OBJECTHDR *pObject)
{ {
CRYPTHASH *pCryptHash = (CRYPTHASH*)pObject; CRYPTHASH *pCryptHash = (CRYPTHASH*)pObject;
BCryptDestroyHash(pCryptHash->hash_handle);
free_hmac_info(pCryptHash->pHMACInfo); free_hmac_info(pCryptHash->pHMACInfo);
free_data_blob(&pCryptHash->tpPRFParams.blobLabel); free_data_blob(&pCryptHash->tpPRFParams.blobLabel);
free_data_blob(&pCryptHash->tpPRFParams.blobSeed); free_data_blob(&pCryptHash->tpPRFParams.blobSeed);
@ -708,6 +709,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) {
update_hash_impl(pCryptHash->hash_handle, update_hash_impl(pCryptHash->hash_handle,
abHashValue, pCryptHash->dwHashSize); abHashValue, pCryptHash->dwHashSize);
finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue);
pCryptHash->hash_handle = NULL;
} }
break; break;
@ -719,6 +721,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) {
default: default:
finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue);
pCryptHash->hash_handle = NULL;
} }
} }
@ -2211,6 +2214,7 @@ BOOL WINAPI RSAENH_CPCreateHash(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey,
pCryptHash->hProv = hProv; pCryptHash->hProv = hProv;
pCryptHash->dwState = RSAENH_HASHSTATE_HASHING; pCryptHash->dwState = RSAENH_HASHSTATE_HASHING;
pCryptHash->pHMACInfo = NULL; pCryptHash->pHMACInfo = NULL;
pCryptHash->hash_handle = NULL;
pCryptHash->dwHashSize = peaAlgidInfo->dwDefaultLen >> 3; pCryptHash->dwHashSize = peaAlgidInfo->dwDefaultLen >> 3;
init_data_blob(&pCryptHash->tpPRFParams.blobLabel); init_data_blob(&pCryptHash->tpPRFParams.blobLabel);
init_data_blob(&pCryptHash->tpPRFParams.blobSeed); init_data_blob(&pCryptHash->tpPRFParams.blobSeed);