diff --git a/backport-fix-typo.patch b/backport-fix-typo.patch new file mode 100644 index 0000000000000000000000000000000000000000..1efff602968fd286d5251af1715fdc5a63cb5be5 --- /dev/null +++ b/backport-fix-typo.patch @@ -0,0 +1,24 @@ +From 9296ba5d08b11beac85f59ac6a10e7ffec7f5db2 Mon Sep 17 00:00:00 2001 +From: lizhuo +Date: Fri, 18 Apr 2025 19:08:57 +0800 +Subject: [PATCH] fix-typo + +--- + lib/tpm2_eventlog.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/tpm2_eventlog.c b/lib/tpm2_eventlog.c +index 1b59eee..fed9c92 100644 +--- a/lib/tpm2_eventlog.c ++++ b/lib/tpm2_eventlog.c +@@ -404,7 +404,7 @@ size_t i; + break; + + default: +- LOG_WARN("Event %zu is unexectedly not extending either PCR 8, 9, 12 or 14", eventnum - 1); ++ LOG_WARN("Event %zu is unexpectedly not extending either PCR 8, 9, 12 or 14", eventnum - 1); + return false; + } + +-- +2.33.0 \ No newline at end of file diff --git a/tpm2-tools.spec b/tpm2-tools.spec index eba24150c37dcd1fc8410cfdc092fc8e8e037736..1aea44becee9881c4c02d43b77e88b5fc8bbc7c7 100644 --- a/tpm2-tools.spec +++ b/tpm2-tools.spec @@ -1,6 +1,6 @@ Name: tpm2-tools Version: 5.5 -Release: 3 +Release: 4 Summary: A TPM2.0 testing tool based on TPM2.0-TSS License: BSD URL: https://github.com/tpm2-software/tpm2-tools @@ -9,6 +9,7 @@ Source0: https://github.com/tpm2-software/tpm2-tools/releases/download/%{v Patch0: backport-CVE-2024-29038.patch Patch1: backport-CVE-2024-29039.patch Patch2: revert-sm2-sign-and-verifysignature.patch +Patch3: backport-fix-typo.patch BuildRequires: gcc-c++ libtool autoconf-archive pkgconfig(cmocka) pkgconfig(libcurl) pkgconfig(openssl) BuildRequires: pkgconfig(tss2-mu) pkgconfig(tss2-sys) pkgconfig(tss2-esys) pkgconfig(uuid) libgcrypt @@ -60,6 +61,9 @@ make check %{_mandir}/*/* %changelog +* Mon Apr 21 2025 lizhuo - 5.5-4 +- fix typo + * Fri Jun 21 2024 bianxiuning - 5.5-3 - revert sm2 sign and verifysignature