diff --git a/backport-CVE-2020-24455-FAPI-Fix-execution-of-policy-callback-for-reading-PC.patch b/backport-CVE-2020-24455-FAPI-Fix-execution-of-policy-callback-for-reading-PC.patch deleted file mode 100644 index 500333885dda602a7904f00f24dff69b8c8011e6..0000000000000000000000000000000000000000 --- a/backport-CVE-2020-24455-FAPI-Fix-execution-of-policy-callback-for-reading-PC.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ac935ca8bcb5227a599284799917c9c04c26e3ee Mon Sep 17 00:00:00 2001 -From: Juergen Repp -Date: Fri, 21 Aug 2020 17:55:16 +0200 -Subject: [PATCH] FAPI: Fix execution of policy callback for reading PCR - registers. - -For Policy PCR current PCR registers of the TPM registers can be used to compute -the policy digest. The counter in the computed PCR list was not set. Thus a empty -PCR list was used for the policy digest computation. - -Signed-off-by: Juergen Repp ---- - src/tss2-fapi/ifapi_policy_callbacks.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/tss2-fapi/ifapi_policy_callbacks.c b/src/tss2-fapi/ifapi_policy_callbacks.c -index c0600ae..887a2c3 100644 ---- a/src/tss2-fapi/ifapi_policy_callbacks.c -+++ b/src/tss2-fapi/ifapi_policy_callbacks.c -@@ -364,6 +364,7 @@ ifapi_read_pcr( - - /* Initialize digest list with pcr values from TPM */ - i_pcr = 0; -+ (*pcr_values)->count = pcr_digests->count; - for (i = 0; i < out_selection->count; i++) { - for (pcr = 0; pcr < TPM2_MAX_PCRS; pcr++) { - uint8_t byte_idx = pcr / 8; --- -1.8.3.1 - diff --git a/tpm2-tss-2.4.1.tar.gz b/tpm2-tss-2.4.1.tar.gz deleted file mode 100644 index f95b3ae7715e1fed64e004cd16776ffdc802f0bd..0000000000000000000000000000000000000000 Binary files a/tpm2-tss-2.4.1.tar.gz and /dev/null differ diff --git a/tpm2-tss-3.0.3.tar.gz b/tpm2-tss-3.0.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..107a104156b0ad4938a9bee4f3685638808e5b06 Binary files /dev/null and b/tpm2-tss-3.0.3.tar.gz differ diff --git a/tpm2-tss.spec b/tpm2-tss.spec index 15ab94f6a4b234646df3b046ac0674558e1acb2b..2187a7d500a481edc9cf8c2de08e4577ae3c5cda 100644 --- a/tpm2-tss.spec +++ b/tpm2-tss.spec @@ -1,13 +1,11 @@ Name: tpm2-tss -Version: 2.4.1 -Release: 3 +Version: 3.0.3 +Release: 1 Summary: TPM2.0 Software Stack License: BSD and TCGL URL: https://github.com/tpm2-software/tpm2-tss Source0: https://github.com/tpm2-software/tpm2-tss/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch0: backport-CVE-2020-24455-FAPI-Fix-execution-of-policy-callback-for-reading-PC.patch - BuildRequires: gcc-c++ autoconf-archive libtool pkgconfig systemd libgcrypt-devel openssl-devel doxygen json-c-devel libcurl-devel %description @@ -29,7 +27,8 @@ Obsoletes: %{name}-static %autosetup -n %{name}-%{version} -p1 %build -%configure --disable-static --disable-silent-rules --with-udevrulesdir=%{_udevrulesdir} --with-udevrulesprefix=80- +%configure --disable-static --disable-silent-rules --with-udevrulesdir=%{_udevrulesdir} --with-udevrulesprefix=80- \ + --with-runstatedir=%{_rundir} --with-tmpfilesdir=%{_tmpfilesdir} --with-sysusersdir=%{_sysusersdir} %make_build @@ -52,9 +51,9 @@ make check %defattr(-,root,root) %doc README.md CHANGELOG.md %license LICENSE -%{_sysconfdir}/sysusers.d/tpm2-tss.conf -%{_sysconfdir}/tmpfiles.d/tpm2-tss-fapi.conf %{_sysconfdir}/tpm2-tss/ +%{_sysusersdir}/tpm2-tss.conf +%{_tmpfilesdir}/tpm2-tss-fapi.conf %{_libdir}/*.so.* %{_libdir}/*.so %{_udevrulesdir}/80-tpm-udev.rules @@ -70,7 +69,14 @@ make check %{_mandir}/man*/* %changelog -* Fri Jan 15 2021 yangzhuangzhuang - - 2.4.1-3 +* Mon Jan 25 2021 panxiaohe - 3.0.3-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:update version to 3.0.3 + use proper rundir tmpfilesdir and sysusersdir, so proper directories are used + +* Fri Jan 15 2021 yangzhuangzhuang - 2.4.1-3 - Type:enhancement - ID:NA - SUG:NA