From: "Pali Rohár" <pali@kernel.org>
To: "Simon Glass" <sjg@chromium.org>,
"Heinrich Schuchardt" <xypron.glpk@gmx.de>,
"Alexander Graf" <agraf@csgraf.de>,
"Huan Wang" <alison.wang@nxp.com>,
"Angelo Dureghello" <angelo@sysam.it>,
"Wolfgang Denk" <wd@denx.de>,
"Priyanka Jain" <priyanka.jain@nxp.com>,
"Christophe Leroy" <christophe.leroy@c-s.fr>,
"Bin Meng" <bmeng.cn@gmail.com>,
"Marek Behún" <marek.behun@nic.cz>,
"Tom Rini" <trini@konsulko.com>
Cc: u-boot@lists.denx.de
Subject: [PATCH 03/11] efi_loader: Use directly version_string variable
Date: Mon, 2 Aug 2021 15:18:30 +0200 [thread overview]
Message-ID: <20210802131838.21097-4-pali@kernel.org> (raw)
In-Reply-To: <20210802131838.21097-1-pali@kernel.org>
Macro U_BOOT_VERSION_STRING is already stored in variable version_string.
So use directly this variable instead of storing U_BOOT_VERSION_STRING into
temporary variable.
Signed-off-by: Pali Rohár <pali@kernel.org>
---
lib/efi_loader/efi_tcg2.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c
index 1319a8b37868..14353ae71c9b 100644
--- a/lib/efi_loader/efi_tcg2.c
+++ b/lib/efi_loader/efi_tcg2.c
@@ -1275,11 +1275,10 @@ free_pool:
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);
+ ret = tcg2_create_digest(version_string, strlen(version_string) + 1, &digest_list);
if (ret != EFI_SUCCESS)
goto out;
@@ -1288,7 +1287,7 @@ static efi_status_t efi_append_scrtm_version(struct udevice *dev)
goto out;
ret = tcg2_agile_log_append(pcr_index, EV_S_CRTM_VERSION, &digest_list,
- sizeof(ver), ver);
+ strlen(version_string) + 1, version_string);
out:
return ret;
--
2.20.1
next prev parent reply other threads:[~2021-08-02 13:20 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-02 13:18 [PATCH 00/11] Reduce usage of timestamp macros Pali Rohár
2021-08-02 13:18 ` [PATCH 01/11] Remove #include <timestamp.h> from files which do not need it Pali Rohár
2021-08-02 13:58 ` Tom Rini
2021-09-23 2:07 ` Tom Rini
2021-08-02 13:18 ` [PATCH 02/11] Remove #include <version.h> " Pali Rohár
2021-08-02 13:58 ` Tom Rini
2021-09-23 2:07 ` Tom Rini
2021-08-02 13:18 ` Pali Rohár [this message]
2021-08-02 20:04 ` [PATCH 03/11] efi_loader: Use directly version_string variable Heinrich Schuchardt
2021-08-03 7:37 ` Ilias Apalodimas
2021-09-23 2:07 ` Tom Rini
2021-08-02 13:18 ` [PATCH 04/11] version: Move version_string[] from version.h to version_string.h Pali Rohár
2021-08-02 13:58 ` Tom Rini
2021-09-23 2:08 ` Tom Rini
2021-08-02 13:18 ` [PATCH 05/11] m68k: mcf: Remove overloading version_string Pali Rohár
2021-09-23 2:08 ` Tom Rini
2021-08-02 13:18 ` [PATCH 06/11] version: Put version_string[] variable into section .text_version_string Pali Rohár
2021-08-02 13:58 ` Tom Rini
2021-09-16 17:30 ` [PATCH] xtensa: Put U-Boot version string at correct place by linker script Tom Rini
2021-09-16 19:38 ` Francesco Dolcini
2021-09-16 19:42 ` Tom Rini
2021-09-16 19:50 ` Francesco Dolcini
2021-09-16 20:13 ` Tom Rini
2021-09-16 20:23 ` Francesco Dolcini
2021-09-17 5:21 ` Max Filippov
2021-09-17 12:02 ` Tom Rini
2021-09-17 5:14 ` Max Filippov
2021-09-17 12:04 ` Tom Rini
2021-09-17 12:30 ` Max Filippov
2021-08-02 13:18 ` [PATCH 07/11] powerpc: mpc: " Pali Rohár
2021-08-08 11:20 ` [PATCH v2] " Pali Rohár
2021-08-08 11:36 ` Pali Rohár
2021-08-24 5:03 ` Christophe Leroy
2021-08-24 9:46 ` Wolfgang Denk
2021-08-24 5:28 ` Christophe Leroy
2021-08-24 11:28 ` Pali Rohár
2021-09-16 19:17 ` Tom Rini
2021-09-16 19:56 ` [PATCH 1/1] powerpc: Drop version_string placement optimization Tom Rini
2021-09-23 2:09 ` Tom Rini
2021-08-02 13:18 ` [PATCH 08/11] version: Do not make version_string[] variable as a weak Pali Rohár
2021-08-02 13:58 ` Tom Rini
2021-09-23 2:08 ` Tom Rini
2021-08-02 13:18 ` [PATCH 09/11] x86: quark: MRC: Remove U_BOOT_DATE and U_BOOT_TIME from debug log Pali Rohár
2021-08-02 19:21 ` Simon Glass
2021-08-02 23:25 ` Bin Meng
2021-09-23 2:08 ` Tom Rini
2021-08-02 13:18 ` [PATCH 10/11] version: Remove global macro U_BOOT_VERSION_STRING from version.h Pali Rohár
2021-08-02 13:59 ` Tom Rini
2021-09-23 2:08 ` Tom Rini
2021-08-02 13:18 ` [PATCH 11/11] Remove including timestamp.h in version.h Pali Rohár
2021-08-02 19:21 ` Simon Glass
2021-08-02 19:42 ` Pali Rohár
2021-08-02 21:31 ` Tom Rini
2021-08-04 5:59 ` Wolfgang Denk
2021-08-04 12:44 ` Tom Rini
2021-08-04 14:36 ` Simon Glass
2021-08-04 14:40 ` Tom Rini
2021-08-04 21:46 ` Pali Rohár
2021-08-04 21:43 ` Sean Anderson
2021-08-04 21:52 ` Pali Rohár
2021-08-04 22:09 ` Tom Rini
2021-08-04 22:14 ` Pali Rohár
2021-08-04 22:15 ` Tom Rini
2021-08-04 22:22 ` Pali Rohár
2021-09-23 2:08 ` Tom Rini
2021-08-17 11:02 ` [PATCH 00/11] Reduce usage of timestamp macros Pali Rohár
2021-08-17 13:40 ` Tom Rini
2021-09-01 20:59 ` Tom Rini
2021-09-01 21:05 ` Pali Rohár
2021-09-01 21:17 ` Tom Rini
2021-09-01 21:28 ` Pali Rohár
2021-09-01 21:33 ` Tom Rini
2021-09-01 21:44 ` Pali Rohár
2021-09-01 21:49 ` Pali Rohár
2021-09-10 20:56 ` Pali Rohár
2021-09-10 21:18 ` Tom Rini
2021-09-01 21:56 ` Tom Rini
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=20210802131838.21097-4-pali@kernel.org \
--to=pali@kernel.org \
--cc=agraf@csgraf.de \
--cc=alison.wang@nxp.com \
--cc=angelo@sysam.it \
--cc=bmeng.cn@gmail.com \
--cc=christophe.leroy@c-s.fr \
--cc=marek.behun@nic.cz \
--cc=priyanka.jain@nxp.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=wd@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