diff options
| author | Imran Desai <imran.desai@intel.com> | 2019-07-18 15:53:25 -0700 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2019-07-19 14:31:59 +0200 |
| commit | c027f68030e762869d7a81e45ced3f087c8c76d7 (patch) | |
| tree | c79ccb0af4e83868efcc7d9d30e8492af5e9bc7c /SecurityPkg | |
| parent | 7c1126d394ffd8b8b5796cd436497940be368109 (diff) | |
| download | edk2-c027f68030e762869d7a81e45ced3f087c8c76d7.tar.gz edk2-c027f68030e762869d7a81e45ced3f087c8c76d7.tar.bz2 edk2-c027f68030e762869d7a81e45ced3f087c8c76d7.zip | |
SecurityPkg: set SM3 bit in TPM 2.0 hash mask by default
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1781
GITHUB: https://github.com/idesai/edk2/tree/enable_sm3_measured_boot_v6
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.
Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian Wang <jian.j.wang@intel.com>
Signed-off-by: Imran Desai <imran.desai@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Message-Id: <20190718225326.40839-4-imran.desai@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Diffstat (limited to 'SecurityPkg')
| -rw-r--r-- | SecurityPkg/SecurityPkg.dec | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec index b9c04a3d13..d2f6a6fd12 100644 --- a/SecurityPkg/SecurityPkg.dec +++ b/SecurityPkg/SecurityPkg.dec @@ -453,9 +453,10 @@ # BIT1 - SHA256.<BR>
# BIT2 - SHA384.<BR>
# BIT3 - SHA512.<BR>
+ # BIT4 - SM3_256.<BR>
# @Prompt Hash mask for TPM 2.0
- # @ValidRange 0x80000001 | 0x00000000 - 0x0000000F
- gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000000F|UINT32|0x00010010
+ # @ValidRange 0x80000001 | 0x00000000 - 0x0000001F
+ gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000001F|UINT32|0x00010010
## This PCD indicated final BIOS supported Hash mask.
# Bios may choose to register a subset of PcdTpm2HashMask.
|