OvmfPkg: include Tcg2Pei module

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.

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index ef25e5037028986eebee197788cb4ae30b61efcb..05ad5cf3754e62567a33354d920045d0763410ae 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -273,6 +273,7 @@
   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf\r
 \r
 !if $(TPM2_ENABLE) == TRUE\r
   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf\r
 \r
 !if $(TPM2_ENABLE) == TRUE\r

+  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf\r

   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf\r
 !endif\r
 \r
   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf\r
 !endif\r
 \r


@@ -608,6 +609,12 @@
 \r
 !if $(TPM2_ENABLE) == TRUE\r
   OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
 \r
 !if $(TPM2_ENABLE) == TRUE\r
   OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r

+  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {\r
+    <LibraryClasses>\r
+      HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf\r
+  }\r

 !endif\r
 \r
   #\r
 !endif\r
 \r
   #\r

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 76f35e859eca5cc78cd0e27e5f54ce51eacf6a43..e9e8611d4cd95e94c2b91e9ac92441d1aba59ec7 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -167,6 +167,7 @@ INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 \r
 !if $(TPM2_ENABLE) == TRUE\r
 INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
 \r
 !if $(TPM2_ENABLE) == TRUE\r
 INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r

+INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf\r

 !endif\r
 \r
 ################################################################################\r
 !endif\r
 \r
 ################################################################################\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 0364dafdcb3aa594bf0665941f4b1cc7e98858f7..9a095c3ed88db84bc8e0f30491ebc0169ea4b66c 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -278,6 +278,7 @@
   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf\r
 \r
 !if $(TPM2_ENABLE) == TRUE\r
   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf\r
 \r
 !if $(TPM2_ENABLE) == TRUE\r

+  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf\r

   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf\r
 !endif\r
 \r
   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf\r
 !endif\r
 \r


@@ -616,6 +617,12 @@
 \r
 !if $(TPM2_ENABLE) == TRUE\r
   OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
 \r
 !if $(TPM2_ENABLE) == TRUE\r
   OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r

+  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {\r
+    <LibraryClasses>\r
+      HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf\r
+  }\r

 !endif\r
 \r
 [Components.X64]\r
 !endif\r
 \r
 [Components.X64]\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 16c67fa90c7566969cbec1254b8f3555a52ac360..e2a370ce22c5d9189b11755b6b5c3ac5e081ad26 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -167,6 +167,7 @@ INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 \r
 !if $(TPM2_ENABLE) == TRUE\r
 INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
 \r
 !if $(TPM2_ENABLE) == TRUE\r
 INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r

+INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf\r

 !endif\r
 \r
 ################################################################################\r
 !endif\r
 \r
 ################################################################################\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index a2845804fc4b3b2edda743d828ec40645391f211..861320e9c1f44051b5fdbbd16f9a104a69a76047 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -278,6 +278,7 @@
   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf\r
 \r
 !if $(TPM2_ENABLE) == TRUE\r
   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf\r
 \r
 !if $(TPM2_ENABLE) == TRUE\r

+  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf\r

   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf\r
 !endif\r
 \r
   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf\r
 !endif\r
 \r


@@ -615,6 +616,12 @@
 \r
 !if $(TPM2_ENABLE) == TRUE\r
   OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
 \r
 !if $(TPM2_ENABLE) == TRUE\r
   OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r

+  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {\r
+    <LibraryClasses>\r
+      HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf\r
+  }\r

 !endif\r
 \r
   #\r
 !endif\r
 \r
   #\r

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index dbafada5226b5db53d5e0bfd09b5a209586af70c..c0173e7adf5f2929f0ee79ada73a16090fddc8cc 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -167,6 +167,7 @@ INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 \r
 !if $(TPM2_ENABLE) == TRUE\r
 INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
 \r
 !if $(TPM2_ENABLE) == TRUE\r
 INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r

+INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf\r

 !endif\r
 \r
 ################################################################################\r
 !endif\r
 \r
 ################################################################################\r