Skip to content

efisecdb: Fix default hash and help output #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vathpela wants to merge 2 commits into
base: main
Choose a base branch
from
+15 −2
Open

efisecdb: Fix default hash and help output #299

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6851ad8
efisecdb: fix the "default" hash
vathpela Mar 26, 2026
af1f034
efisecdb: hide SHA-1 support
vathpela Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/efisecdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,33 @@ struct hash_param {
efi_secdb_type_t algorithm;
ssize_t size;
bool def;
bool hidden;
};

static struct hash_param hash_params[] = {
{.name = "sha512",
.algorithm = EFI_SECDB_TYPE_SHA512,
.size = 64,
.def = false,
.hidden = false,
},
{.name = "sha384",
.algorithm = EFI_SECDB_TYPE_SHA384,
.size = 48,
.def = false,
.hidden = false,
},
{.name = "sha256",
.algorithm = EFI_SECDB_TYPE_SHA256,
.size = 32,
.def = true,
.hidden = false,
},
{.name = "sha1",
.algorithm = EFI_SECDB_TYPE_SHA1,
.size = 20,
.def = false,
.hidden = true,
},
};
static int n_hash_params = sizeof(hash_params) / sizeof(hash_params[0]);
Expand All @@ -68,7 +73,8 @@ set_hash_parameters(char *name, int *hash_number)
if (strcmp(name, "help")) {
out = stderr;
for (int i = 0; i < n_hash_params; i++) {
if (!strcmp(name, hash_params[i].name)) {
if (!strcmp(name, hash_params[i].name) ||
(!strcmp(name, "default") && hash_params[i].def == true)) {
*hash_number = i;
return;
}
Expand All @@ -80,9 +86,11 @@ set_hash_parameters(char *name, int *hash_number)

fprintf(out, "Supported hashes:");
for (int i = 0; i < n_hash_params; i++) {
fprintf(out, " %s", hash_params[i].name);
if (hash_params[i].def)
def = i;
if (hash_params[i].hidden)
continue;
fprintf(out, " %s", hash_params[i].name);
}
fprintf(out, "\n");
if (def >= 0)
Expand Down Expand Up @@ -360,6 +368,11 @@ main(int argc, char *argv[])
atexit(free_infiles);
atexit(maybe_free_secdb);

/*
* Set the "default" hash
*/
set_hash_parameters("default", &hash_index);

/*
* parse the command line.
*
Expand Down
Loading