public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Laszlo Ersek" <lersek@redhat.com>
To: edk2-devel-groups-io <devel@edk2.groups.io>
Cc: Chao Zhang <chao.b.zhang@intel.com>,
	Imran Desai <imran.desai@intel.com>,
	Jian Wang <jian.j.wang@intel.com>,
	Jiewen Yao <jiewen.yao@intel.com>,
	Leif Lindholm <leif.lindholm@linaro.org>
Subject: [PATCH 2/5] Revert "SecurityPkg: set SM3 bit in TPM 2.0 hash mask by default"
Date: Thu,  4 Jul 2019 11:46:21 +0200	[thread overview]
Message-ID: <20190704094624.21057-3-lersek@redhat.com> (raw)
In-Reply-To: <20190704094624.21057-1-lersek@redhat.com>

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>
---
 SecurityPkg/SecurityPkg.dec | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index d2f6a6fd1293..b9c04a3d13d1 100644
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -453,10 +453,9 @@ [PcdsDynamic, PcdsDynamicEx]
   #    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.
-- 
2.19.1.3.g30247aa5d201



  parent reply	other threads:[~2019-07-04  9:46 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-04  9:46 [PATCH 0/5] MdePkg, SecurityPkg, OvmfPkg: revert unreviewed SM3 patches Laszlo Ersek
2019-07-04  9:46 ` [PATCH 1/5] Revert "OvmfPkg: link SM3 support into Tcg2Pei and Tcg2Dxe" Laszlo Ersek
2019-07-04  9:46 ` Laszlo Ersek [this message]
2019-07-04  9:46 ` [PATCH 3/5] Revert "SecurityPkg/HashLibBaseCryptoRouter: recognize the SM3 digest algorithm" Laszlo Ersek
2019-07-04  9:46 ` [PATCH 4/5] Revert "SecurityPkg: introduce " Laszlo Ersek
2019-07-04  9:46 ` [PATCH 5/5] Revert "MdePkg/Protocol/Hash: introduce GUID for SM3" Laszlo Ersek
2019-07-04  9:59 ` [edk2-devel] [PATCH 0/5] MdePkg, SecurityPkg, OvmfPkg: revert unreviewed SM3 patches Leif Lindholm
2019-07-04 10:58 ` Philippe Mathieu-Daudé
2019-07-04 16:05 ` Laszlo Ersek
2019-07-04 18:13   ` Philippe Mathieu-Daudé
2019-07-05  3:08   ` Wang, Jian J

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190704094624.21057-3-lersek@redhat.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox