tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg: TpmMeasureLib: Re-prioritize TCG/TCG2 protocol 

TPM1.2 is obsoleted by TPM2.0. switch TCG/TCG2 protocol check to apply this
trend

Cc: Long, Qin <qin.long@intel.com>
Cc: Yao, Jiewen <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhang, Chao B <chao.b.zhang@intel.com>
Reviewed-by: Yao, Jiewen <jiewen.yao@intel.com>
This commit is contained in:
Zhang, Chao B 2018-07-21 11:20:24 +08:00
parent 5da2c9b27a
commit d9e206d4bf
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
View File

@ -184,9 +184,9 @@ TpmMeasureAndLogData (
EFI_STATUS Status; EFI_STATUS Status;
// //
// Try to measure using Tpm1.2 protocol // Try to measure using Tpm20 protocol
// //
Status = Tpm12MeasureAndLogData( Status = Tpm20MeasureAndLogData(
PcrIndex, PcrIndex,
EventType, EventType,
EventLog, EventLog,
@ -194,11 +194,12 @@ TpmMeasureAndLogData (
HashData, HashData,
HashDataLen HashDataLen
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
// //
// Try to measure using Tpm20 protocol // Try to measure using Tpm1.2 protocol
// //
Status = Tpm20MeasureAndLogData( Status = Tpm12MeasureAndLogData(
PcrIndex, PcrIndex,
EventType, EventType,
EventLog, EventLog,