dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-09 01:20:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

pcrlock: shorten displayed hash bytes

Browse Source 
Shorten number of bytes show of sha256 hashes. Similar to git, makes
output less wide and more readable.

Co-authored-by: Akarithos <277667353+Akarithos@users.noreply.github.com>
This commit is contained in:
Ludwig Nussel
2024-02-15 17:08:35 +01:00
committed by Akarithos
parent be9c38a77d
commit 18fed0d0d4
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
man/systemd-pcrlock.xml
View File

@@ -443,6 +443,14 @@
<para>The following options are understood:</para>
<variablelist>
<varlistentry>
<term><option>--full</option></term>
<listitem><para>Show full hash value instead of abbreviating to 7 characters.</para>
<xi:include href="version-info.xml" xpointer="v262"/></listitem>
</varlistentry>
<varlistentry>
<term><option>--raw-description</option></term>

16
src/pcrlock/pcrlock.c
View File

@@ -94,6 +94,8 @@ static BootEntryTokenType arg_entry_token_type = BOOT_ENTRY_TOKEN_AUTO;
static char *arg_entry_token = NULL;
static bool arg_varlink = false;
static bool arg_quiet = false;
/* abbreviate to 7 chars, just like git */
static size_t arg_abbreviate_hash = 7;
STATIC_DESTRUCTOR_REGISTER(arg_components, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_pcrlock_path, freep);
@@ -2274,6 +2276,9 @@ static int show_log_table(EventLog *el, sd_json_variant **ret_variant) {
if (!hex)
return log_oom();
if (!sd_json_format_enabled(arg_json_format_flags))
strshorten(hex, arg_abbreviate_hash);
r = table_add_cell(table, NULL, TABLE_STRING, hex);
} else
r = table_add_cell(table, NULL, TABLE_EMPTY, NULL);
@@ -2422,6 +2427,9 @@ static int show_pcr_table(EventLog *el, sd_json_variant **ret_variant) {
if (!hex)
return log_oom();
if (!sd_json_format_enabled(arg_json_format_flags))
strshorten(hex, arg_abbreviate_hash);
r = table_add_many(table,
TABLE_STRING, hex,
TABLE_SET_COLOR, color);
@@ -2441,6 +2449,9 @@ static int show_pcr_table(EventLog *el, sd_json_variant **ret_variant) {
if (!hex)
return log_oom();
if (!sd_json_format_enabled(arg_json_format_flags))
strshorten(hex, arg_abbreviate_hash);
color = !hash_match ? ansi_highlight_red() :
is_unset_pcr(el->registers[pcr].banks[i].observed.buffer, el->registers[pcr].banks[i].observed.size) ? ansi_grey() : NULL;
@@ -5334,6 +5345,11 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
return r;
break;
OPTION_LONG("full", NULL,
"Print full hash in measurement log"):
arg_abbreviate_hash = SIZE_MAX;
break;
OPTION_LONG("raw-description", NULL,
"Show raw firmware record data as description in table"):
arg_raw_description = true;