Revert "SecurityPkg: set SM3 bit in TPM 2.0 hash mask by default"

This reverts commit d5af8fc5a975feb6c745587d0d834733ad2048fd.

The reason is that said commit indirectly depends on commit 49c1e683c452
("MdePkg/Protocol/Hash: introduce GUID for SM3", 2019-07-03), and the
latter commit is going to be reverted, due to its review process not
having followed established edk2 norms.

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Imran Desai <imran.desai@intel.com>
Cc: Jian Wang <jian.j.wang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
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/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index d2f6a6fd1293e2a3ee76d47788489f6c4c4f3a20..b9c04a3d13d12549d79c9488e6e58a9e2cf22a0c 100644 (file)
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -453,10 +453,9 @@
   #    BIT1  -  SHA256.<BR>\r
   #    BIT2  -  SHA384.<BR>\r
   #    BIT3  -  SHA512.<BR>\r
-  #    BIT4  -  SM3_256.<BR>\r
   # @Prompt Hash mask for TPM 2.0\r
-  # @ValidRange 0x80000001 | 0x00000000 - 0x0000001F\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000001F|UINT32|0x00010010\r
+  # @ValidRange 0x80000001 | 0x00000000 - 0x0000000F\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000000F|UINT32|0x00010010\r
 \r
   ## This PCD indicated final BIOS supported Hash mask.\r
   #    Bios may choose to register a subset of PcdTpm2HashMask.\r