From c63fd3f7653cf72a0925e2e32e5b04231e026cc2 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Wed, 3 Jan 2024 13:36:42 -0500 Subject: [PATCH] rev183: Sync ActGetCapabilityData with upstream Since go.preservedSignaled is not available due to __ACT_DISABLED being defined apply the same conditional code enablement here. Signed-off-by: Stefan Berger --- src/tpm2/ACT_spt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tpm2/ACT_spt.c b/src/tpm2/ACT_spt.c index fd2bcc4fe..ed09ae7b2 100644 --- a/src/tpm2/ACT_spt.c +++ b/src/tpm2/ACT_spt.c @@ -290,6 +290,10 @@ ActGetCapabilityData(TPM_HANDLE actHandle, // IN: the handle for the starti SET_ATTRIBUTE(actData->attributes, TPMA_ACT, signaled); else CLEAR_ATTRIBUTE(actData->attributes, TPMA_ACT, signaled); +#ifndef __ACT_DISABLED // libtpms added + if(go.preservedSignaled & (1 << act)) + SET_ATTRIBUTE(actData->attributes, TPMA_ACT, preserveSignaled); +#endif // libtpms added actList->count++; } }