From: "Gerd Hoffmann" <kraxel@redhat.com>
To: devel@edk2.groups.io
Cc: "Gerd Hoffmann" <kraxel@redhat.com>,
"James Bottomley" <jejb@linux.ibm.com>,
"Min Xu" <min.m.xu@intel.com>,
"Jordan Justen" <jordan.l.justen@intel.com>,
"Erdem Aktas" <erdemaktas@google.com>,
"Stefan Berger" <stefanb@linux.ibm.com>,
"Ard Biesheuvel" <ardb+tianocore@kernel.org>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Jiewen Yao" <jiewen.yao@intel.com>,
"Tom Lendacky" <thomas.lendacky@amd.com>,
"Brijesh Singh" <brijesh.singh@amd.com>
Subject: [PATCH 4/4] OvmfPkg: add TPM2_SHA1_ENABLE build option
Date: Thu, 21 Oct 2021 14:20:03 +0200 [thread overview]
Message-ID: <20211021122003.2008499-5-kraxel@redhat.com> (raw)
In-Reply-To: <20211021122003.2008499-1-kraxel@redhat.com>
Allows to compile OVMF without HashInstanceLibSha1,
i.e. no SHA1 hash support in TPM/TCG modules.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
OvmfPkg/OvmfTpmComponentsDxe.dsc.inc | 2 ++
OvmfPkg/OvmfTpmComponentsPei.dsc.inc | 2 ++
OvmfPkg/OvmfTpmDefines.dsc.inc | 1 +
3 files changed, 5 insertions(+)
diff --git a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
index 6806eb245e2b..1952a848b17c 100644
--- a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+++ b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
@@ -8,7 +8,9 @@
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
+!if $(TPM2_SHA1_ENABLE) == TRUE
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
+!endif
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
diff --git a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc
index 94bc124f9b78..fbe905603312 100644
--- a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc
+++ b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc
@@ -13,7 +13,9 @@
SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {
<LibraryClasses>
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
+!if $(TPM2_SHA1_ENABLE) == TRUE
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
+!endif
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
diff --git a/OvmfPkg/OvmfTpmDefines.dsc.inc b/OvmfPkg/OvmfTpmDefines.dsc.inc
index de55cbdcf852..7db7ad7e7934 100644
--- a/OvmfPkg/OvmfTpmDefines.dsc.inc
+++ b/OvmfPkg/OvmfTpmDefines.dsc.inc
@@ -7,3 +7,4 @@
# has no effect unless TPM2_ENABLE == TRUE
DEFINE TPM1_ENABLE = TRUE
+ DEFINE TPM2_SHA1_ENABLE = TRUE
--
2.31.1
next prev parent reply other threads:[~2021-10-21 12:21 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 12:19 [PATCH 0/4] OvmfPkg: rework TPM configuration Gerd Hoffmann
2021-10-21 12:20 ` [PATCH 1/4] OvmfPkg: move tcg configuration to dsc and fdf include files Gerd Hoffmann
2021-10-21 14:12 ` [edk2-devel] " Stefan Berger
2021-10-21 12:20 ` [PATCH 2/4] OvmfPkg: create Tcg2ConfigPeiCompat12.inf Gerd Hoffmann
2021-10-21 14:46 ` [edk2-devel] " Stefan Berger
2021-10-22 6:31 ` Gerd Hoffmann
2021-10-22 13:29 ` Stefan Berger
2021-10-21 12:20 ` [PATCH 3/4] OvmfPkg: rework TPM configuration Gerd Hoffmann
2021-10-21 15:44 ` Stefan Berger
2021-10-22 6:30 ` Gerd Hoffmann
2021-10-21 12:20 ` Gerd Hoffmann [this message]
2021-10-21 13:24 ` [PATCH 4/4] OvmfPkg: add TPM2_SHA1_ENABLE build option Stefan Berger
2021-10-22 6:39 ` Gerd Hoffmann
2021-10-22 10:50 ` Stefan Berger
2021-10-22 11:37 ` Gerd Hoffmann
2021-10-22 11:49 ` James Bottomley
2021-10-22 11:57 ` Stefan Berger
2021-10-22 12:40 ` James Bottomley
2021-10-22 13:13 ` Stefan Berger
2021-10-22 14:17 ` James Bottomley
2021-10-22 14:52 ` [edk2-devel] " Stefan Berger
2021-10-22 15:01 ` James Bottomley
2021-10-22 15:48 ` Stefan Berger
2021-10-22 16:50 ` James Bottomley
2021-10-21 16:13 ` [PATCH 0/4] OvmfPkg: rework TPM configuration Stefan Berger
2021-10-22 7:01 ` Gerd Hoffmann
2021-10-22 10:46 ` [edk2-devel] " Stefan Berger
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=20211021122003.2008499-5-kraxel@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