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
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From 7cc578baf26986c2badce998125b429a2aeb4d33 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Colp <patrick.colp@oracle.com>
|
|
Date: Sun, 30 Jul 2023 12:58:18 -0700
|
|
Subject: [PATCH 2/4] cryptodisk: Fallback to passphrase
|
|
|
|
If a protector is specified, but it fails to unlock the disk, fall back
|
|
to asking for the passphrase. However, an error was set indicating that
|
|
the protector(s) failed. Later code (e.g., LUKS code) fails as
|
|
`grub_errno` is now set. Print the existing errors out first, before
|
|
proceeding with the passphrase.
|
|
|
|
Signed-off-by: Patrick Colp <patrick.colp@oracle.com>
|
|
---
|
|
grub-core/disk/cryptodisk.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
|
|
index 6620fca00..cf37a0934 100644
|
|
--- a/grub-core/disk/cryptodisk.c
|
|
+++ b/grub-core/disk/cryptodisk.c
|
|
@@ -1191,11 +1191,16 @@ grub_cryptodisk_scan_device_real (const char *name,
|
|
source->name, source->partition != NULL ? "," : "",
|
|
part != NULL ? part : N_("UNKNOWN"), dev->uuid);
|
|
grub_free (part);
|
|
- goto error;
|
|
}
|
|
|
|
if (!cargs->key_len)
|
|
{
|
|
+ if (grub_errno)
|
|
+ {
|
|
+ grub_print_error ();
|
|
+ grub_errno = GRUB_ERR_NONE;
|
|
+ }
|
|
+
|
|
/* Get the passphrase from the user, if no key data. */
|
|
askpass = 1;
|
|
part = grub_partition_get_name (source->partition);
|
|
--
|
|
2.35.3
|
|
|