Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2026-01-01 21:43:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor TPM12_ValidateState to implement loop

Browse Source 
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Stefan Berger 2018-03-10 19:13:01 -05:00
parent fe481765b9
commit 3238742947
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/tpm_tpm12_interface.c
View File

@ -265,6 +265,13 @@ TPM_RESULT TPM12_ValidateState(enum TPMLIB_StateType st,
{
TPM_RESULT ret = TPM_SUCCESS;
tpm_state_t tpm_state;
enum TPMLIB_StateType sts[] = {
TPMLIB_STATE_PERMANENT,
TPMLIB_STATE_VOLATILE,
TPMLIB_STATE_SAVE_STATE,
0,
};
unsigned i;
#ifdef TPM_LIBTPMS_CALLBACKS
struct libtpms_callbacks *cbs = TPMLIB_GetCallbacks();
@ -279,17 +286,18 @@ TPM_RESULT TPM12_ValidateState(enum TPMLIB_StateType st,
ret = TPM_Global_Init(&tpm_state);
tpm_state.tpm_number = 0;
if ((ret == TPM_SUCCESS)) {
/* permanent state needs to be there and loaded first */
ret = TPM_PermanentAll_NVLoad(&tpm_state);
}
if ((ret == TPM_SUCCESS) && (st & TPMLIB_STATE_VOLATILE)) {
ret = TPM_VolatileAll_NVLoad(&tpm_state);
}
if ((ret == TPM_SUCCESS) && (st & TPMLIB_STATE_SAVE_STATE)) {
ret = TPM_SaveState_NVLoad(&tpm_state);
for (i = 0; sts[i] && ret == TPM_SUCCESS; i++) {
switch (st & sts[i]) {
case TPMLIB_STATE_PERMANENT:
ret = TPM_PermanentAll_NVLoad(&tpm_state);
break;
case TPMLIB_STATE_VOLATILE:
ret = TPM_VolatileAll_NVLoad(&tpm_state);
break;
case TPMLIB_STATE_SAVE_STATE:
ret = TPM_SaveState_NVLoad(&tpm_state);
break;
}
}
TPM_Global_Delete(&tpm_state);