All of lore.kernel.org
 help / color / mirror / Atom feed
From: AKASHI Takahiro <takahiro.akashi@linaro.org>
To: u-boot@lists.denx.de
Subject: [PATCH v6 09/16] cmd: env: use appropriate guid for authenticated UEFI variable
Date: Wed, 26 Feb 2020 13:54:41 +0900	[thread overview]
Message-ID: <20200226045448.2453-10-takahiro.akashi@linaro.org> (raw)
In-Reply-To: <20200226045448.2453-1-takahiro.akashi@linaro.org>

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>
---
 cmd/nvedit_efi.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c
index 8ea0da01283f..579cf430593c 100644
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -41,6 +41,11 @@ static const struct {
 } efi_guid_text[] = {
 	/* signature database */
 	{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" */
@@ -525,9 +530,9 @@ int do_env_set_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 			if (*ep != ',')
 				return CMD_RET_USAGE;
 
+			/* 0 should be allowed for delete */
 			size = simple_strtoul(++ep, NULL, 16);
-			if (!size)
-				return CMD_RET_FAILURE;
+
 			value_on_memory = true;
 		} else if (!strcmp(argv[0], "-v")) {
 			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;
 
 	var_name = argv[0];
-	if (default_guid)
-		guid = efi_global_variable_guid;
+	if (default_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) {
 		printf("GUID: %s\n", efi_guid_to_str((const efi_guid_t *)
-- 
2.24.0

  parent reply	other threads:[~2020-02-26  4:54 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-26  4:54 [PATCH v6 00/16] efi_loader: add secure boot support AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 01/16] efi_loader: add CONFIG_EFI_SECURE_BOOT config option AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 02/16] efi_loader: add signature verification functions AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 03/16] efi_loader: add signature database parser AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 04/16] efi_loader: variable: support variable authentication AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 05/16] efi_loader: variable: add secure boot state transition AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 06/16] efi_loader: variable: add VendorKeys variable AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 07/16] efi_loader: image_loader: support image authentication AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 08/16] efi_loader: set up secure boot AKASHI Takahiro
2020-02-26  4:54 ` AKASHI Takahiro [this message]
2020-02-26  4:54 ` [PATCH v6 10/16] cmd: env: add "-at" option to "env set -e" command AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 11/16] cmd: efidebug: add "test bootmgr" sub-command AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 12/16] efi_loader, pytest: set up secure boot environment AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 13/16] efi_loader, pytest: add UEFI secure boot tests (authenticated variables) AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 14/16] efi_loader, pytest: add UEFI secure boot tests (image) AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 15/16] sandbox: add extra configurations for UEFI and related tests AKASHI Takahiro
2020-02-26  4:54 ` [PATCH v6 16/16] travis: add packages for UEFI secure boot test AKASHI Takahiro
2020-02-26 14:28   ` Tom Rini
2020-02-27  5:17     ` AKASHI Takahiro

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=20200226045448.2453-10-takahiro.akashi@linaro.org \
    --to=takahiro.akashi@linaro.org \
    --cc=u-boot@lists.denx.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.