denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed warning, freeing tpm context memory in extend_pcr function

Browse Source
This commit is contained in:
Sansar Choinyambuu
2011-11-28 21:22:51 +01:00
committed by Andreas Steffen
parent 3186b04c0b
commit 1508efdfdf
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libpts/pts/pts.c
+10 -4
View File
@@ -739,7 +739,7 @@ METHOD(pts_t, read_pcr, bool,
{ {
goto err; goto err;
} }
result = Tspi_TPM_PcrRead(hTPM, pcr_num, &rgbPcrValue.len, &rgbPcrValue.ptr); result = Tspi_TPM_PcrRead(hTPM, pcr_num, (UINT32*)&rgbPcrValue.len, &rgbPcrValue.ptr);
if (result != TSS_SUCCESS) if (result != TSS_SUCCESS)
{ {
goto err; goto err;
@@ -797,16 +797,22 @@ METHOD(pts_t, extend_pcr, bool,
*output = pcr_value; *output = pcr_value;
*output = chunk_clone(*output); *output = chunk_clone(*output);
chunk_clear(&pcr_value);
Tspi_Context_Close(hContext);
DBG3(DBG_PTS, "PCR %d extended with: %B", pcr_num, &input); DBG3(DBG_PTS, "PCR %d extended with: %B", pcr_num, &input);
DBG3(DBG_PTS, "PCR %d value after extend: %B", pcr_num, output); DBG3(DBG_PTS, "PCR %d value after extend: %B", pcr_num, output);
chunk_clear(&pcr_value);
Tspi_Context_FreeMemory(hContext, NULL);
Tspi_Context_Close(hContext);
return TRUE; return TRUE;
err: err:
chunk_clear(&pcr_value);
DBG1(DBG_PTS, "TPM not available: tss error 0x%x", result); DBG1(DBG_PTS, "TPM not available: tss error 0x%x", result);
chunk_clear(&pcr_value);
Tspi_Context_FreeMemory(hContext, NULL);
Tspi_Context_Close(hContext); Tspi_Context_Close(hContext);
return FALSE; return FALSE;
} }