From 0a0c5a2be363192a7cdf0501b4e157c67741f410 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 20 Aug 2019 15:05:29 +0100
Subject: [PATCH] Update to 4.0 RC0

---
 sources                                   |  2 +-
 tpm2-tools-limit-selected-pcrs-to-8.patch | 32 -----------------------
 tpm2-tools.spec                           | 16 +++++++-----
 3 files changed, 11 insertions(+), 39 deletions(-)
 delete mode 100644 tpm2-tools-limit-selected-pcrs-to-8.patch

diff --git a/sources b/sources
index 57117aa..d4070b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tpm2-tools-3.2.0.tar.gz) = ab8081ee3ac2d7f445522141395198b1c570b9649a42e4b27b11b0e04495f4c935ee3ec73b228a953934f9dbdf3dccd4640eb62c4e0bae6dd11b91260e67c227
+SHA512 (tpm2-tools-4.0-rc0.tar.gz) = 07f395ab569c3bd0bc258b10a9b75ed105035cf57b2120751316a2e8fda605100aa8e561fe2c7ad93d100bdf122d992d8a01b7935830673ee90f964892ce1aa7
diff --git a/tpm2-tools-limit-selected-pcrs-to-8.patch b/tpm2-tools-limit-selected-pcrs-to-8.patch
deleted file mode 100644
index 8412285..0000000
--- a/tpm2-tools-limit-selected-pcrs-to-8.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4050d845fdd3819708329a8b4f52eb2de485fbf4 Mon Sep 17 00:00:00 2001
-From: William Roberts <william.c.roberts@intel.com>
-Date: Tue, 30 Jan 2018 10:12:14 -0800
-Subject: [PATCH] Limit selected PCRs to 8
-
-When a PCR selection has more than 8 selections, the pcrSelections
-array was being indexed past its end.
-
-Fixes: #778
-
-Signed-off-by: William Roberts <william.c.roberts@intel.com>
----
- lib/tpm2_policy.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/lib/tpm2_policy.c b/lib/tpm2_policy.c
-index b1fc8182c..aff0a1724 100644
---- a/lib/tpm2_policy.c
-+++ b/lib/tpm2_policy.c
-@@ -58,6 +58,11 @@ static bool evaluate_populate_pcr_digests(TPML_PCR_SELECTION *pcr_selections,
-             total_indices_for_this_alg += tpm2_util_pop_count(group_val);
-         }
- 
-+        if(pcr_values->count + total_indices_for_this_alg > ARRAY_LEN(pcr_values->digests)) {
-+            LOG_ERR("Number of PCR is limited to %zu", ARRAY_LEN(pcr_values->digests));
-+            return false;
-+        }
-+
-         //digest size returned per the hashAlg type
-         unsigned dgst_size = tpm2_alg_util_get_hash_size(pcr_selections->pcrSelections[i].hash);
-         if (!dgst_size) {
-
diff --git a/tpm2-tools.spec b/tpm2-tools.spec
index f7d3eeb..1bbb8c2 100644
--- a/tpm2-tools.spec
+++ b/tpm2-tools.spec
@@ -1,13 +1,13 @@
+%global candidate rc0
+
 Name: tpm2-tools
-Version: 3.2.0
-Release: 3%{?dist}
+Version: 4.0
+Release: 0.1%{?candidate:.%{candidate}}%{?dist}
 Summary: A TPM2.0 testing tool build upon TPM2.0-TSS
 
 License: BSD
 URL:     https://github.com/tpm2-software/tpm2-tools
-Source0: https://github.com/tpm2-software/tpm2-tools/releases/download/%{version}/%{name}-%{version}.tar.gz
-# https://github.com/tpm2-software/tpm2-tools/issues/1632
-Patch0:  tpm2-tools-limit-selected-pcrs-to-8.patch
+Source0: https://github.com/tpm2-software/tpm2-tools/releases/download/%{version}/%{name}-%{version}%{?candidate:-%{candidate}}.tar.gz
 
 BuildRequires: gcc-c++
 BuildRequires: libtool
@@ -31,7 +31,7 @@ Obsoletes: tpm2-tools <= 2.1.1-2
 tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss.
 
 %prep
-%autosetup -p1 -n %{name}-%{version}
+%autosetup -p1 -n %{name}-%{version}%{?candidate:-%{candidate}}
 
 %build
 %configure --prefix=/usr --disable-static --disable-silent-rules
@@ -44,9 +44,13 @@ tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss.
 %doc README.md CHANGELOG.md
 %license LICENSE
 %{_bindir}/tpm2_*
+%{_datadir}/bash-completion/completions/tpm2*
 %{_mandir}/man1/tpm2_*.1.gz
 
 %changelog
+* Tue Aug 20 2019 Peter Robinson <pbrobinson@fedoraproject.org> 4.0-0.1-rc0
+- Update to 4.0 RC0
+
 * Thu Aug  1 2019 Peter Robinson <pbrobinson@fedoraproject.org> 3.2.0-3
 - Fix for crash for max PCRs available