* [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log EV_NO_ACTION event in TCG_PCR_EVENT2 format
@ 2017-02-04 1:33 Zhang, Chao B
2017-02-04 1:33 ` [PATCH 2/2] MdePkg: UefiTcgPlatform.h: Add TCG_PCR_EVENT2_HDR definition Zhang, Chao B
2017-02-04 8:53 ` [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log EV_NO_ACTION event in TCG_PCR_EVENT2 format Long, Qin
0 siblings, 2 replies; 5+ messages in thread
From: Zhang, Chao B @ 2017-02-04 1:33 UTC (permalink / raw)
To: edk2-devel; +Cc: qin.long, jiewen.yao, Chao Zhang
All the event log entry in TCG2 Event log format should be TCG_PCR_EVENT2
except event log header. Defined by TCG EFI Spec 2.0 00.13
https://trustedcomputinggroup.org/wp-content/uploads/EFI-Protocol-Specification-rev13-160330final.pdf
Cc: Long Qin <qin.long@intel.com>
Cc: Yao Jiewen <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
---
SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 114 ++++++++++++++++++++++++++++++++------
1 file changed, 96 insertions(+), 18 deletions(-)
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index 860ee59..08c40db 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -169,6 +169,82 @@ InternalDumpData (
/**
+ This function initialize TCG_PCR_EVENT2 for EV_NO_ACTION Event Type other than EFI Specification ID event
+ The behavior is defined by TCG PC Client PFP Spec. Section 9.3.4 EV_NO_ACTION Event Types
+
+ @param[in, out] NoActionEvent Event Header of EV_NO_ACTION Event
+ @param[in] EventSize Event Size of the EV_NO_ACTION Event
+
+**/
+VOID
+InitNoActionEvent (
+ IN OUT TCG_PCR_EVENT2_HDR *NoActionEvent,
+ IN UINT32 EventSize
+ )
+{
+ UINT32 DigestListCount;
+ TPMI_ALG_HASH HashAlgId;
+ UINT8 *DigestBuffer;
+
+ DigestBuffer = (UINT8 *)NoActionEvent->Digest.digests;
+ DigestListCount = 0;
+
+ NoActionEvent->PCRIndex = 0;
+ NoActionEvent->EventType = EV_NO_ACTION;
+
+ //
+ // Set Hash count & hashAlg accordingly, while Digest.digests[n].digest to all 0
+ //
+ ZeroMem (&NoActionEvent->Digest, sizeof(NoActionEvent->Digest));
+
+ if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SHA1) != 0) {
+ HashAlgId = TPM_ALG_SHA1;
+ CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
+ DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo (HashAlgId);
+ DigestListCount++;
+ }
+
+ if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SHA256) != 0) {
+ HashAlgId = TPM_ALG_SHA256;
+ CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
+ DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo (HashAlgId);
+ DigestListCount++;
+ }
+
+ if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SHA384) != 0) {
+ HashAlgId = TPM_ALG_SHA384;
+ CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
+ DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo (HashAlgId);
+ DigestListCount++;
+ }
+
+ if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SHA512) != 0) {
+ HashAlgId = TPM_ALG_SHA512;
+ CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
+ DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo (HashAlgId);
+ DigestListCount++;
+ }
+
+ if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SM3_256) != 0) {
+ HashAlgId = TPM_ALG_SM3_256;
+ CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
+ DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo (HashAlgId);
+ DigestListCount++;
+ }
+
+ //
+ // Set Digests Count
+ //
+ WriteUnaligned32 ((UINT32 *)&NoActionEvent->Digest.count, DigestListCount);
+
+ //
+ // Set Event Size
+ //
+ WriteUnaligned32((UINT32 *)DigestBuffer, EventSize);
+}
+
+/**
+
This function dump raw data with colume format.
@param Data raw data
@@ -1381,7 +1457,8 @@ SetupEventLog (
UINT32 HashAlgorithmMaskCopied;
TCG_EfiSpecIDEventStruct *TcgEfiSpecIdEventStruct;
UINT8 TempBuf[sizeof(TCG_EfiSpecIDEventStruct) + sizeof(UINT32) + (HASH_COUNT * sizeof(TCG_EfiSpecIdEventAlgorithmSize)) + sizeof(UINT8)];
- TCG_PCR_EVENT_HDR NoActionEvent;
+ TCG_PCR_EVENT_HDR SpecIdEvent;
+ TCG_PCR_EVENT2_HDR NoActionEvent;
TCG_EfiSpecIdEventAlgorithmSize *DigestSize;
TCG_EfiSpecIdEventAlgorithmSize *TempDigestSize;
UINT8 *VendorInfoSize;
@@ -1469,25 +1546,26 @@ SetupEventLog (
VendorInfoSize = (UINT8 *)TempDigestSize;
*VendorInfoSize = 0;
- NoActionEvent.PCRIndex = 0;
- NoActionEvent.EventType = EV_NO_ACTION;
- ZeroMem (&NoActionEvent.Digest, sizeof(NoActionEvent.Digest));
- NoActionEvent.EventSize = (UINT32)GetTcgEfiSpecIdEventStructSize (TcgEfiSpecIdEventStruct);
+ SpecIdEvent.PCRIndex = 0;
+ SpecIdEvent.EventType = EV_NO_ACTION;
+ ZeroMem (&SpecIdEvent.Digest, sizeof(SpecIdEvent.Digest));
+ SpecIdEvent.EventSize = (UINT32)GetTcgEfiSpecIdEventStructSize (TcgEfiSpecIdEventStruct);
//
- // Log TcgEfiSpecIdEventStruct as the first Event
+ // Log TcgEfiSpecIdEventStruct as the first Event. Event format is TCG_PCR_EVENT.
+ // TCG EFI Protocol Spec. Section 5.3 Event Log Header
// TCG PC Client PFP spec. Section 9.2 Measurement Event Entries and Log
//
Status = TcgDxeLogEvent (
mTcg2EventInfo[Index].LogFormat,
- &NoActionEvent,
- sizeof(NoActionEvent),
+ &SpecIdEvent,
+ sizeof(SpecIdEvent),
(UINT8 *)TcgEfiSpecIdEventStruct,
- NoActionEvent.EventSize
+ SpecIdEvent.EventSize
);
//
- // EfiStartupLocalityEvent
+ // EfiStartupLocalityEvent. Event format is TCG_PCR_EVENT2
//
GuidHob.Guid = GetFirstGuidHob (&gTpm2StartupLocalityHobGuid);
if (GuidHob.Guid != NULL) {
@@ -1496,25 +1574,25 @@ SetupEventLog (
//
StartupLocalityEvent.StartupLocality = *(UINT8 *)(GET_GUID_HOB_DATA (GuidHob.Guid));
CopyMem (StartupLocalityEvent.Signature, TCG_EfiStartupLocalityEvent_SIGNATURE, sizeof(StartupLocalityEvent.Signature));
-
- NoActionEvent.PCRIndex = 0;
- NoActionEvent.EventType = EV_NO_ACTION;
- ZeroMem (&NoActionEvent.Digest, sizeof(NoActionEvent.Digest));
- NoActionEvent.EventSize = sizeof(StartupLocalityEvent);
-
DEBUG ((DEBUG_INFO, "SetupEventLog: Set Locality from HOB into StartupLocalityEvent 0x%02x\n", StartupLocalityEvent.StartupLocality));
//
+ // Initialize StartupLocalityEvent
+ //
+ InitNoActionEvent(&NoActionEvent, sizeof(StartupLocalityEvent));
+
+ //
// Log EfiStartupLocalityEvent as the second Event
// TCG PC Client PFP spec. Section 9.3.4.3 Startup Locality Event
//
Status = TcgDxeLogEvent (
mTcg2EventInfo[Index].LogFormat,
&NoActionEvent,
- sizeof(NoActionEvent),
+ sizeof(NoActionEvent.PCRIndex) + sizeof(NoActionEvent.EventType) + GetDigestListBinSize (&NoActionEvent.Digest) + sizeof(NoActionEvent.EventSize),
(UINT8 *)&StartupLocalityEvent,
- NoActionEvent.EventSize
+ sizeof(StartupLocalityEvent)
);
+
}
}
}
--
1.9.5.msysgit.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] MdePkg: UefiTcgPlatform.h: Add TCG_PCR_EVENT2_HDR definition
2017-02-04 1:33 [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log EV_NO_ACTION event in TCG_PCR_EVENT2 format Zhang, Chao B
@ 2017-02-04 1:33 ` Zhang, Chao B
2017-02-04 8:49 ` Long, Qin
2017-02-04 8:53 ` [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log EV_NO_ACTION event in TCG_PCR_EVENT2 format Long, Qin
1 sibling, 1 reply; 5+ messages in thread
From: Zhang, Chao B @ 2017-02-04 1:33 UTC (permalink / raw)
To: edk2-devel; +Cc: qin.long, jiewen.yao, Chao Zhang
Add TCG_PCR_EVENT2_HDR definition.
Cc: Long Qin <qin.long@intel.com>
Cc: Yao Jiewen <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
---
MdePkg/Include/IndustryStandard/UefiTcgPlatform.h | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
index 8a3e170..cd1dea8 100644
--- a/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
+++ b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
@@ -206,6 +206,16 @@ typedef struct tdTCG_PCR_EVENT2 {
} TCG_PCR_EVENT2;
//
+// TCG PCR Event2 Header
+//
+typedef struct tdTCG_PCR_EVENT2_HDR{
+ TCG_PCRINDEX PCRIndex;
+ TCG_EVENTTYPE EventType;
+ TPML_DIGEST_VALUES Digest;
+ UINT32 EventSize;
+} TCG_PCR_EVENT2_HDR;
+
+//
// Log Header Entry Data
//
typedef struct {
--
1.9.5.msysgit.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] MdePkg: UefiTcgPlatform.h: Add TCG_PCR_EVENT2_HDR definition
2017-02-04 1:33 ` [PATCH 2/2] MdePkg: UefiTcgPlatform.h: Add TCG_PCR_EVENT2_HDR definition Zhang, Chao B
@ 2017-02-04 8:49 ` Long, Qin
0 siblings, 0 replies; 5+ messages in thread
From: Long, Qin @ 2017-02-04 8:49 UTC (permalink / raw)
To: Zhang, Chao B, edk2-devel@lists.01.org; +Cc: Yao, Jiewen
Hi, Chao,
Please use "Digests", instead of "Digest" in TCG_PCR_EVENT2 definition for spec alignment.
Other looks good to me.
Reviewed-by: Long Qin <qin.long@intel.com>
Best Regards & Thanks,
LONG, Qin
> -----Original Message-----
> From: Zhang, Chao B
> Sent: Saturday, February 04, 2017 9:33 AM
> To: edk2-devel@lists.01.org
> Cc: Long, Qin; Yao, Jiewen; Zhang, Chao B
> Subject: [PATCH 2/2] MdePkg: UefiTcgPlatform.h: Add
> TCG_PCR_EVENT2_HDR definition
>
> Add TCG_PCR_EVENT2_HDR definition.
>
> Cc: Long Qin <qin.long@intel.com>
> Cc: Yao Jiewen <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
> ---
> MdePkg/Include/IndustryStandard/UefiTcgPlatform.h | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
> b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
> index 8a3e170..cd1dea8 100644
> --- a/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
> +++ b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
> @@ -206,6 +206,16 @@ typedef struct tdTCG_PCR_EVENT2 { }
> TCG_PCR_EVENT2;
>
> //
> +// TCG PCR Event2 Header
> +//
> +typedef struct tdTCG_PCR_EVENT2_HDR{
> + TCG_PCRINDEX PCRIndex;
> + TCG_EVENTTYPE EventType;
> + TPML_DIGEST_VALUES Digest;
> + UINT32 EventSize;
> +} TCG_PCR_EVENT2_HDR;
> +
> +//
> // Log Header Entry Data
> //
> typedef struct {
> --
> 1.9.5.msysgit.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log EV_NO_ACTION event in TCG_PCR_EVENT2 format
2017-02-04 1:33 [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log EV_NO_ACTION event in TCG_PCR_EVENT2 format Zhang, Chao B
2017-02-04 1:33 ` [PATCH 2/2] MdePkg: UefiTcgPlatform.h: Add TCG_PCR_EVENT2_HDR definition Zhang, Chao B
@ 2017-02-04 8:53 ` Long, Qin
2017-02-06 0:57 ` Zhang, Chao B
1 sibling, 1 reply; 5+ messages in thread
From: Long, Qin @ 2017-02-04 8:53 UTC (permalink / raw)
To: Zhang, Chao B, edk2-devel@lists.01.org; +Cc: Yao, Jiewen
Please check the "Digests" and "Digest" in HDR definition, as my previous comment.
Reviewed-by: Long Qin <qin.long@intel.com>
Best Regards & Thanks,
LONG, Qin
> -----Original Message-----
> From: Zhang, Chao B
> Sent: Saturday, February 04, 2017 9:33 AM
> To: edk2-devel@lists.01.org
> Cc: Long, Qin; Yao, Jiewen; Zhang, Chao B
> Subject: [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log EV_NO_ACTION event in
> TCG_PCR_EVENT2 format
>
> All the event log entry in TCG2 Event log format should be TCG_PCR_EVENT2
> except event log header. Defined by TCG EFI Spec 2.0 00.13
> https://trustedcomputinggroup.org/wp-content/uploads/EFI-Protocol-
> Specification-rev13-160330final.pdf
>
> Cc: Long Qin <qin.long@intel.com>
> Cc: Yao Jiewen <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
> ---
> SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 114
> ++++++++++++++++++++++++++++++++------
> 1 file changed, 96 insertions(+), 18 deletions(-)
>
> diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> index 860ee59..08c40db 100644
> --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> @@ -169,6 +169,82 @@ InternalDumpData (
>
> /**
>
> + This function initialize TCG_PCR_EVENT2 for EV_NO_ACTION Event Type
> + other than EFI Specification ID event The behavior is defined by TCG
> + PC Client PFP Spec. Section 9.3.4 EV_NO_ACTION Event Types
> +
> + @param[in, out] NoActionEvent Event Header of EV_NO_ACTION Event
> + @param[in] EventSize Event Size of the EV_NO_ACTION Event
> +
> +**/
> +VOID
> +InitNoActionEvent (
> + IN OUT TCG_PCR_EVENT2_HDR *NoActionEvent,
> + IN UINT32 EventSize
> + )
> +{
> + UINT32 DigestListCount;
> + TPMI_ALG_HASH HashAlgId;
> + UINT8 *DigestBuffer;
> +
> + DigestBuffer = (UINT8 *)NoActionEvent->Digest.digests;
> + DigestListCount = 0;
> +
> + NoActionEvent->PCRIndex = 0;
> + NoActionEvent->EventType = EV_NO_ACTION;
> +
> + //
> + // Set Hash count & hashAlg accordingly, while
> + Digest.digests[n].digest to all 0 // ZeroMem
> + (&NoActionEvent->Digest, sizeof(NoActionEvent->Digest));
> +
> + if ((mTcgDxeData.BsCap.ActivePcrBanks &
> EFI_TCG2_BOOT_HASH_ALG_SHA1) != 0) {
> + HashAlgId = TPM_ALG_SHA1;
> + CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
> + DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo
> (HashAlgId);
> + DigestListCount++;
> + }
> +
> + if ((mTcgDxeData.BsCap.ActivePcrBanks &
> EFI_TCG2_BOOT_HASH_ALG_SHA256) != 0) {
> + HashAlgId = TPM_ALG_SHA256;
> + CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
> + DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo
> (HashAlgId);
> + DigestListCount++;
> + }
> +
> + if ((mTcgDxeData.BsCap.ActivePcrBanks &
> EFI_TCG2_BOOT_HASH_ALG_SHA384) != 0) {
> + HashAlgId = TPM_ALG_SHA384;
> + CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
> + DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo
> (HashAlgId);
> + DigestListCount++;
> + }
> +
> + if ((mTcgDxeData.BsCap.ActivePcrBanks &
> EFI_TCG2_BOOT_HASH_ALG_SHA512) != 0) {
> + HashAlgId = TPM_ALG_SHA512;
> + CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
> + DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo
> (HashAlgId);
> + DigestListCount++;
> + }
> +
> + if ((mTcgDxeData.BsCap.ActivePcrBanks &
> EFI_TCG2_BOOT_HASH_ALG_SM3_256) != 0) {
> + HashAlgId = TPM_ALG_SM3_256;
> + CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
> + DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo
> (HashAlgId);
> + DigestListCount++;
> + }
> +
> + //
> + // Set Digests Count
> + //
> + WriteUnaligned32 ((UINT32 *)&NoActionEvent->Digest.count,
> + DigestListCount);
> +
> + //
> + // Set Event Size
> + //
> + WriteUnaligned32((UINT32 *)DigestBuffer, EventSize); }
> +
> +/**
> +
> This function dump raw data with colume format.
>
> @param Data raw data
> @@ -1381,7 +1457,8 @@ SetupEventLog (
> UINT32 HashAlgorithmMaskCopied;
> TCG_EfiSpecIDEventStruct *TcgEfiSpecIdEventStruct;
> UINT8 TempBuf[sizeof(TCG_EfiSpecIDEventStruct) +
> sizeof(UINT32) + (HASH_COUNT * sizeof(TCG_EfiSpecIdEventAlgorithmSize))
> + sizeof(UINT8)];
> - TCG_PCR_EVENT_HDR NoActionEvent;
> + TCG_PCR_EVENT_HDR SpecIdEvent;
> + TCG_PCR_EVENT2_HDR NoActionEvent;
> TCG_EfiSpecIdEventAlgorithmSize *DigestSize;
> TCG_EfiSpecIdEventAlgorithmSize *TempDigestSize;
> UINT8 *VendorInfoSize;
> @@ -1469,25 +1546,26 @@ SetupEventLog (
> VendorInfoSize = (UINT8 *)TempDigestSize;
> *VendorInfoSize = 0;
>
> - NoActionEvent.PCRIndex = 0;
> - NoActionEvent.EventType = EV_NO_ACTION;
> - ZeroMem (&NoActionEvent.Digest, sizeof(NoActionEvent.Digest));
> - NoActionEvent.EventSize = (UINT32)GetTcgEfiSpecIdEventStructSize
> (TcgEfiSpecIdEventStruct);
> + SpecIdEvent.PCRIndex = 0;
> + SpecIdEvent.EventType = EV_NO_ACTION;
> + ZeroMem (&SpecIdEvent.Digest, sizeof(SpecIdEvent.Digest));
> + SpecIdEvent.EventSize = (UINT32)GetTcgEfiSpecIdEventStructSize
> + (TcgEfiSpecIdEventStruct);
>
> //
> - // Log TcgEfiSpecIdEventStruct as the first Event
> + // Log TcgEfiSpecIdEventStruct as the first Event. Event format is
> TCG_PCR_EVENT.
> + // TCG EFI Protocol Spec. Section 5.3 Event Log Header
> // TCG PC Client PFP spec. Section 9.2 Measurement Event Entries and
> Log
> //
> Status = TcgDxeLogEvent (
> mTcg2EventInfo[Index].LogFormat,
> - &NoActionEvent,
> - sizeof(NoActionEvent),
> + &SpecIdEvent,
> + sizeof(SpecIdEvent),
> (UINT8 *)TcgEfiSpecIdEventStruct,
> - NoActionEvent.EventSize
> + SpecIdEvent.EventSize
> );
>
> //
> - // EfiStartupLocalityEvent
> + // EfiStartupLocalityEvent. Event format is TCG_PCR_EVENT2
> //
> GuidHob.Guid = GetFirstGuidHob (&gTpm2StartupLocalityHobGuid);
> if (GuidHob.Guid != NULL) {
> @@ -1496,25 +1574,25 @@ SetupEventLog (
> //
> StartupLocalityEvent.StartupLocality = *(UINT8
> *)(GET_GUID_HOB_DATA (GuidHob.Guid));
> CopyMem (StartupLocalityEvent.Signature,
> TCG_EfiStartupLocalityEvent_SIGNATURE,
> sizeof(StartupLocalityEvent.Signature));
> -
> - NoActionEvent.PCRIndex = 0;
> - NoActionEvent.EventType = EV_NO_ACTION;
> - ZeroMem (&NoActionEvent.Digest, sizeof(NoActionEvent.Digest));
> - NoActionEvent.EventSize = sizeof(StartupLocalityEvent);
> -
> DEBUG ((DEBUG_INFO, "SetupEventLog: Set Locality from HOB into
> StartupLocalityEvent 0x%02x\n", StartupLocalityEvent.StartupLocality));
>
> //
> + // Initialize StartupLocalityEvent
> + //
> + InitNoActionEvent(&NoActionEvent,
> + sizeof(StartupLocalityEvent));
> +
> + //
> // Log EfiStartupLocalityEvent as the second Event
> // TCG PC Client PFP spec. Section 9.3.4.3 Startup Locality Event
> //
> Status = TcgDxeLogEvent (
> mTcg2EventInfo[Index].LogFormat,
> &NoActionEvent,
> - sizeof(NoActionEvent),
> + sizeof(NoActionEvent.PCRIndex) +
> + sizeof(NoActionEvent.EventType) + GetDigestListBinSize
> + (&NoActionEvent.Digest) + sizeof(NoActionEvent.EventSize),
> (UINT8 *)&StartupLocalityEvent,
> - NoActionEvent.EventSize
> + sizeof(StartupLocalityEvent)
> );
> +
> }
> }
> }
> --
> 1.9.5.msysgit.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log EV_NO_ACTION event in TCG_PCR_EVENT2 format
2017-02-04 8:53 ` [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log EV_NO_ACTION event in TCG_PCR_EVENT2 format Long, Qin
@ 2017-02-06 0:57 ` Zhang, Chao B
0 siblings, 0 replies; 5+ messages in thread
From: Zhang, Chao B @ 2017-02-06 0:57 UTC (permalink / raw)
To: Long, Qin, edk2-devel@lists.01.org; +Cc: Yao, Jiewen
Qin:
Thanks for your comments. I will follow TCG EFI Protocol spec to use Digests. As for TCG_PCR_EVENT2 structure,
I will keep Digest field unchanged, since it is an incompatible change.
-----Original Message-----
From: Long, Qin
Sent: Saturday, February 4, 2017 4:53 PM
To: Zhang, Chao B <chao.b.zhang@intel.com>; edk2-devel@lists.01.org
Cc: Yao, Jiewen <jiewen.yao@intel.com>
Subject: RE: [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log EV_NO_ACTION event in TCG_PCR_EVENT2 format
Please check the "Digests" and "Digest" in HDR definition, as my previous comment.
Reviewed-by: Long Qin <qin.long@intel.com>
Best Regards & Thanks,
LONG, Qin
> -----Original Message-----
> From: Zhang, Chao B
> Sent: Saturday, February 04, 2017 9:33 AM
> To: edk2-devel@lists.01.org
> Cc: Long, Qin; Yao, Jiewen; Zhang, Chao B
> Subject: [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log EV_NO_ACTION event in
> TCG_PCR_EVENT2 format
>
> All the event log entry in TCG2 Event log format should be
> TCG_PCR_EVENT2 except event log header. Defined by TCG EFI Spec 2.0
> 00.13
> https://trustedcomputinggroup.org/wp-content/uploads/EFI-Protocol-
> Specification-rev13-160330final.pdf
>
> Cc: Long Qin <qin.long@intel.com>
> Cc: Yao Jiewen <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
> ---
> SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 114
> ++++++++++++++++++++++++++++++++------
> 1 file changed, 96 insertions(+), 18 deletions(-)
>
> diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> index 860ee59..08c40db 100644
> --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> @@ -169,6 +169,82 @@ InternalDumpData (
>
> /**
>
> + This function initialize TCG_PCR_EVENT2 for EV_NO_ACTION Event Type
> + other than EFI Specification ID event The behavior is defined by
> + TCG PC Client PFP Spec. Section 9.3.4 EV_NO_ACTION Event Types
> +
> + @param[in, out] NoActionEvent Event Header of EV_NO_ACTION Event
> + @param[in] EventSize Event Size of the EV_NO_ACTION Event
> +
> +**/
> +VOID
> +InitNoActionEvent (
> + IN OUT TCG_PCR_EVENT2_HDR *NoActionEvent,
> + IN UINT32 EventSize
> + )
> +{
> + UINT32 DigestListCount;
> + TPMI_ALG_HASH HashAlgId;
> + UINT8 *DigestBuffer;
> +
> + DigestBuffer = (UINT8 *)NoActionEvent->Digest.digests;
> + DigestListCount = 0;
> +
> + NoActionEvent->PCRIndex = 0;
> + NoActionEvent->EventType = EV_NO_ACTION;
> +
> + //
> + // Set Hash count & hashAlg accordingly, while
> + Digest.digests[n].digest to all 0 // ZeroMem
> + (&NoActionEvent->Digest, sizeof(NoActionEvent->Digest));
> +
> + if ((mTcgDxeData.BsCap.ActivePcrBanks &
> EFI_TCG2_BOOT_HASH_ALG_SHA1) != 0) {
> + HashAlgId = TPM_ALG_SHA1;
> + CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
> + DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo
> (HashAlgId);
> + DigestListCount++;
> + }
> +
> + if ((mTcgDxeData.BsCap.ActivePcrBanks &
> EFI_TCG2_BOOT_HASH_ALG_SHA256) != 0) {
> + HashAlgId = TPM_ALG_SHA256;
> + CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
> + DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo
> (HashAlgId);
> + DigestListCount++;
> + }
> +
> + if ((mTcgDxeData.BsCap.ActivePcrBanks &
> EFI_TCG2_BOOT_HASH_ALG_SHA384) != 0) {
> + HashAlgId = TPM_ALG_SHA384;
> + CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
> + DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo
> (HashAlgId);
> + DigestListCount++;
> + }
> +
> + if ((mTcgDxeData.BsCap.ActivePcrBanks &
> EFI_TCG2_BOOT_HASH_ALG_SHA512) != 0) {
> + HashAlgId = TPM_ALG_SHA512;
> + CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
> + DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo
> (HashAlgId);
> + DigestListCount++;
> + }
> +
> + if ((mTcgDxeData.BsCap.ActivePcrBanks &
> EFI_TCG2_BOOT_HASH_ALG_SM3_256) != 0) {
> + HashAlgId = TPM_ALG_SM3_256;
> + CopyMem (DigestBuffer, &HashAlgId, sizeof(TPMI_ALG_HASH));
> + DigestBuffer += sizeof(TPMI_ALG_HASH) + GetHashSizeFromAlgo
> (HashAlgId);
> + DigestListCount++;
> + }
> +
> + //
> + // Set Digests Count
> + //
> + WriteUnaligned32 ((UINT32 *)&NoActionEvent->Digest.count,
> + DigestListCount);
> +
> + //
> + // Set Event Size
> + //
> + WriteUnaligned32((UINT32 *)DigestBuffer, EventSize); }
> +
> +/**
> +
> This function dump raw data with colume format.
>
> @param Data raw data
> @@ -1381,7 +1457,8 @@ SetupEventLog (
> UINT32 HashAlgorithmMaskCopied;
> TCG_EfiSpecIDEventStruct *TcgEfiSpecIdEventStruct;
> UINT8 TempBuf[sizeof(TCG_EfiSpecIDEventStruct) +
> sizeof(UINT32) + (HASH_COUNT *
> sizeof(TCG_EfiSpecIdEventAlgorithmSize))
> + sizeof(UINT8)];
> - TCG_PCR_EVENT_HDR NoActionEvent;
> + TCG_PCR_EVENT_HDR SpecIdEvent;
> + TCG_PCR_EVENT2_HDR NoActionEvent;
> TCG_EfiSpecIdEventAlgorithmSize *DigestSize;
> TCG_EfiSpecIdEventAlgorithmSize *TempDigestSize;
> UINT8 *VendorInfoSize;
> @@ -1469,25 +1546,26 @@ SetupEventLog (
> VendorInfoSize = (UINT8 *)TempDigestSize;
> *VendorInfoSize = 0;
>
> - NoActionEvent.PCRIndex = 0;
> - NoActionEvent.EventType = EV_NO_ACTION;
> - ZeroMem (&NoActionEvent.Digest, sizeof(NoActionEvent.Digest));
> - NoActionEvent.EventSize = (UINT32)GetTcgEfiSpecIdEventStructSize
> (TcgEfiSpecIdEventStruct);
> + SpecIdEvent.PCRIndex = 0;
> + SpecIdEvent.EventType = EV_NO_ACTION;
> + ZeroMem (&SpecIdEvent.Digest, sizeof(SpecIdEvent.Digest));
> + SpecIdEvent.EventSize =
> + (UINT32)GetTcgEfiSpecIdEventStructSize
> + (TcgEfiSpecIdEventStruct);
>
> //
> - // Log TcgEfiSpecIdEventStruct as the first Event
> + // Log TcgEfiSpecIdEventStruct as the first Event. Event
> + format is
> TCG_PCR_EVENT.
> + // TCG EFI Protocol Spec. Section 5.3 Event Log Header
> // TCG PC Client PFP spec. Section 9.2 Measurement Event Entries and
> Log
> //
> Status = TcgDxeLogEvent (
> mTcg2EventInfo[Index].LogFormat,
> - &NoActionEvent,
> - sizeof(NoActionEvent),
> + &SpecIdEvent,
> + sizeof(SpecIdEvent),
> (UINT8 *)TcgEfiSpecIdEventStruct,
> - NoActionEvent.EventSize
> + SpecIdEvent.EventSize
> );
>
> //
> - // EfiStartupLocalityEvent
> + // EfiStartupLocalityEvent. Event format is TCG_PCR_EVENT2
> //
> GuidHob.Guid = GetFirstGuidHob (&gTpm2StartupLocalityHobGuid);
> if (GuidHob.Guid != NULL) {
> @@ -1496,25 +1574,25 @@ SetupEventLog (
> //
> StartupLocalityEvent.StartupLocality = *(UINT8
> *)(GET_GUID_HOB_DATA (GuidHob.Guid));
> CopyMem (StartupLocalityEvent.Signature,
> TCG_EfiStartupLocalityEvent_SIGNATURE,
> sizeof(StartupLocalityEvent.Signature));
> -
> - NoActionEvent.PCRIndex = 0;
> - NoActionEvent.EventType = EV_NO_ACTION;
> - ZeroMem (&NoActionEvent.Digest, sizeof(NoActionEvent.Digest));
> - NoActionEvent.EventSize = sizeof(StartupLocalityEvent);
> -
> DEBUG ((DEBUG_INFO, "SetupEventLog: Set Locality from HOB
> into StartupLocalityEvent 0x%02x\n",
> StartupLocalityEvent.StartupLocality));
>
> //
> + // Initialize StartupLocalityEvent
> + //
> + InitNoActionEvent(&NoActionEvent,
> + sizeof(StartupLocalityEvent));
> +
> + //
> // Log EfiStartupLocalityEvent as the second Event
> // TCG PC Client PFP spec. Section 9.3.4.3 Startup Locality Event
> //
> Status = TcgDxeLogEvent (
> mTcg2EventInfo[Index].LogFormat,
> &NoActionEvent,
> - sizeof(NoActionEvent),
> + sizeof(NoActionEvent.PCRIndex) +
> + sizeof(NoActionEvent.EventType) + GetDigestListBinSize
> + (&NoActionEvent.Digest) + sizeof(NoActionEvent.EventSize),
> (UINT8 *)&StartupLocalityEvent,
> - NoActionEvent.EventSize
> + sizeof(StartupLocalityEvent)
> );
> +
> }
> }
> }
> --
> 1.9.5.msysgit.1
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-02-06 0:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-04 1:33 [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log EV_NO_ACTION event in TCG_PCR_EVENT2 format Zhang, Chao B
2017-02-04 1:33 ` [PATCH 2/2] MdePkg: UefiTcgPlatform.h: Add TCG_PCR_EVENT2_HDR definition Zhang, Chao B
2017-02-04 8:49 ` Long, Qin
2017-02-04 8:53 ` [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log EV_NO_ACTION event in TCG_PCR_EVENT2 format Long, Qin
2017-02-06 0:57 ` Zhang, Chao B
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox