SecurityPkg: Correct BootOrder/Boot#### measurement behavior

Correct the variable measurement behavior to include whole EFI_VARIABLE_DATA structure.
It is for the latest spec compliance

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by: Qin Long <qin.long@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17980 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Chao Zhang 2015-07-15 02:13:22 +00:00 committed by czhang46
parent 68227ac33e
commit 368110120b
2 changed files with 10 additions and 22 deletions

View File

@ -959,8 +959,8 @@ MeasureVariable (
Status = TcgDxeHashLogExtendEventI ( Status = TcgDxeHashLogExtendEventI (
&mTcgDxeData, &mTcgDxeData,
(UINT8*)VarData, (UINT8*)VarLog,
VarSize, TcgEvent.EventSize,
&TcgEvent, &TcgEvent,
(UINT8*)VarLog (UINT8*)VarLog
); );

View File

@ -1206,26 +1206,14 @@ MeasureVariable (
); );
} }
if (EventType == EV_EFI_VARIABLE_DRIVER_CONFIG) { Status = TcgDxeHashLogExtendEvent (
// 0,
// Digest is the event data (EFI_VARIABLE_DATA_TREE) (UINT8*)VarLog,
// TcgEvent.EventSize,
Status = TcgDxeHashLogExtendEvent ( &TcgEvent,
0, (UINT8*)VarLog
(UINT8*)VarLog, );
TcgEvent.EventSize,
&TcgEvent,
(UINT8*)VarLog
);
} else {
Status = TcgDxeHashLogExtendEvent (
0,
(UINT8*)VarData,
VarSize,
&TcgEvent,
(UINT8*)VarLog
);
}
FreePool (VarLog); FreePool (VarLog);
return Status; return Status;
} }