diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2019-07-04 11:11:24 +0200 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2019-07-04 17:50:44 +0200 |
| commit | 0d823bfd8d89bd515b3db6cf0adfcddec218439d (patch) | |
| tree | c2f5646bd6d3e95d889ce10e7bddca5b97e0c818 /SecurityPkg | |
| parent | ddc020fb0a0ed98dbf271b543d58077fc37e069b (diff) | |
| download | edk2-0d823bfd8d89bd515b3db6cf0adfcddec218439d.tar.gz edk2-0d823bfd8d89bd515b3db6cf0adfcddec218439d.tar.bz2 edk2-0d823bfd8d89bd515b3db6cf0adfcddec218439d.zip | |
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>
Diffstat (limited to 'SecurityPkg')
| -rw-r--r-- | SecurityPkg/SecurityPkg.dec | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec index d2f6a6fd12..b9c04a3d13 100644 --- a/SecurityPkg/SecurityPkg.dec +++ b/SecurityPkg/SecurityPkg.dec @@ -453,10 +453,9 @@ # BIT1 - SHA256.<BR>
# BIT2 - SHA384.<BR>
# BIT3 - SHA512.<BR>
- # BIT4 - SM3_256.<BR>
# @Prompt Hash mask for TPM 2.0
- # @ValidRange 0x80000001 | 0x00000000 - 0x0000001F
- gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000001F|UINT32|0x00010010
+ # @ValidRange 0x80000001 | 0x00000000 - 0x0000000F
+ gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000000F|UINT32|0x00010010
## This PCD indicated final BIOS supported Hash mask.
# Bios may choose to register a subset of PcdTpm2HashMask.
|