tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-06 13:44:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Manually manage bcrypt hash memory in order to support Vista

Browse Source 
The CNG routines added improved memory management in windows 7.  In
order to support Vista, we need to manually manage the scratch memory
used by cng.
This commit is contained in:
dkulwin 2015-10-29 13:08:22 -05:00
parent 889e58c056
commit c4fb7d76ee
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/win32/win32compat/cng_digest.c
View File

@ -56,6 +56,7 @@ struct ssh_digest_ctx {
int alg; int alg;
BCRYPT_ALG_HANDLE cng_alg_handle; BCRYPT_ALG_HANDLE cng_alg_handle;
BCRYPT_HASH_HANDLE hash_handle; BCRYPT_HASH_HANDLE hash_handle;
PBYTE pHashObj;
}; };
struct ssh_digest { struct ssh_digest {
@ -134,6 +135,8 @@ struct ssh_digest_ctx *
const struct ssh_digest *digest = ssh_digest_by_alg(alg); const struct ssh_digest *digest = ssh_digest_by_alg(alg);
struct ssh_digest_ctx *ret; struct ssh_digest_ctx *ret;
HRESULT hr = S_OK; HRESULT hr = S_OK;
DWORD cbHash = 0;
DWORD cbData = 0;
if (digest == NULL || ((ret = (struct ssh_digest_ctx *)malloc(sizeof(*ret))) == NULL)) if (digest == NULL || ((ret = (struct ssh_digest_ctx *)malloc(sizeof(*ret))) == NULL))
return NULL; return NULL;
@ -144,9 +147,21 @@ struct ssh_digest_ctx *
return NULL; return NULL;
} }
if ((hr = BCryptCreateHash(ret->cng_alg_handle, &(ret->hash_handle), NULL, 0, NULL, 0, 0)) != S_OK) if ((hr = BCryptGetProperty(&(ret->cng_alg_handle), BCRYPT_HASH_LENGTH,(PBYTE)&cbHash,sizeof(DWORD),&cbData,0)) != S_OK){
free(ret);
return NULL;
}
if ((ret->pHashObj = (PBYTE)malloc(cbHash)) == NULL)
{
free(ret);
return NULL;
}
if ((hr = BCryptCreateHash(ret->cng_alg_handle, &(ret->hash_handle), ret->pHashObj, cbHash, NULL, 0, 0)) != S_OK)
{ {
BCryptCloseAlgorithmProvider(ret->cng_alg_handle, 0); BCryptCloseAlgorithmProvider(ret->cng_alg_handle, 0);
free(ret->pHashObj);
free(ret); free(ret);
return NULL; return NULL;
@ -204,6 +219,7 @@ ssh_digest_free(struct ssh_digest_ctx *ctx)
if (ctx != NULL) { if (ctx != NULL) {
BCryptCloseAlgorithmProvider(ctx->cng_alg_handle, 0); BCryptCloseAlgorithmProvider(ctx->cng_alg_handle, 0);
BCryptDestroyHash(ctx->hash_handle); BCryptDestroyHash(ctx->hash_handle);
free(ctx->pHashObj);
explicit_bzero(ctx, sizeof(*ctx)); explicit_bzero(ctx, sizeof(*ctx));
free(ctx); free(ctx);
} }