dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-26 21:11:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmd: env: use appropriate guid for authenticated UEFI variable

Browse Source 
A signature database variable is associated with a specific guid.
For convenience, if user doesn't supply any guid info, "env set|print -e"
should complement it.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
This commit is contained in:
AKASHI Takahiro
2020-04-14 11:51:46 +09:00
committed by Heinrich Schuchardt
parent d0f07949cc
commit f757d04598
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/nvedit_efi.c
View File

@@ -41,6 +41,11 @@ static const struct {
} efi_guid_text[] = { } efi_guid_text[] = {
/* signature database */ /* signature database */
{EFI_GLOBAL_VARIABLE_GUID, "EFI_GLOBAL_VARIABLE_GUID"}, {EFI_GLOBAL_VARIABLE_GUID, "EFI_GLOBAL_VARIABLE_GUID"},
{EFI_IMAGE_SECURITY_DATABASE_GUID, "EFI_IMAGE_SECURITY_DATABASE_GUID"},
/* certificate type */
{EFI_CERT_SHA256_GUID, "EFI_CERT_SHA256_GUID"},
{EFI_CERT_X509_GUID, "EFI_CERT_X509_GUID"},
{EFI_CERT_TYPE_PKCS7_GUID, "EFI_CERT_TYPE_PKCS7_GUID"},
}; };
/* "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" */ /* "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" */
@@ -525,9 +530,9 @@ int do_env_set_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (*ep != ',') if (*ep != ',')
return CMD_RET_USAGE; return CMD_RET_USAGE;
/* 0 should be allowed for delete */
size = simple_strtoul(++ep, NULL, 16); size = simple_strtoul(++ep, NULL, 16);
if (!size)
return CMD_RET_FAILURE;
value_on_memory = true; value_on_memory = true;
} else if (!strcmp(argv[0], "-v")) { } else if (!strcmp(argv[0], "-v")) {
verbose = true; verbose = true;
@@ -539,8 +544,13 @@ int do_env_set_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return CMD_RET_USAGE; return CMD_RET_USAGE;
var_name = argv[0]; var_name = argv[0];
if (default_guid) if (default_guid) {
guid = efi_global_variable_guid; if (!strcmp(var_name, "db") || !strcmp(var_name, "dbx") ||
!strcmp(var_name, "dbt"))
guid = efi_guid_image_security_database;
else
guid = efi_global_variable_guid;
}
if (verbose) { if (verbose) {
printf("GUID: %s\n", efi_guid_to_str((const efi_guid_t *) printf("GUID: %s\n", efi_guid_to_str((const efi_guid_t *)