From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.15069.1595321558327638879 for ; Tue, 21 Jul 2020 01:52:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=FfsLvVBH; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: jian.j.wang@intel.com) IronPort-SDR: Sonpguci4lsASaS64JhoDLPFAfeVAXAB9QOWGD/+N5Oa/lezzsOFBCK92bZpGmMMuitDjwRjQF A5y5RDWFkEYQ== X-IronPort-AV: E=McAfee;i="6000,8403,9688"; a="129661167" X-IronPort-AV: E=Sophos;i="5.75,378,1589266800"; d="scan'208";a="129661167" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2020 01:52:37 -0700 IronPort-SDR: PDebcaDiS3Jmv2neeJqgZzvxWMPvGNRQ8yiTHTGfYfIdGkQ1m6nO2Vhwkv15MNbJD2HOSI7m3b omOJd3kYj19A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,378,1589266800"; d="scan'208";a="392286124" Received: from orsmsx108.amr.corp.intel.com ([10.22.240.6]) by fmsmga001.fm.intel.com with ESMTP; 21 Jul 2020 01:52:37 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX108.amr.corp.intel.com (10.22.240.6) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 Jul 2020 01:52:37 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 21 Jul 2020 01:52:37 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 21 Jul 2020 01:52:37 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.102) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 Jul 2020 01:52:36 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b7/dNH5a1IlF/RinUdcV0j7QbXeSgYGWDARQU4Njuv1L6KPeqrVg23z5U4qRsnk0hbZAuXXta4E9TahxqojSQ4wc/QwIluqm1dxghASlGcpJ/0hGbIXnZ1vWDuTsiwwWbexfVXHEnf6wVwXOjdK6oxZFr0zDWjgLa820Dcn6cThnvIFZgkYzOfNFocKRwsIFYG0BC7Giz/XhSFQvJPu0kh9n1UguHvGjWik/6GM8aeH6lZWoXry54HzIIA8rsG1pLBXRKDaaR9upXzWviX5k4RaSosUiYDwVz4N+HHJVtZQIH9xuAobzmsEMS47CP7599lHOyASGWBiUTvmsTMQhEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ff549jOLgJ/3Yv/LO5VPd2B09W02pHlLB2cTbJJxhac=; b=Ch5Xjd7ImHdbVW9byxI/c55GC8tMGhak1DncY4qUVKEntqV34z1+yNZPz4b/ZfZaBH9oo5cyl9OBvrrSiqNJlOZy403obCB2NPTCd3Yl9wRpaVBP+8LK+rm2s/Luv0Vq40eiCLMskWWCKYkHEzFMFVs1Hfpzd6skld0ljHpOEE7X61I2ZcBQYvGXMkhQU4gl6z8iRjOVlCaDYvcgZrc5MI/7LrZMiBmBXsbKeDGEBnby3yeWn7fiZsqLRsh3kSg1fkiaXLdeTmttM9ExlADZ6z7DJALcAEvWVw+lm4QnVZP7nQtSUFmLR1F8uRYRzMDRnXKj/r1NrFZlqC64pZO+nA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ff549jOLgJ/3Yv/LO5VPd2B09W02pHlLB2cTbJJxhac=; b=FfsLvVBHYbdw/msUsercs05HKsKbMLmcZEiczOrlMZi9hBwQoMsMH7aoUcsW+bIoxyZ3KdCMKzSoqsI2ZjBPJ2piqqtAx1q8JPymzA/13g5Z9etcyXiAfisY54404+HN6ZxK6+HuLT53FWEU/qAn4DUitryjNpoeqha8VRM72gE= Received: from BYAPR11MB3303.namprd11.prod.outlook.com (2603:10b6:a03:18::15) by BY5PR11MB3973.namprd11.prod.outlook.com (2603:10b6:a03:185::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.25; Tue, 21 Jul 2020 08:52:35 +0000 Received: from BYAPR11MB3303.namprd11.prod.outlook.com ([fe80::fc2a:d66e:8c79:6ecd]) by BYAPR11MB3303.namprd11.prod.outlook.com ([fe80::fc2a:d66e:8c79:6ecd%7]) with mapi id 15.20.3195.025; Tue, 21 Jul 2020 08:52:35 +0000 From: "Wang, Jian J" To: "Zhang, Qi1" , "devel@edk2.groups.io" CC: "Yao, Jiewen" , "Kumar, Rahul1" Subject: Re: [PATCH v4 4/6] SecurityPkg/Tcg2: Add TcgPpi Thread-Topic: [PATCH v4 4/6] SecurityPkg/Tcg2: Add TcgPpi Thread-Index: AQHWXBdBWHeU8vx4LUSBKytgAs46EKkRvSuw Date: Tue, 21 Jul 2020 08:52:33 +0000 Message-ID: References: <20200717084935.11067-1-qi1.zhang@intel.com> <20200717084935.11067-5-qi1.zhang@intel.com> In-Reply-To: <20200717084935.11067-5-qi1.zhang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNzVhMTQ0YzUtNTBlNC00NWQzLTgzYTQtZWJiODE3Mzc3YmYxIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoic2NuRTU4WmpueTdDZ0tCbVlkWEdoMmRcL1M1dG9oam82djBsTnFPRnBKR3dRTXM3Z2QwZmlneVlQU1lQSEVoSzkifQ== dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows x-ctpclassification: CTP_NT authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.194] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ce4860e9-66d1-42f9-f4b9-08d82d5369bc x-ms-traffictypediagnostic: BY5PR11MB3973: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3826; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: AzHYLsVnB9Hf7Uq2guF++QNiNKxbBGWat3BRLiXY5gUV/7LApy3cKpO5Nnw3PvdJKIy4tqnRZ1UeUxe94bjeVFH7QR7zVlhCfQX+7ABLxamYdez7aFY1HkWH23dZ95unznID1orXpHUrhlwafipze05hEMSZrM5YvSWyybgWOWIneqEJFwx02b+yi/Dv+eBkEhgLza4oQDxmmtduEWVwMYpPphoJZG52pd0W3tQ+atpbEpTkgzH7+0nLtGDYeiLIaRVrMa6yv/aLnp5qsqX1ZrxnIBSFRLTLQVjvftweWSuJAfCTfTrLPpcSNuBEj/ylRxUW77hQ9Y72c3yrRJV/3n6IhGCneZ+gPovjLVR+gKWAr5FjDaBGhzAZ7uf/IaqBOaIdDFmoBdrm4lLQYebZjQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR11MB3303.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(39860400002)(376002)(346002)(396003)(136003)(76116006)(64756008)(66446008)(66946007)(316002)(19627235002)(66556008)(66476007)(54906003)(110136005)(86362001)(8676002)(8936002)(33656002)(71200400001)(9686003)(4326008)(107886003)(55016002)(6506007)(186003)(5660300002)(53546011)(52536014)(966005)(45080400002)(478600001)(83380400001)(26005)(7696005)(2906002)(15650500001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: JU8ppYlnFOcxleBkvXqeCQV2mDY0pyI+HaCvW1zGr3i4JJ9yc8ZooegsdDE7eeacyBhq30JWqwdxl4LSuLcsYAKqoK/3ozChOmVll5nXca+XriBVYqYTRJV3ADKJ7JVO1ppvenQyiP2JuqYM1b6F0hn7T4sb30SiLbWn05YIbh+GX7NvqMP6pC4e3QdqV1Wq/tSwDV5plG7U9f5rcJPHmMPSZDtH1y1gPz0EDy+jioMlN9jn4SKv0jKI+qjPEzk7kE/hyohB2jtn2YADSAC1g4ycr53eu4yKnt6WrmpGIsmUtOkTfVKKMjPZSt5z7ukqLy0aQ4JoHDIUb0+VeBbR9cBIoqh2faccjfYG+XztacosjaDsdb04MBmlkcBI7w/1x00bE3EyC1XxgklG9tEwf1F8MAYj+4ya53+nKrFNUeSct3Y+w2uUgKOGuI36rZ9t1S3i/ou+mDQJzrG3L/Hr94V1XkRhY4763H+fQip8oBJn3XenY129MQFxu1H7buxq MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3303.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce4860e9-66d1-42f9-f4b9-08d82d5369bc X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jul 2020 08:52:34.4686 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: +DVrfxqtQRF3Ho6eK7uhfWKRaEXgnMV0UwwPWd20PH+Z56d+BH+mgFvmNXsVfP5Cj9lHreOnxq21aKydJXf4NQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB3973 Return-Path: jian.j.wang@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Qi, A few comments below. Regards, Jian > -----Original Message----- > From: Zhang, Qi1 > Sent: Friday, July 17, 2020 4:50 PM > To: devel@edk2.groups.io > Cc: Yao, Jiewen ; Wang, Jian J ; > Zhang, Qi1 ; Kumar, Rahul1 > Subject: [PATCH v4 4/6] SecurityPkg/Tcg2: Add TcgPpi >=20 > From: Jiewen Yao >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2841 >=20 > Cc: Jiewen Yao > Cc: Jian J Wang > Cc: Qi Zhang > Cc: Rahul Kumar > Signed-off-by: Jiewen Yao > --- > SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c | 110 +++++++++++++++++++++------- > SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf | 3 +- > 2 files changed, 86 insertions(+), 27 deletions(-) >=20 > diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c > b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c > index 19b8e4b318..592f760057 100644 > --- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c > +++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c > @@ -1,7 +1,7 @@ > /** @file >=20 > Initialize TPM2 device and measure FVs before handing off control to D= XE. >=20 >=20 >=20 > -Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
>=20 > +Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
>=20 > Copyright (c) 2017, Microsoft Corporation. All rights reserved.
>=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 >=20 >=20 > @@ -17,6 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #include >=20 > #include >=20 > #include >=20 > +#include >=20 >=20 >=20 > #include >=20 > #include >=20 > @@ -66,6 +67,48 @@ EFI_PEI_PPI_DESCRIPTOR mTpmInitializationDonePpiList > =3D { > NULL >=20 > }; >=20 >=20 >=20 > +/** >=20 > + Do a hash operation on a data buffer, extend a specific TPM PCR with t= he > hash result, >=20 > + and build a GUIDed HOB recording the event which will be passed to the= DXE > phase and >=20 > + added into the Event Log. >=20 > + >=20 > + @param[in] This Indicates the calling context >=20 > + @param[in] Flags Bitmap providing additional information. >=20 > + @param[in] HashData If BIT0 of Flags is 0, it is physical ad= dress of the >=20 > + start of the data buffer to be hashed, e= xtended, and logged. >=20 > + If BIT0 of Flags is 1, it is physical ad= dress of the >=20 > + start of the pre-hash data buffter to be= extended, and logged. >=20 > + The pre-hash data format is TPML_DIGEST_= VALUES. >=20 > + @param[in] HashDataLen The length, in bytes, of the buffer refe= renced by > HashData. >=20 > + @param[in] NewEventHdr Pointer to a TCG_PCR_EVENT_HDR data > structure. >=20 > + @param[in] NewEventData Pointer to the new event data. >=20 > + >=20 > + @retval EFI_SUCCESS Operation completed successfully. >=20 > + @retval EFI_OUT_OF_RESOURCES No enough memory to log the new event. >=20 > + @retval EFI_DEVICE_ERROR The command was unsuccessful. >=20 > + >=20 > +**/ >=20 > +EFI_STATUS >=20 > +EFIAPI >=20 > +HashLogExtendEvent ( >=20 > + IN EDKII_TCG_PPI *This, >=20 > + IN UINT64 Flags, >=20 > + IN UINT8 *HashData, >=20 > + IN UINTN HashDataLen, >=20 > + IN TCG_PCR_EVENT_HDR *NewEventHdr, >=20 > + IN UINT8 *NewEventData >=20 > + ); >=20 > + >=20 > +EDKII_TCG_PPI mEdkiiTcgPpi =3D { >=20 > + HashLogExtendEvent >=20 > +}; >=20 > + >=20 > +EFI_PEI_PPI_DESCRIPTOR mTcgPpiList =3D { >=20 > + EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST, >=20 > + &gEdkiiTcgPpiGuid, >=20 > + &mEdkiiTcgPpi >=20 > +}; >=20 > + >=20 > // >=20 > // Number of firmware blobs to grow by each time we run out of room >=20 > // >=20 > @@ -375,9 +418,13 @@ LogHashEvent ( > and build a GUIDed HOB recording the event which will be passed to the= DXE > phase and >=20 > added into the Event Log. >=20 >=20 >=20 > + @param[in] This Indicates the calling context >=20 > @param[in] Flags Bitmap providing additional information. >=20 > - @param[in] HashData Physical address of the start of the dat= a buffer >=20 > - to be hashed, extended, and logged. >=20 > + @param[in] HashData If BIT0 of Flags is 0, it is physical ad= dress of the >=20 > + start of the data buffer to be hashed, e= xtended, and logged. >=20 > + If BIT0 of Flags is 1, it is physical ad= dress of the >=20 > + start of the pre-hash data buffter to be= extended, and logged. >=20 > + The pre-hash data format is TPML_DIGEST_= VALUES. >=20 > @param[in] HashDataLen The length, in bytes, of the buffer refe= renced by > HashData. >=20 > @param[in] NewEventHdr Pointer to a TCG_PCR_EVENT_HDR data > structure. >=20 > @param[in] NewEventData Pointer to the new event data. >=20 > @@ -388,7 +435,9 @@ LogHashEvent ( >=20 >=20 > **/ >=20 > EFI_STATUS >=20 > +EFIAPI >=20 > HashLogExtendEvent ( >=20 > + IN EDKII_TCG_PPI *This, >=20 > IN UINT64 Flags, >=20 > IN UINT8 *HashData, >=20 > IN UINTN HashDataLen, >=20 > @@ -403,16 +452,23 @@ HashLogExtendEvent ( > return EFI_DEVICE_ERROR; >=20 > } >=20 >=20 >=20 > - Status =3D HashAndExtend ( >=20 > - NewEventHdr->PCRIndex, >=20 > - HashData, >=20 > - HashDataLen, >=20 > + if(Flags & EDKII_TCG_PRE_HASH) { >=20 > + ZeroMem (&DigestList, sizeof(DigestList)); >=20 > + CopyMem(&DigestList, HashData, sizeof(DigestList)); Missing a space before '('. >=20 > + Status =3D Tpm2PcrExtend( Missing a space before '('. >=20 > + 0, >=20 > &DigestList >=20 > ); >=20 > + } else { >=20 > + Status =3D HashAndExtend ( >=20 > + NewEventHdr->PCRIndex, >=20 > + HashData, >=20 > + HashDataLen, >=20 > + &DigestList >=20 > + ); >=20 > + } >=20 > if (!EFI_ERROR (Status)) { >=20 > - if ((Flags & EFI_TCG2_EXTEND_ONLY) =3D=3D 0) { >=20 > - Status =3D LogHashEvent (&DigestList, NewEventHdr, NewEventData); >=20 > - } >=20 > + Status =3D LogHashEvent (&DigestList, NewEventHdr, NewEventData); >=20 > } >=20 >=20 >=20 > if (Status =3D=3D EFI_DEVICE_ERROR) { >=20 > @@ -452,6 +508,7 @@ MeasureCRTMVersion ( > TcgEventHdr.EventSize =3D (UINT32) StrSize((CHAR16*)PcdGetPtr > (PcdFirmwareVersionString)); >=20 >=20 >=20 > return HashLogExtendEvent ( >=20 > + &mEdkiiTcgPpi, >=20 > 0, >=20 > (UINT8*)PcdGetPtr (PcdFirmwareVersionString), >=20 > TcgEventHdr.EventSize, >=20 > @@ -651,27 +708,22 @@ MeasureFvImage ( > // FV pre-hash algos comply with current TPM hash requirement >=20 > // Skip hashing step in measure, only extend DigestList to PCR and l= og event >=20 > // >=20 > - Status =3D Tpm2PcrExtend( >=20 > - 0, >=20 > - &DigestList >=20 > + Status =3D HashLogExtendEvent ( >=20 > + &mEdkiiTcgPpi, >=20 > + EDKII_TCG_PRE_HASH, >=20 > + (UINT8*) &DigestList, // HashData >=20 > + (UINTN) sizeof(DigestList), // HashDataLen >=20 > + &TcgEventHdr, // EventHdr >=20 > + EventData // EventData >=20 > ); >=20 > - >=20 > - if (!EFI_ERROR(Status)) { >=20 > - Status =3D LogHashEvent (&DigestList, &TcgEventHdr, EventData); >=20 > - DEBUG ((DEBUG_INFO, "The pre-hashed FV which is extended & logged= by > Tcg2Pei starts at: 0x%x\n", FvBase)); >=20 > - DEBUG ((DEBUG_INFO, "The pre-hashed FV which is extended & logged= by > Tcg2Pei has the size: 0x%x\n", FvLength)); >=20 > - } else if (Status =3D=3D EFI_DEVICE_ERROR) { >=20 > - BuildGuidHob (&gTpmErrorHobGuid,0); >=20 > - REPORT_STATUS_CODE ( >=20 > - EFI_ERROR_CODE | EFI_ERROR_MINOR, >=20 > - (PcdGet32 (PcdStatusCodeSubClassTpmDevice) | > EFI_P_EC_INTERFACE_ERROR) >=20 > - ); >=20 > - } Please explain the purpose of the removal of this part of code in commit me= ssage. It looks that it's not a relevant change to this patch series. >=20 > + DEBUG ((DEBUG_INFO, "The pre-hashed FV which is extended & logged by > Tcg2Pei starts at: 0x%x\n", FvBase)); >=20 > + DEBUG ((DEBUG_INFO, "The pre-hashed FV which is extended & logged by > Tcg2Pei has the size: 0x%x\n", FvLength)); >=20 > } else { >=20 > // >=20 > // Hash the FV, extend digest to the TPM and log TCG event >=20 > // >=20 > Status =3D HashLogExtendEvent ( >=20 > + &mEdkiiTcgPpi, >=20 > 0, >=20 > (UINT8*) (UINTN) FvBase, // HashData >=20 > (UINTN) FvLength, // HashDataLen >=20 > @@ -849,6 +901,12 @@ PeimEntryMP ( > { >=20 > EFI_STATUS Status; >=20 >=20 >=20 > + // >=20 > + // install Tcg Services >=20 > + // >=20 > + Status =3D PeiServicesInstallPpi (&mTcgPpiList); >=20 > + ASSERT_EFI_ERROR (Status); >=20 > + >=20 > if (PcdGet8 (PcdTpm2ScrtmPolicy) =3D=3D 1) { >=20 > Status =3D MeasureCRTMVersion (); >=20 > } >=20 > @@ -893,7 +951,7 @@ MeasureSeparatorEventWithError ( > TcgEvent.PCRIndex =3D PCRIndex; >=20 > TcgEvent.EventType =3D EV_SEPARATOR; >=20 > TcgEvent.EventSize =3D (UINT32)sizeof (EventData); >=20 > - return HashLogExtendEvent(0,(UINT8 *)&EventData, TcgEvent.EventSize, > &TcgEvent,(UINT8 *)&EventData); >=20 > + return HashLogExtendEvent(&mEdkiiTcgPpi, 0, (UINT8 *)&EventData, > TcgEvent.EventSize, &TcgEvent,(UINT8 *)&EventData); >=20 > } >=20 >=20 >=20 > /** >=20 > diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf > b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf > index 3d361e8859..f64b29f1ae 100644 > --- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf > +++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf > @@ -8,7 +8,7 @@ > # >=20 > # This module will initialize TPM device, measure reported FVs and BIOS= version. >=20 > # >=20 > -# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
>=20 > +# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
>=20 > # Copyright (c) 2017, Microsoft Corporation. All rights reserved.
>=20 > # SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > # >=20 > @@ -72,6 +72,7 @@ > gPeiTpmInitializationDonePpiGuid #= # PRODUCES >=20 > gEfiEndOfPeiSignalPpiGuid #= # SOMETIMES_CONSUMES > ## NOTIFY >=20 > gEdkiiPeiFirmwareVolumeInfoPrehashedFvPpiGuid #= # > SOMETIMES_CONSUMES >=20 > + gEdkiiTcgPpiGuid #= # PRODUCES >=20 >=20 >=20 > [Pcd] >=20 > gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString #= # > SOMETIMES_CONSUMES >=20 > -- > 2.26.2.windows.1