From 03d713cc8743d52f15da7bdeea25b7e6917cb6d9373cd7ddbaa53627dd651d69 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 15 Feb 2023 12:29:57 +0000 Subject: [PATCH] Accepting request 1065868 from home:gary_lin:branches:Base:System - Refresh 0003-tpm2-resend-the-command-on-TPM_RC_RETRY.patch to handle the TPM2 responseCode correctly. OBS-URL: https://build.opensuse.org/request/show/1065868 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=440 --- 0003-tpm2-resend-the-command-on-TPM_RC_RETRY.patch | 6 +++--- grub2.changes | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/0003-tpm2-resend-the-command-on-TPM_RC_RETRY.patch b/0003-tpm2-resend-the-command-on-TPM_RC_RETRY.patch index a2f5f91..98657ce 100644 --- a/0003-tpm2-resend-the-command-on-TPM_RC_RETRY.patch +++ b/0003-tpm2-resend-the-command-on-TPM_RC_RETRY.patch @@ -1,4 +1,4 @@ -From 14a8c03f1a3b09250ea933f1a072dfdfef8c4a48 Mon Sep 17 00:00:00 2001 +From dcfb996d872a750fc42cb627627a5ac3f6d89a23 Mon Sep 17 00:00:00 2001 From: Gary Lin Date: Thu, 9 Feb 2023 14:56:05 +0800 Subject: [PATCH 03/13] tpm2: resend the command on TPM_RC_RETRY @@ -13,7 +13,7 @@ Signed-off-by: Gary Lin 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/grub-core/tpm2/tpm2.c b/grub-core/tpm2/tpm2.c -index 5377ad2c7..1176d968b 100644 +index 5377ad2c7..083d59d02 100644 --- a/grub-core/tpm2/tpm2.c +++ b/grub-core/tpm2/tpm2.c @@ -25,11 +25,11 @@ @@ -51,7 +51,7 @@ index 5377ad2c7..1176d968b 100644 + do { + err = grub_tpm2_submit_command_real (tag, commandCode, responseCode, + in, out); -+ if (err != TPM_RC_RETRY) ++ if (*responseCode != TPM_RC_RETRY) + break; + + retry_cnt++; diff --git a/grub2.changes b/grub2.changes index a859c7a..e9e657e 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 15 07:09:39 UTC 2023 - Gary Ching-Pang Lin + +- Refresh 0003-tpm2-resend-the-command-on-TPM_RC_RETRY.patch to + handle the TPM2 responseCode correctly. + ------------------------------------------------------------------- Fri Feb 10 14:54:35 UTC 2023 - Valentin Lefebvre