From: Masahisa Kojima <masahisa.kojima@linaro.org>
To: Heinrich Schuchardt <xypron.glpk@gmx.de>,
Alexander Graf <agraf@csgraf.de>,
Ilias Apalodimas <ilias.apalodimas@linaro.org>,
Simon Glass <sjg@chromium.org>,
Masahisa Kojima <masahisa.kojima@linaro.org>,
Dhananjay Phadke <dphadke@linux.microsoft.com>,
AKASHI Takahiro <takahiro.akashi@linaro.org>,
u-boot@lists.denx.de
Subject: [PATCH v4 4/5] efi_loader: refactor efi_append_scrtm_version()
Date: Fri, 13 Aug 2021 16:12:42 +0900 [thread overview]
Message-ID: <20210813071243.18885-5-masahisa.kojima@linaro.org> (raw)
In-Reply-To: <20210813071243.18885-1-masahisa.kojima@linaro.org>
Refactor efi_append_scrtm_version() to use common
function for adding eventlog and extending PCR.
Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
---
(no changes since v1)
lib/efi_loader/efi_tcg2.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c
index 8557fce1da..2d03809e85 100644
--- a/lib/efi_loader/efi_tcg2.c
+++ b/lib/efi_loader/efi_tcg2.c
@@ -1321,23 +1321,11 @@ out:
*/
static efi_status_t efi_append_scrtm_version(struct udevice *dev)
{
- struct tpml_digest_values digest_list;
u8 ver[] = U_BOOT_VERSION_STRING;
- const int pcr_index = 0;
efi_status_t ret;
- ret = tcg2_create_digest(ver, sizeof(ver), &digest_list);
- if (ret != EFI_SUCCESS)
- goto out;
+ ret = tcg2_measure_event(dev, 0, EV_S_CRTM_VERSION, sizeof(ver), ver);
- ret = tcg2_pcr_extend(dev, pcr_index, &digest_list);
- if (ret != EFI_SUCCESS)
- goto out;
-
- ret = tcg2_agile_log_append(pcr_index, EV_S_CRTM_VERSION, &digest_list,
- sizeof(ver), ver);
-
-out:
return ret;
}
--
2.17.1
next prev parent reply other threads:[~2021-08-13 7:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-13 7:12 [PATCH v4 0/5] add measurement support Masahisa Kojima
2021-08-13 7:12 ` [PATCH v4 1/5] efi_loader: add secure boot variable measurement Masahisa Kojima
2021-08-13 7:12 ` [PATCH v4 2/5] efi_loader: add " Masahisa Kojima
2021-08-13 7:12 ` [PATCH v4 3/5] efi_loader: add ExitBootServices() measurement Masahisa Kojima
2021-08-14 8:28 ` Heinrich Schuchardt
2021-08-14 9:06 ` Heinrich Schuchardt
2021-08-16 0:33 ` Masahisa Kojima
2021-08-13 7:12 ` Masahisa Kojima [this message]
2021-08-13 7:12 ` [PATCH v4 5/5] efi_loader: add comment for efi_tcg2.h Masahisa Kojima
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-all 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=20210813071243.18885-5-masahisa.kojima@linaro.org \
--to=masahisa.kojima@linaro.org \
--cc=agraf@csgraf.de \
--cc=dphadke@linux.microsoft.com \
--cc=ilias.apalodimas@linaro.org \
--cc=sjg@chromium.org \
--cc=takahiro.akashi@linaro.org \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.de \
/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;
as well as URLs for NNTP newsgroup(s).