From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id BAAC281EDF for ; Mon, 23 Jan 2017 00:51:58 -0800 (PST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP; 23 Jan 2017 00:51:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,274,1477983600"; d="scan'208";a="812163425" Received: from czhan46-mobl1.ccr.corp.intel.com ([10.239.192.99]) by FMSMGA003.fm.intel.com with ESMTP; 23 Jan 2017 00:51:57 -0800 From: "Zhang, Chao B" To: edk2-devel@lists.01.org Cc: jiewen.yao@intel.com, star.zeng@intel.com, Chao Zhang Date: Mon, 23 Jan 2017 16:51:54 +0800 Message-Id: <20170123085155.21056-1-chao.b.zhang@intel.com> X-Mailer: git-send-email 2.11.0.windows.1 Subject: [PATCH 1/2] SecurityPkg: Tcg2Dxe: Log Startup Locality Event X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2017 08:51:58 -0000 Log Startup Locality Event according to TCG PC Client PFP 00.21. Event should be placed before any extend to PCR[0] http://www.trustedcomputinggroup.org/wp-content/uploads/PC-ClientSpecific_Platform_Profile_for_TPM_2p0_Systems_v21.pdf Cc: Star Zeng Cc: Yao Jiewen Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Chao Zhang --- SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 48 ++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c index 3534fd1..2658944 100644 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c @@ -1381,11 +1381,12 @@ SetupEventLog ( UINT32 HashAlgorithmMaskCopied; TCG_EfiSpecIDEventStruct *TcgEfiSpecIdEventStruct; UINT8 TempBuf[sizeof(TCG_EfiSpecIDEventStruct) + sizeof(UINT32) + (HASH_COUNT * sizeof(TCG_EfiSpecIdEventAlgorithmSize)) + sizeof(UINT8)]; - TCG_PCR_EVENT_HDR FirstPcrEvent; + TCG_PCR_EVENT_HDR NoActionEvent; TCG_EfiSpecIdEventAlgorithmSize *DigestSize; TCG_EfiSpecIdEventAlgorithmSize *TempDigestSize; UINT8 *VendorInfoSize; UINT32 NumberOfAlgorithms; + TCG_EfiStartupLocalityEvent StartupLocalityEvent; DEBUG ((EFI_D_INFO, "SetupEventLog\n")); @@ -1468,24 +1469,49 @@ 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); + // - // FirstPcrEvent + // Log TcgEfiSpecIdEventStruct as the first Event + // TCG PC Client PFP spec. Section 9.2 Measurement Event Entries and Log // - FirstPcrEvent.PCRIndex = 0; - FirstPcrEvent.EventType = EV_NO_ACTION; - ZeroMem (&FirstPcrEvent.Digest, sizeof(FirstPcrEvent.Digest)); - FirstPcrEvent.EventSize = (UINT32)GetTcgEfiSpecIdEventStructSize (TcgEfiSpecIdEventStruct); + Status = TcgDxeLogEvent ( + mTcg2EventInfo[Index].LogFormat, + &NoActionEvent, + sizeof(NoActionEvent), + (UINT8 *)TcgEfiSpecIdEventStruct, + NoActionEvent.EventSize + ); // - // Record + // EfiStartupLocalityEvent + // + CopyMem (StartupLocalityEvent.Signature, TCG_EfiStartupLocalityEvent_SIGNATURE, sizeof(StartupLocalityEvent.Signature)); + // + // SRTM uses Locality 0 to access the TPM according to PC Client PFP spec 2.2.1 + // + StartupLocalityEvent.StartupLocality = LOCALITY_0_INDICATOR; + + NoActionEvent.PCRIndex = 0; + NoActionEvent.EventType = EV_NO_ACTION; + ZeroMem (&NoActionEvent.Digest, sizeof(NoActionEvent.Digest)); + NoActionEvent.EventSize = 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, - &FirstPcrEvent, - sizeof(FirstPcrEvent), - (UINT8 *)TcgEfiSpecIdEventStruct, - FirstPcrEvent.EventSize + &NoActionEvent, + sizeof(NoActionEvent), + (UINT8 *)&StartupLocalityEvent, + NoActionEvent.EventSize ); + } } } -- 1.9.5.msysgit.1