From 4c0b7f425024923f37c7e571fa563f602e8bf369 Mon Sep 17 00:00:00 2001
From: anonymix007 <48598263+anonymix007@users.noreply.github.com>
Date: Tue, 22 Oct 2024 14:40:57 +0300
Subject: [PATCH] measure: Introduce .dtbauto support
---
man/systemd-measure.xml | 5 +++--
src/boot/measure.c | 6 ++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/man/systemd-measure.xml b/man/systemd-measure.xml
index a21b2dcecc..69b9db59bb 100644
--- a/man/systemd-measure.xml
+++ b/man/systemd-measure.xml
@@ -77,7 +77,7 @@
, , ,
, , ,
, , ,
- , , see below. Only is mandatory. (Alternatively,
+ , , , see below. Only is mandatory. (Alternatively,
specify to use the current values of PCR register 11 instead.)
@@ -125,6 +125,7 @@
+
When used with the calculate or sign verb,
@@ -135,7 +136,7 @@
- With the exception of and , which have been added in version
+ With the exception of , and , which have been added in version
257.
diff --git a/src/boot/measure.c b/src/boot/measure.c
index eece58f43f..9e6295b9da 100644
--- a/src/boot/measure.c
+++ b/src/boot/measure.c
@@ -148,8 +148,9 @@ static int parse_argv(int argc, char *argv[]) {
_ARG_PCRSIG, /* the .pcrsig section is not input for signing, hence not actually an argument here */
ARG_PCRPKEY,
ARG_PROFILE,
+ ARG_HWIDS,
_ARG_SECTION_LAST,
- ARG_HWIDS = _ARG_SECTION_LAST,
+ ARG_DTBAUTO = _ARG_SECTION_LAST,
ARG_BANK,
ARG_PRIVATE_KEY,
ARG_PRIVATE_KEY_SOURCE,
@@ -172,6 +173,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "ucode", required_argument, NULL, ARG_UCODE },
{ "splash", required_argument, NULL, ARG_SPLASH },
{ "dtb", required_argument, NULL, ARG_DTB },
+ { "dtbauto", required_argument, NULL, ARG_DTBAUTO },
{ "uname", required_argument, NULL, ARG_UNAME },
{ "sbat", required_argument, NULL, ARG_SBAT },
{ "pcrpkey", required_argument, NULL, ARG_PCRPKEY },
@@ -196,7 +198,7 @@ static int parse_argv(int argc, char *argv[]) {
assert(argv);
/* Make sure the arguments list and the section list, stays in sync */
- // assert_cc(_ARG_SECTION_FIRST + _UNIFIED_SECTION_MAX == _ARG_SECTION_LAST + 1);
+ assert_cc(_ARG_SECTION_FIRST + _UNIFIED_SECTION_MAX == _ARG_SECTION_LAST + 1);
while ((c = getopt_long(argc, argv, "hjc", options, NULL)) >= 0)
switch (c) {