SecurityPkg: Fix TPM2 ACPI measurement.

[mirror_edk2.git] / SecurityPkg / SecurityPkg.dsc

diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc
index ed0da7563df36adb970f50f31c2c86341167aac3..9a254087a34a13a0ef9e698d6235c99cdff1bdba 100644 (file)
--- a/SecurityPkg/SecurityPkg.dsc
+++ b/SecurityPkg/SecurityPkg.dsc
@@ -70,7 +70,7 @@
 [LibraryClasses.ARM]\r
   #\r
   # It is not possible to prevent the ARM compiler for generic intrinsic functions.\r
-  # This library provides the instrinsic functions generate by a given compiler.\r
+  # This library provides the intrinsic functions generate by a given compiler.\r
   # And NULL mean link this library into all ARM images.\r
   #\r
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
@@ -149,7 +149,6 @@
 \r
 [Components]\r
   SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r
-  #SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf\r
   SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf\r
 \r
   #\r
@@ -199,7 +198,6 @@
   SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
   SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf\r
 \r
-  SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf\r
   SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf\r
   SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf\r
   SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf\r
@@ -228,6 +226,7 @@
   SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf\r
   SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf\r
   SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf\r
+  SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf\r
 \r
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {\r
     <LibraryClasses>\r
@@ -242,6 +241,7 @@
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf\r
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf\r
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf\r
   }\r
 \r
   SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {\r
@@ -252,6 +252,7 @@
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf\r
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf\r
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf\r
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
   }\r
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {\r
@@ -293,6 +294,11 @@
   SecurityPkg/HddPassword/HddPasswordDxe.inf\r
   SecurityPkg/HddPassword/HddPasswordPei.inf\r
 \r
+  #\r
+  # Common FV checker/verifier/reporter\r
+  #\r
+  SecurityPkg/FvReportPei/FvReportPei.inf\r
+\r
 [BuildOptions]\r
    MSFT:*_*_IA32_DLINK_FLAGS = /ALIGN:256\r
   INTEL:*_*_IA32_DLINK_FLAGS = /ALIGN:256\r