aboutsummaryrefslogtreecommitdiff
path: root/libstb
diff options
context:
space:
mode:
authorClaudio Carvalho <cclaudio@linux.vnet.ibm.com>2016-09-28 05:01:25 -0300
committerStewart Smith <stewart@linux.vnet.ibm.com>2016-10-10 15:29:36 +1100
commit381c866a951c241346a1d985341718874b3dd405 (patch)
tree7efdbfa14677db1a171cc1cbabfe0e8de1c00082 /libstb
parent17413385499932594e3d4a3fe21726bf96944b8d (diff)
downloadskiboot-381c866a951c241346a1d985341718874b3dd405.zip
skiboot-381c866a951c241346a1d985341718874b3dd405.tar.gz
skiboot-381c866a951c241346a1d985341718874b3dd405.tar.bz2
libstb/tss/tpmLogMgr: add support for EV_SEPARATOR events
The TpmLogMgr_genLogEventPcrExtend() function is used to generate EV_ACTION events that will be recorded in the event log. However, skiboot must also create and record an EV_SEPARATOR event for a clean handover to skiroot kernel. This adds the i_logType parameter to the TpmLogMgr_genLogEventPcrExtend() function, thus it can also be used to generate EV_SEPARATOR events. Signed-off-by: Claudio Carvalho <cclaudio@linux.vnet.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'libstb')
-rw-r--r--libstb/tss/tpmLogMgr.C3
-rw-r--r--libstb/tss/tpmLogMgr.H2
2 files changed, 4 insertions, 1 deletions
diff --git a/libstb/tss/tpmLogMgr.C b/libstb/tss/tpmLogMgr.C
index 95f4810..063f432 100644
--- a/libstb/tss/tpmLogMgr.C
+++ b/libstb/tss/tpmLogMgr.C
@@ -458,6 +458,7 @@ namespace TRUSTEDBOOT
TPM_Alg_Id i_algId_2,
const uint8_t* i_digest_2,
size_t i_digestSize_2,
+ uint32_t i_logType,
const char* i_logMsg)
{
TCG_PCR_EVENT2 eventLog;
@@ -472,7 +473,7 @@ namespace TRUSTEDBOOT
memset(&eventLog, 0, sizeof(eventLog));
eventLog.pcrIndex = i_pcr;
- eventLog.eventType = EV_ACTION;
+ eventLog.eventType = i_logType;
// Update digest information
eventLog.digests.count = 1;
diff --git a/libstb/tss/tpmLogMgr.H b/libstb/tss/tpmLogMgr.H
index 26b8604..21cd3ba 100644
--- a/libstb/tss/tpmLogMgr.H
+++ b/libstb/tss/tpmLogMgr.H
@@ -210,6 +210,7 @@ namespace TRUSTEDBOOT
* @param[in] i_algId_2 Algorithm to use
* @param[in] i_digest_2 Digest value to write to PCR, NULL if not used
* @param[in] i_digestSize_2 Byte size of i_digest array
+ * @param[in] i_logType Event type
* @param[in] i_logMsg Null terminated Log message
*
* @return TCG_PCR_EVENT2 PCR event log
@@ -221,6 +222,7 @@ namespace TRUSTEDBOOT
TPM_Alg_Id i_algId_2,
const uint8_t* i_digest_2,
size_t i_digestSize_2,
+ uint32_t i_logType,
const char* i_logMsg);
#ifdef __HOSTBOOT_MODULE
/**