8ee92f5194
- Implement NV index mode for TPM 2.0 key protector
0001-protectors-Implement-NV-index.patch
- Fall back to passphrase mode when the key protector fails to
unlock the disk
0002-cryptodisk-Fallback-to-passphrase.patch
- Wipe out the cached key cleanly
0003-cryptodisk-wipe-out-the-cached-keys-from-protectors.patch
- Make diskfiler to look up cryptodisk devices first
0004-diskfilter-look-up-cryptodisk-devices-first.patch
- Version bump to 2.12~rc1
* Added:
- grub-2.12~rc1.tar.xz
* Removed:
- grub-2.06.tar.xz
* Patch dropped merged by new version:
- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-efi-chainloader-root.patch
- grub2-Fix-incorrect-netmask-on-ppc64.patch
- 0001-osdep-Introduce-include-grub-osdep-major.h-and-use-i.patch
- 0002-osdep-linux-hostdisk-Use-stat-instead-of-udevadm-for.patch
- 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
- grub2-s390x-10-keep-network-at-kexec.patch
- 0001-Fix-build-error-in-binutils-2.36.patch
- 0001-emu-fix-executable-stack-marking.patch
- 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
- 0001-30_uefi-firmware-fix-printf-format-with-null-byte.patch
- 0001-tpm-Pass-unknown-error-as-non-fatal-but-debug-print-.patch
- 0001-Filter-out-POSIX-locale-for-translation.patch
OBS-URL: https://build.opensuse.org/request/show/1105405
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=458
81 lines
2.5 KiB
Diff
81 lines
2.5 KiB
Diff
From c3efb4ecbe91b63c127b92122dad3fa53d4efc69 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Colp <patrick.colp@oracle.com>
|
|
Date: Mon, 31 Jul 2023 07:01:45 -0700
|
|
Subject: [PATCH 1/4] protectors: Implement NV index
|
|
|
|
Currently with the TPM2 protector, only SRK mode is supported and
|
|
NV index support is just a stub. Implement the NV index option.
|
|
|
|
Note: This only extends support on the unseal path. grub2_protect
|
|
has not been updated. tpm2-tools can be used to insert a key into
|
|
the NV index.
|
|
|
|
An example of inserting a key using tpm2-tools:
|
|
|
|
# Get random key.
|
|
tpm2_getrandom 32 > key.dat
|
|
|
|
# Create primary object.
|
|
tpm2_createprimary -C o -g sha256 -G rsa -c primary.ctx
|
|
|
|
# Create policy object. `pcrs.dat` contains the PCR values to seal against.
|
|
tpm2_startauthsession -S session.dat
|
|
tpm2_policypcr -S session.dat -l sha256:7,11 -f pcrs.dat -L policy.dat
|
|
tpm2_flushcontext session.dat
|
|
|
|
# Seal key into TPM.
|
|
cat key.dat | tpm2_create -C primary.ctx -u key.pub -r key.priv -L policy.dat -i-
|
|
tpm2_load -C primary.ctx -u key.pub -r key.priv -n sealing.name -c sealing.ctx
|
|
tpm2_evictcontrol -C o -c sealing.ctx 0x81000000
|
|
|
|
Then to unseal the key in grub, add this to grub.cfg:
|
|
|
|
tpm2_key_protector_init --mode=nv --nvindex=0x81000000 --pcrs=7,11
|
|
cryptomount -u <UUID> --protector tpm2
|
|
|
|
Signed-off-by: Patrick Colp <patrick.colp@oracle.com>
|
|
---
|
|
grub-core/tpm2/module.c | 25 ++++++++++++++++++++-----
|
|
1 file changed, 20 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/grub-core/tpm2/module.c b/grub-core/tpm2/module.c
|
|
index 5274296b7..d3a64187a 100644
|
|
--- a/grub-core/tpm2/module.c
|
|
+++ b/grub-core/tpm2/module.c
|
|
@@ -757,12 +757,27 @@ static grub_err_t
|
|
grub_tpm2_protector_nv_recover (const struct grub_tpm2_protector_context *ctx,
|
|
grub_uint8_t **key, grub_size_t *key_size)
|
|
{
|
|
- (void)ctx;
|
|
- (void)key;
|
|
- (void)key_size;
|
|
+ TPM_HANDLE sealed_handle = ctx->nv;
|
|
+ tpm2key_policy_t policy_seq = NULL;
|
|
+ grub_err_t err;
|
|
+
|
|
+ /* Create a basic policy sequence based on the given PCR selection */
|
|
+ err = grub_tpm2_protector_simple_policy_seq (ctx, &policy_seq);
|
|
+ if (err != GRUB_ERR_NONE)
|
|
+ goto exit;
|
|
+
|
|
+ err = grub_tpm2_protector_unseal (policy_seq, sealed_handle, key, key_size);
|
|
+
|
|
+ /* Pop error messages on success */
|
|
+ if (err == GRUB_ERR_NONE)
|
|
+ while (grub_error_pop ());
|
|
+
|
|
+exit:
|
|
+ TPM2_FlushContext (sealed_handle);
|
|
|
|
- return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
|
|
- N_("NV Index mode is not implemented yet"));
|
|
+ grub_tpm2key_free_policy_seq (policy_seq);
|
|
+
|
|
+ return err;
|
|
}
|
|
|
|
static grub_err_t
|
|
--
|
|
2.35.3
|
|
|