All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gary Lin via Grub-devel <grub-devel@gnu.org>
To: The development of GNU GRUB <grub-devel@gnu.org>
Cc: Gary Lin <glin@suse.com>, Daniel Kiper <daniel.kiper@oracle.com>,
	Hernan Gatta <hegatta@linux.microsoft.com>,
	Daniel Axtens <dja@axtens.net>,
	shkhisti@microsoft.com, jaskaran.khurana@microsoft.com,
	christopher.co@microsoft.com, daniel.mihai@microsoft.com,
	jaredz@redhat.com, development@efficientek.com,
	jejb@linux.ibm.com, mchang@suse.com, patrick.colp@oracle.com,
	Stefan Berger <stefanb@linux.ibm.com>,
	Vladimir Serbinenko <phcoder@gmail.com>
Subject: [PATCH v23 19/33] key_protector: Add key protectors framework
Date: Fri, 15 Nov 2024 15:34:47 +0800	[thread overview]
Message-ID: <20241115073506.2784-20-glin@suse.com> (raw)
In-Reply-To: <20241115073506.2784-1-glin@suse.com>

From: Hernan Gatta <hegatta@linux.microsoft.com>

A key protector encapsulates functionality to retrieve an unlocking key
for a fully-encrypted disk from a specific source. A key protector
module registers itself with the key protectors framework when it is
loaded and unregisters when unloaded. Additionally, a key protector may
accept parameters that describe how it should operate.

The key protectors framework, besides offering registration and
unregistration functions, also offers a one-stop routine for finding and
invoking a key protector by name. If a key protector with the specified
name exists and if an unlocking key is successfully retrieved by it, the
function returns to the caller the retrieved key and its length.

Cc: Vladimir Serbinenko <phcoder@gmail.com>
Signed-off-by: Hernan Gatta <hegatta@linux.microsoft.com>
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---
 grub-core/Makefile.am          |  1 +
 grub-core/Makefile.core.def    |  5 +++
 grub-core/disk/key_protector.c | 73 ++++++++++++++++++++++++++++++++++
 include/grub/key_protector.h   | 47 ++++++++++++++++++++++
 4 files changed, 126 insertions(+)
 create mode 100644 grub-core/disk/key_protector.c
 create mode 100644 include/grub/key_protector.h

diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 1eda467e0..e50db8106 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -90,6 +90,7 @@ endif
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/key_protector.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/stack_protector.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index a38955e18..37f131ae2 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1282,6 +1282,11 @@ module = {
   common = disk/raid6_recover.c;
 };
 
+module = {
+  name = key_protector;
+  common = disk/key_protector.c;
+};
+
 module = {
   name = scsi;
   common = disk/scsi.c;
diff --git a/grub-core/disk/key_protector.c b/grub-core/disk/key_protector.c
new file mode 100644
index 000000000..0d146c1c0
--- /dev/null
+++ b/grub-core/disk/key_protector.c
@@ -0,0 +1,73 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2022 Microsoft Corporation
+ *  Copyright (C) 2024 Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/dl.h>
+#include <grub/list.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/key_protector.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+struct grub_key_protector *grub_key_protectors = NULL;
+
+grub_err_t
+grub_key_protector_register (struct grub_key_protector *protector)
+{
+  if (protector == NULL || protector->name == NULL || protector->name[0] == '\0')
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Invalid key protector for registration");
+
+  if (grub_key_protectors != NULL &&
+      grub_named_list_find (GRUB_AS_NAMED_LIST (grub_key_protectors), protector->name) != NULL)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Key protector '%s' already registered", protector->name);
+
+  grub_list_push (GRUB_AS_LIST_P (&grub_key_protectors), GRUB_AS_LIST (protector));
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_key_protector_unregister (struct grub_key_protector *protector)
+{
+  if (protector == NULL)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Invalid key protector for unregistration");
+
+  grub_list_remove (GRUB_AS_LIST (protector));
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_key_protector_recover_key (const char *protector, grub_uint8_t **key,
+				grub_size_t *key_size)
+{
+  struct grub_key_protector *kp = NULL;
+
+  if (grub_key_protectors == NULL)
+    return grub_error (GRUB_ERR_OUT_OF_RANGE, "No key protector registered");
+
+  if (protector == NULL || protector[0] == '\0')
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Invalid key protector");
+
+  kp = grub_named_list_find (GRUB_AS_NAMED_LIST (grub_key_protectors), protector);
+  if (kp == NULL)
+    return grub_error (GRUB_ERR_OUT_OF_RANGE, "Key protector '%s' not found", protector);
+
+  return kp->recover_key (key, key_size);
+}
diff --git a/include/grub/key_protector.h b/include/grub/key_protector.h
new file mode 100644
index 000000000..00b15c13d
--- /dev/null
+++ b/include/grub/key_protector.h
@@ -0,0 +1,47 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2022 Microsoft Corporation
+ *  Copyright (C) 2024 Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_PROTECTOR_HEADER
+#define GRUB_PROTECTOR_HEADER 1
+
+#include <grub/err.h>
+#include <grub/types.h>
+
+struct grub_key_protector
+{
+  struct grub_key_protector *next;
+  struct grub_key_protector **prev;
+
+  const char *name;
+
+  grub_err_t (*recover_key) (grub_uint8_t **key, grub_size_t *key_size);
+};
+
+grub_err_t
+grub_key_protector_register (struct grub_key_protector *protector);
+
+grub_err_t
+grub_key_protector_unregister (struct grub_key_protector *protector);
+
+grub_err_t
+grub_key_protector_recover_key (const char *protector,
+				grub_uint8_t **key,
+				grub_size_t *key_size);
+
+#endif /* ! GRUB_PROTECTOR_HEADER */
-- 
2.43.0


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

  parent reply	other threads:[~2024-11-15  7:38 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-15  7:34 [PATCH v23 00/33] Automatic Disk Unlock with TPM2 Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 01/33] posix_wrap: tweaks in preparation for libtasn1 Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 02/33] libtasn1: import libtasn1-4.19.0 Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 03/33] libtasn1: disable code not needed in grub Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 04/33] libtasn1: replace strcat() with strcpy() in _asn1_str_cat() Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 05/33] libtasn1: replace strcat() with _asn1_str_cat() Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 06/33] libtasn1: adjust the header paths in libtasn1.h Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 07/33] libtasn1: Use grub_divmod64() for division Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 08/33] libtasn1: fix the potential buffer overrun Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 09/33] asn1_test: include asn1_test.h only Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 10/33] asn1_test: rename the main functions to the test names Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 11/33] asn1_test: return either 0 or 1 to reflect the results Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 12/33] asn1_test: remove 'verbose' and the unnecessary printf() Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 13/33] asn1_test: print the error messages with grub_printf() Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 14/33] asn1_test: use the grub-specific functions and types Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 15/33] asn1_test: enable the testcase only when GRUB_LONG_MAX is larger than GRUB_INT_MAX Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 16/33] libtasn1: compile into asn1 module Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 17/33] asn1_test: test module for libtasn1 Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 18/33] libtasn1: Add the documentation Gary Lin via Grub-devel
2024-11-15  7:34 ` Gary Lin via Grub-devel [this message]
2024-11-15  7:34 ` [PATCH v23 20/33] tss2: Add TPM2 buffer handling functions Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 21/33] tss2: Add TPM2 types and Marshal/Unmarshal functions Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 22/33] tss2: Add TPM2 Software Stack (TSS2) support Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 23/33] key_protector: Add TPM2 Key Protector Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 24/33] cryptodisk: Support key protectors Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 25/33] util/grub-protect: Add new tool Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 26/33] tpm2_key_protector: Support authorized policy Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 27/33] tpm2_key_protector: Implement NV index Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 28/33] cryptodisk: Fallback to passphrase Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 29/33] cryptodisk: wipe out the cached keys from protectors Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 30/33] diskfilter: look up cryptodisk devices first Gary Lin via Grub-devel
2024-11-15  7:34 ` [PATCH v23 31/33] tpm2_key_protector: Add grub-emu support Gary Lin via Grub-devel
2024-11-15  7:35 ` [PATCH v23 32/33] tests: Add tpm2_key_protector_test Gary Lin via Grub-devel
2024-11-15  7:35 ` [PATCH v23 33/33] docs: Document TPM2 key protector Gary Lin via Grub-devel
2024-11-19 15:15 ` [PATCH v23 00/33] Automatic Disk Unlock with TPM2 Stefan Berger
2024-11-25 17:21   ` Daniel Kiper via Grub-devel

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=20241115073506.2784-20-glin@suse.com \
    --to=grub-devel@gnu.org \
    --cc=christopher.co@microsoft.com \
    --cc=daniel.kiper@oracle.com \
    --cc=daniel.mihai@microsoft.com \
    --cc=development@efficientek.com \
    --cc=dja@axtens.net \
    --cc=glin@suse.com \
    --cc=hegatta@linux.microsoft.com \
    --cc=jaredz@redhat.com \
    --cc=jaskaran.khurana@microsoft.com \
    --cc=jejb@linux.ibm.com \
    --cc=mchang@suse.com \
    --cc=patrick.colp@oracle.com \
    --cc=phcoder@gmail.com \
    --cc=shkhisti@microsoft.com \
    --cc=stefanb@linux.ibm.com \
    /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.