forked from pool/grub2
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
|
Index: grub-2.06/grub-core/tpm2/module.c
|
||
|
|
===================================================================
|
||
|
|
--- grub-2.06.orig/grub-core/tpm2/module.c
|
||
|
|
+++ grub-2.06/grub-core/tpm2/module.c
|
||
|
|
@@ -22,6 +22,7 @@
|
||
|
|
#include <grub/misc.h>
|
||
|
|
#include <grub/mm.h>
|
||
|
|
#include <grub/protector.h>
|
||
|
|
+#include <grub/time.h>
|
||
|
|
#include <grub/tpm2/buffer.h>
|
||
|
|
#include <grub/tpm2/internal/args.h>
|
||
|
|
#include <grub/tpm2/mu.h>
|
||
|
|
@@ -449,6 +450,7 @@ grub_tpm2_protector_srk_recover (const s
|
||
|
|
{
|
||
|
|
grub_error (err, N_("Failed to unseal sealed key (TPM2_Unseal failed "
|
||
|
|
"with TSS/TPM error %u)"), rc);
|
||
|
|
+ grub_millisleep(500);
|
||
|
|
goto exit4;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -461,6 +463,8 @@ grub_tpm2_protector_srk_recover (const s
|
||
|
|
goto exit4;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ grub_printf("TPM2: unsealed %u bytes of key material\n", data.size);
|
||
|
|
+
|
||
|
|
if (ctx->efivar)
|
||
|
|
{
|
||
|
|
rc = grub_tpm2_protector_publish_key (data.buffer, data.size, ctx->efivar);
|
||
|
|
Index: grub-2.06/grub-core/loader/linux.c
|
||
|
|
===================================================================
|
||
|
|
--- grub-2.06.orig/grub-core/loader/linux.c
|
||
|
|
+++ grub-2.06/grub-core/loader/linux.c
|
||
|
|
@@ -171,6 +171,7 @@ grub_initrd_component (const char *buf,
|
||
|
|
struct grub_linux_initrd_component *comp = initrd_ctx->components + initrd_ctx->nfiles;
|
||
|
|
grub_size_t dir_size, name_len;
|
||
|
|
|
||
|
|
+ grub_printf("Creating initrd component \"%s\" with %u bytes\n", newc_name, bufsz);
|
||
|
|
while (*newc_name == '/')
|
||
|
|
newc_name++;
|
||
|
|
|