diff options
| author | Zhang, Chao B <chao.b.zhang@intel.com> | 2017-01-25 12:50:55 +0800 |
|---|---|---|
| committer | Zhang, Chao B <chao.b.zhang@intel.com> | 2017-01-26 13:43:25 +0800 |
| commit | c1b0828b3ba8fa203033ede0c3329c0d5573719e (patch) | |
| tree | 5ec3c890e01e33cb1ce7d37904b17a4adfb94315 /SecurityPkg/Tcg/Tcg2Dxe | |
| parent | 8b17ad862c235b3226c3d118e5b2f929860ef7ec (diff) | |
| download | edk2-c1b0828b3ba8fa203033ede0c3329c0d5573719e.tar.gz edk2-c1b0828b3ba8fa203033ede0c3329c0d5573719e.tar.bz2 edk2-c1b0828b3ba8fa203033ede0c3329c0d5573719e.zip | |
SecurityPkg: Tcg2Dxe: Update PCR[4] measure logic
Update PCR[4] measure logic for each boot attempt.
1. Measure event to PCR[4] instead of PCR[5]
2. Measure “Calling UEFI Application from Boot Option”
http://www.trustedcomputinggroup.org/wp-content/uploads/PC-ClientSpecific_Platform_Profile_for_TPM_2p0_Systems_v21.pdf
Cc: Star Zeng <star.zeng@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>
Reviewed-by: Yao Jiewen <jiewen.yao@intel.com>
Diffstat (limited to 'SecurityPkg/Tcg/Tcg2Dxe')
| -rw-r--r-- | SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c index 9aa16dc659..860ee5946d 100644 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c @@ -1648,8 +1648,9 @@ SetupEventLog ( }
/**
- Measure and log an action string, and extend the measurement result into PCR[5].
+ Measure and log an action string, and extend the measurement result into PCR[PCRIndex].
+ @param[in] PCRIndex PCRIndex to extend
@param[in] String A specific string that indicates an Action event.
@retval EFI_SUCCESS Operation completed successfully.
@@ -1658,12 +1659,13 @@ SetupEventLog ( **/
EFI_STATUS
TcgMeasureAction (
- IN CHAR8 *String
+ IN TPM_PCRINDEX PCRIndex,
+ IN CHAR8 *String
)
{
TCG_PCR_EVENT_HDR TcgEvent;
- TcgEvent.PCRIndex = 5;
+ TcgEvent.PCRIndex = PCRIndex;
TcgEvent.EventType = EV_EFI_ACTION;
TcgEvent.EventSize = (UINT32)AsciiStrLen (String);
return TcgDxeHashLogExtendEvent (
@@ -2180,6 +2182,7 @@ OnReadyToBoot ( // 1. This is the first boot attempt.
//
Status = TcgMeasureAction (
+ 4,
EFI_CALLING_EFI_APPLICATION
);
if (EFI_ERROR (Status)) {
@@ -2213,11 +2216,24 @@ OnReadyToBoot ( // 6. Not first attempt, meaning a return from last attempt
//
Status = TcgMeasureAction (
+ 4,
EFI_RETURNING_FROM_EFI_APPLICATOIN
);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATOIN));
}
+
+ //
+ // 7. Next boot attempt, measure "Calling EFI Application from Boot Option" again
+ // TCG PC Client PFP spec Section 2.4.4.5 Step 4
+ //
+ Status = TcgMeasureAction (
+ 4,
+ EFI_CALLING_EFI_APPLICATION
+ );
+ if (EFI_ERROR (Status)) {
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_CALLING_EFI_APPLICATION));
+ }
}
DEBUG ((EFI_D_INFO, "TPM2 Tcg2Dxe Measure Data when ReadyToBoot\n"));
@@ -2250,6 +2266,7 @@ OnExitBootServices ( // Measure invocation of ExitBootServices,
//
Status = TcgMeasureAction (
+ 5,
EFI_EXIT_BOOT_SERVICES_INVOCATION
);
if (EFI_ERROR (Status)) {
@@ -2260,6 +2277,7 @@ OnExitBootServices ( // Measure success of ExitBootServices
//
Status = TcgMeasureAction (
+ 5,
EFI_EXIT_BOOT_SERVICES_SUCCEEDED
);
if (EFI_ERROR (Status)) {
@@ -2289,6 +2307,7 @@ OnExitBootServicesFailed ( // Measure Failure of ExitBootServices,
//
Status = TcgMeasureAction (
+ 5,
EFI_EXIT_BOOT_SERVICES_FAILED
);
if (EFI_ERROR (Status)) {
|