From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eu0AE-0001Dx-BU for qemu-devel@nongnu.org; Thu, 08 Mar 2018 13:21:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eu0AB-0000Xb-5h for qemu-devel@nongnu.org; Thu, 08 Mar 2018 13:21:14 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37744 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eu0AA-0000XD-Rb for qemu-devel@nongnu.org; Thu, 08 Mar 2018 13:21:11 -0500 References: <20180307155746.18526-1-marcandre.lureau@redhat.com> <20180307155746.18526-7-marcandre.lureau@redhat.com> From: Laszlo Ersek Message-ID: Date: Thu, 8 Mar 2018 19:20:59 +0100 MIME-Version: 1.0 In-Reply-To: <20180307155746.18526-7-marcandre.lureau@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [edk2] [PATCH v2 6/8] ovmf: link with Tcg2Pei module List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, edk2-devel@lists.01.org Cc: qemu-devel@nongnu.org, javierm@redhat.com, pjones@redhat.com, jiewen.yao@intel.com On 03/07/18 16:57, marcandre.lureau@redhat.com wrote: > From: Marc-Andr=C3=A9 Lureau >=20 > This module will initialize TPM device, measure reported FVs and BIOS > version. We keep both SHA-1 and SHA-256 for the TCG 1.2 log format > compatibility, but the SHA-256 measurements and TCG 2 log format are > now recommended. >=20 > Cc: Laszlo Ersek > Cc: Stefan Berger > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > OvmfPkg/OvmfPkgX64.dsc | 7 +++++++ > OvmfPkg/OvmfPkgX64.fdf | 1 + > 2 files changed, 8 insertions(+) (1) Please change the subject line to: OvmfPkg: include Tcg2Pei module >=20 > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index 64bd6b6a9f08..3fa1a31f4c37 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -278,6 +278,8 @@ [LibraryClasses.common.PEIM] > QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf > =20 > !if $(TPM2_ENABLE) > + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf (2) Technically this makes sense, but given the fact that we resolve BaseCryptLib unconditionally for a bunch of other module types, I think we should do that for PEIMs as well. > + HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCrypt= oRouterPei.inf > Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTp= m.inf > !endif > =20 > @@ -615,6 +617,11 @@ [Components] > =20 > !if $(TPM2_ENABLE) =3D=3D TRUE > OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > + SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { > + > + NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1= .inf > + NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSh= a256.inf > + } > !endif > =20 > # > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index dbafada5226b..c0173e7adf5f 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -167,6 +167,7 @@ [FV.PEIFV] > =20 > !if $(TPM2_ENABLE) =3D=3D TRUE > INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > +INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf > !endif > =20 > ######################################################################= ########## >=20 Looks good. (The final version should handle the other DSC / FDF files to= o.) Thanks! Laszlo