forked from pool/grub2
14793c1f96
- Add tpm, tpm2, luks2 and gcry_sha512 to default grub.efi (bsc#1197625) - Make grub-tpm.efi a symlink to grub.efi * grub2.spec - Log error when tpm event log is full and continue * 0001-tpm-Log-EFI_VOLUME_FULL-and-continue.patch - Patch superseded * 0001-tpm-Pass-unknown-error-as-non-fatal-but-debug-print-.patch - Add patches for automatic TPM disk unlock (jsc#SLE-24018) (bsc#1196668) * 0001-luks2-Add-debug-message-to-align-with-luks-and-geli-.patch * 0002-cryptodisk-Refactor-to-discard-have_it-global.patch * 0003-cryptodisk-Return-failure-in-cryptomount-when-no-cry.patch * 0004-cryptodisk-Improve-error-messaging-in-cryptomount-in.patch * 0005-cryptodisk-Improve-cryptomount-u-error-message.patch * 0006-cryptodisk-Add-infrastructure-to-pass-data-from-cryp.patch * 0007-cryptodisk-Refactor-password-input-out-of-crypto-dev.patch * 0008-cryptodisk-Move-global-variables-into-grub_cryptomou.patch * 0009-cryptodisk-Improve-handling-of-partition-name-in-cry.patch * 0010-protectors-Add-key-protectors-framework.patch * 0011-tpm2-Add-TPM-Software-Stack-TSS.patch * 0012-protectors-Add-TPM2-Key-Protector.patch * 0013-cryptodisk-Support-key-protectors.patch * 0014-util-grub-protect-Add-new-tool.patch - Fix no disk unlocking happen (bsc#1196668) * 0001-crytodisk-fix-cryptodisk-module-looking-up.patch - Fix build error * fix-tpm2-build.patch OBS-URL: https://build.opensuse.org/request/show/992180 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=417
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
---
|
|
grub-core/Makefile.core.def | 1 +
|
|
grub-core/tpm2/module.c | 2 +-
|
|
util/grub-protect.c | 2 +-
|
|
3 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/grub-core/Makefile.core.def
|
|
+++ b/grub-core/Makefile.core.def
|
|
@@ -2569,6 +2569,7 @@
|
|
common = tpm2/mu.c;
|
|
common = tpm2/tpm2.c;
|
|
efi = tpm2/tcg2.c;
|
|
+ enable = efi;
|
|
};
|
|
|
|
module = {
|
|
--- a/util/grub-protect.c
|
|
+++ b/util/grub-protect.c
|
|
@@ -542,7 +542,7 @@
|
|
if (pcr_values.digests[i].size != pcr_digest_len)
|
|
{
|
|
fprintf (stderr,
|
|
- _("Bad PCR value size: expected %lu bytes but got %u bytes.\n"),
|
|
+ _("Bad PCR value size: expected %" PRIuGRUB_SIZE " bytes but got %u bytes.\n"),
|
|
pcr_digest_len, pcr_values.digests[i].size);
|
|
goto exit2;
|
|
}
|
|
--- a/grub-core/tpm2/module.c
|
|
+++ b/grub-core/tpm2/module.c
|
|
@@ -195,7 +195,7 @@
|
|
if (sealed_key_size > buf.cap)
|
|
{
|
|
grub_dprintf ("tpm2", "Sealed key file is larger than decode buffer "
|
|
- "(%lu vs %lu bytes).\n", sealed_key_size, buf.cap);
|
|
+ "(%" PRIuGRUB_SIZE " vs %" PRIuGRUB_SIZE " bytes).\n", sealed_key_size, buf.cap);
|
|
return GRUB_ERR_BAD_ARGUMENT;
|
|
}
|
|
|