Revert "OvmfPkg: link SM3 support into Tcg2Pei and Tcg2Dxe"

Laszlo Ersek · Laszlo Ersek · commit ddc020fb0a0e · 2019-07-04T17:48:08.000+02:00
This reverts commit a7c7d21. The reason is that said commit had not been reviewed by OvmfPkg maintainers/reviewers, before it was pushed. Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Imran Desai <imran.desai@intel.com> Cc: Jordan Justen <jordan.l.justen@intel.com> Cc: Leif Lindholm <leif.lindholm@linaro.org> Cc: Marc-André Lureau <marcandre.lureau@redhat.com> Cc: Stefan Berger <stefanb@linux.ibm.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1781 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
@@ -625,7 +625,6 @@
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !if $(TPM2_CONFIG_ENABLE) == TRUE
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
@@ -907,6 +906,5 @@
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !endif
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -637,7 +637,6 @@
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !if $(TPM2_CONFIG_ENABLE) == TRUE
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
@@ -921,6 +920,5 @@
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !endif
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
@@ -636,7 +636,6 @@
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !if $(TPM2_CONFIG_ENABLE) == TRUE
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
@@ -919,6 +918,5 @@
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !endif

Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,6 @@`
`625`	`625`	`NULL\|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf`
`626`	`626`	`NULL\|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf`
`627`	`627`	`NULL\|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf`
`628`		`- NULL\|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf`
`629`	`628`	`}`
`630`	`629`	`!if $(TPM2_CONFIG_ENABLE) == TRUE`
`631`	`630`	`SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf`
`@@ -907,6 +906,5 @@`
`907`	`906`	`NULL\|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf`
`908`	`907`	`NULL\|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf`
`909`	`908`	`NULL\|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf`
`910`		`- NULL\|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf`
`911`	`909`	`}`
`912`	`910`	`!endif`
Original file line number	Diff line number	Diff line change
`@@ -637,7 +637,6 @@`
`637`	`637`	`NULL\|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf`
`638`	`638`	`NULL\|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf`
`639`	`639`	`NULL\|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf`
`640`		`- NULL\|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf`
`641`	`640`	`}`
`642`	`641`	`!if $(TPM2_CONFIG_ENABLE) == TRUE`
`643`	`642`	`SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf`
`@@ -921,6 +920,5 @@`
`921`	`920`	`NULL\|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf`
`922`	`921`	`NULL\|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf`
`923`	`922`	`NULL\|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf`
`924`		`- NULL\|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf`
`925`	`923`	`}`
`926`	`924`	`!endif`
Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,6 @@`
`636`	`636`	`NULL\|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf`
`637`	`637`	`NULL\|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf`
`638`	`638`	`NULL\|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf`
`639`		`- NULL\|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf`
`640`	`639`	`}`
`641`	`640`	`!if $(TPM2_CONFIG_ENABLE) == TRUE`
`642`	`641`	`SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf`
`@@ -919,6 +918,5 @@`
`919`	`918`	`NULL\|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf`
`920`	`919`	`NULL\|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf`
`921`	`920`	`NULL\|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf`
`922`		`- NULL\|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf`
`923`	`921`	`}`
`924`	`922`	`!endif`