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

rev148: Fix handling of some STARTUP flags

Browse Source 
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Stefan Berger 2018-07-11 08:56:11 -04:00 committed by Stefan Berger
parent 3da0cce06e
commit e86f6c8a4f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tpm2/StartupCommands.c
View File

@ -152,13 +152,13 @@ TPM2_Startup(
gp.orderlyState = SU_NONE_VALUE;
#endif
g_prevOrderlyState = gp.orderlyState;
// If there was a proper shutdown, then the startup modifiers are in the
// orderlyState. Turn them off in the copy.
if(IS_ORDERLY(g_prevOrderlyState))
g_prevOrderlyState &= ~(PRE_STARTUP_FLAG | STARTUP_LOCALITY_3);
// If this is a Resume,
if(in->startupType == TPM_SU_STATE)
{
// Turn of the startup modifiers in the recovered state. This will modify
// the SU_NONE_VALUE but not make it anything that would be recognized as
// a valid shutdown
g_prevOrderlyState &= ~(PRE_STARTUP_FLAG | STARTUP_LOCALITY_3);
// then there must have been a prior TPM2_ShutdownState(STATE)
if(g_prevOrderlyState != TPM_SU_STATE)
return TPM_RCS_VALUE + RC_Startup_startupType;
@ -174,8 +174,10 @@ TPM2_Startup(
return TPM_RCS_VALUE + RC_Startup_startupType;
if(g_StartupLocality3 != ((gp.orderlyState & STARTUP_LOCALITY_3) != 0))
return TPM_RC_LOCALITY;
gp.orderlyState = g_prevOrderlyState;
}
// Clean up the gp state
gp.orderlyState = g_prevOrderlyState;
// Internal Date Update
if((gp.orderlyState == TPM_SU_STATE) && (g_nvOk == TRUE))
{
@ -260,7 +262,6 @@ TPM2_Startup(
gr.restartCount = 0;
break;
}
////
// Initialize session table
SessionStartup(startup);
// Initialize object table