Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2026-08-12 23:13:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rev180: Introduce IsCpHashUnionOccupied and use it in simple case

Browse Source 
Replace the check for several session attributes flags with a call
to IsCpHashUnionOccupied.

Note that the existing check for

session->u1.cpHash.b.size != 0 || session->attributes.isCpHashDefined

can be replaced with just session->attributes.isCpHashDefined since
isCpHashDefined is always assigned '1' (SET) when session.u1.cpHash
is given a value. isCpHashDefined is reset in SessionResetPolicyData()
as part of resetting all attribute flags and cpHash size is set to 0.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Stefan Berger 2024-06-28 16:21:36 -04:00 committed by Stefan Berger
parent 9d3496c253
commit 8cde289747
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tpm2/EACommands.c
View File

@ -1029,7 +1029,7 @@ TPM2_PolicyCpHash(PolicyCpHash_In* in // IN: input parameter list
// error if the cpHash in session context is not empty and is not the same
// as the input or is not a cpHash
if((session->u1.cpHash.t.size != 0)
if((IsCpHashUnionOccupied(session->attributes))
&& (!session->attributes.isCpHashDefined
|| !MemoryEqual2B(&in->cpHashA.b, &session->u1.cpHash.b)))
return TPM_RC_CPHASH;
@ -1092,11 +1092,9 @@ TPM2_PolicyNameHash(PolicyNameHash_In* in // IN: input parameter list
// is always non-zero.
if(in->nameHash.t.size != CryptHashGetDigestSize(session->authHashAlg))
return TPM_RCS_SIZE + RC_PolicyNameHash_nameHash;
// u1 in the policy session context cannot otherwise be occupied
if(session->u1.cpHash.b.size != 0
|| session->attributes.isBound
|| session->attributes.isCpHashDefined
|| session->attributes.isTemplateHashDefined)
// error if the nameHash in session context is not empty
if(IsCpHashUnionOccupied(session->attributes))
return TPM_RC_CPHASH;
// Internal Data Update

5
src/tpm2/Global.h
View File

@ -396,6 +396,11 @@ typedef struct SESSION_ATTRIBUTES
#endif /* libtpms added end */
} SESSION_ATTRIBUTES;
//*** IsCpHashUnionOccupied()
// This function indicates whether the session attributes indicate that one of
// the members of the union containing `cpHash` are set.
BOOL IsCpHashUnionOccupied(SESSION_ATTRIBUTES attrs);
//*** SESSION Structure
// The SESSION structure contains all the context of a session except for the
// associated contextID.

8
src/tpm2/Session.c
View File

@ -1059,3 +1059,11 @@ SessionCapGetActiveAvail(void)
return num;
}
//*** IsCpHashUnionOccupied()
// This function indicates whether the session attributes indicate that one of
// the members of the union containing `cpHash` are set.
BOOL IsCpHashUnionOccupied(SESSION_ATTRIBUTES attrs)
{
return attrs.isBound || attrs.isCpHashDefined
|| attrs.isTemplateHashDefined;
}