coreboot-mirror
/
STM
mirror of https://review.coreboot.org/STM.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correct event log type. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
This commit is contained in:
Jiewen Yao 2016-08-02 11:50:13 +08:00
parent 04074850f6
commit 8e4c1267e2
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Test/FrmPkg/Core/DlEntryDump.c
View File

@ -2764,6 +2764,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED CHAR16 *mTxtEventTypeName[] = {
L"OSSINITDATA_CAP_HASH", L"OSSINITDATA_CAP_HASH",
L"SINIT_PUBKEY_HASH", L"SINIT_PUBKEY_HASH",
L"LCP_HASH", L"LCP_HASH",
L"LCP_DETAILS_HASH",
L"LCP_AUTHORITIES_HASH",
L"NV_INFO_HASH",
}; };
/** /**
@ -2783,6 +2786,8 @@ EventTypeToString(
if ((EventType >= TXT_EVTYPE_BASE) && if ((EventType >= TXT_EVTYPE_BASE) &&
(EventType < TXT_EVTYPE_BASE + sizeof(mTxtEventTypeName)/sizeof(mTxtEventTypeName[0]))) { (EventType < TXT_EVTYPE_BASE + sizeof(mTxtEventTypeName)/sizeof(mTxtEventTypeName[0]))) {
return mTxtEventTypeName[EventType - TXT_EVTYPE_BASE]; return mTxtEventTypeName[EventType - TXT_EVTYPE_BASE];
} else if (EventType == TXT_EVTYPE_CAP_VALUE) {
return L"CAP_VALUE";
} else { } else {
if (EventType < sizeof(mEventTypeName) / sizeof(mEventTypeName[0])) { if (EventType < sizeof(mEventTypeName) / sizeof(mEventTypeName[0])) {
return mEventTypeName[EventType]; return mEventTypeName[EventType];

4
Test/FrmPkg/Core/Tpm.c
View File

@ -374,12 +374,12 @@ CapPcr (
case FRM_TPM_TYPE_TPM12: case FRM_TPM_TYPE_TPM12:
Tpm12GetRandom(sizeof(NonceData), (UINT8 *)&NonceData); Tpm12GetRandom(sizeof(NonceData), (UINT8 *)&NonceData);
Tpm12HashAndExtend(PcrIndex, (UINT8 *)&NonceData, sizeof(NonceData), &DigestToEntend); Tpm12HashAndExtend(PcrIndex, (UINT8 *)&NonceData, sizeof(NonceData), &DigestToEntend);
Tpm12LogEvent(PcrIndex, EV_EVENT_TAG, &DigestToEntend, 0, NULL); Tpm12LogEvent(PcrIndex, TXT_EVTYPE_CAP_VALUE, &DigestToEntend, 0, NULL);
break; break;
case FRM_TPM_TYPE_TPM2: case FRM_TPM_TYPE_TPM2:
Tpm2GetRandom(sizeof(RandomBytes.buffer), &RandomBytes); Tpm2GetRandom(sizeof(RandomBytes.buffer), &RandomBytes);
HashAndExtend (PcrIndex, (UINT8 *)&RandomBytes.buffer, sizeof(RandomBytes.buffer), &DigestList); HashAndExtend (PcrIndex, (UINT8 *)&RandomBytes.buffer, sizeof(RandomBytes.buffer), &DigestList);
Tpm2LogEvent(PcrIndex, EV_EVENT_TAG, &DigestList, 0, NULL); Tpm2LogEvent(PcrIndex, TXT_EVTYPE_CAP_VALUE, &DigestList, 0, NULL);
break; break;
} }

4
Test/FrmPkg/Include/Library/Smx.h
View File

@ -531,6 +531,10 @@ typedef union {
#define TXT_EVTYPE_OSSINITDATA_CAP_HASH (TXT_EVTYPE_BASE + 15) #define TXT_EVTYPE_OSSINITDATA_CAP_HASH (TXT_EVTYPE_BASE + 15)
#define TXT_EVTYPE_SINIT_PUBKEY_HASH (TXT_EVTYPE_BASE + 16) #define TXT_EVTYPE_SINIT_PUBKEY_HASH (TXT_EVTYPE_BASE + 16)
#define TXT_EVTYPE_LCP_HASH (TXT_EVTYPE_BASE + 17) #define TXT_EVTYPE_LCP_HASH (TXT_EVTYPE_BASE + 17)
#define TXT_EVTYPE_LCP_DETAILS_HASH (TXT_EVTYPE_BASE + 18)
#define TXT_EVTYPE_LCP_AUTHORITIES_HASH (TXT_EVTYPE_BASE + 19)
#define TXT_EVTYPE_NV_INFO_HASH (TXT_EVTYPE_BASE + 20)
#define TXT_EVTYPE_CAP_VALUE (TXT_EVTYPE_BASE + 255)
#pragma pack (pop) #pragma pack (pop)