]> git.proxmox.com Git - mirror_edk2.git/commitdiff
SecurityPkg: set SM3 bit in TPM 2.0 hash mask by default
authorImran Desai <imran.desai@intel.com>
Wed, 29 May 2019 04:40:48 +0000 (04:40 +0000)
committerJian J Wang <jian.j.wang@intel.com>
Wed, 3 Jul 2019 08:31:55 +0000 (16:31 +0800)
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1781

EDK2 Support for SM3 digest algorithm is needed to enable TPM with SM3 PCR
banks. This digest algorithm is part of the China Crypto algorithm suite.
This integration has dependency on the openssl_1_1_1b integration into
edk2.
This patch sets SM3 bit in TPM2.0 hash mask by default.

Signed-off-by: Imran Desai <imran.desai@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian Wang <jian.j.wang@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: jiewen.yao@intel.com
SecurityPkg/SecurityPkg.dec

index b9c04a3d13d12549d79c9488e6e58a9e2cf22a0c..d2f6a6fd1293e2a3ee76d47788489f6c4c4f3a20 100644 (file)
   #    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 - 0x0000000F\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000000F|UINT32|0x00010010\r
+  # @ValidRange 0x80000001 | 0x00000000 - 0x0000001F\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000001F|UINT32|0x00010010\r
 \r
   ## This PCD indicated final BIOS supported Hash mask.\r
   #    Bios may choose to register a subset of PcdTpm2HashMask.\r