From f8b7f0c396f56244e84ae0aa31781cd80113820f Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 12 Nov 2023 20:43:55 +0000
Subject: [PATCH] 5.6

---
 sources                      |  2 +-
 tpm2-tools-fix-fortify.patch | 57 ------------------------------------
 tpm2-tools.spec              | 12 ++++----
 3 files changed, 6 insertions(+), 65 deletions(-)
 delete mode 100644 tpm2-tools-fix-fortify.patch

diff --git a/sources b/sources
index dddda88..8ffca2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tpm2-tools-5.5.tar.gz) = 24f72a3e9840d531d900e96771a863baae1c71a76fcad0fda8020dff06acd8e3b65b86401ace21f034766403caf9ae97ce710ff6013bb7ed25657a6ecf325470
+SHA512 (tpm2-tools-5.6.tar.gz) = 14216f29ed3ecca5fbe356ed3744c8b6b25a62ff11b2aed596d11101328c8bfd29a02f6ca5a218f9a4477a5e9648c50f0ae96e71de0b4ff5ea1f98ebeeb73cd7
diff --git a/tpm2-tools-fix-fortify.patch b/tpm2-tools-fix-fortify.patch
deleted file mode 100644
index db12408..0000000
--- a/tpm2-tools-fix-fortify.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 43b24bb6d1bbc65e80bd1de1d679922ba70ce5c0 Mon Sep 17 00:00:00 2001
-From: Juergen Repp <juergen_repp@web.de>
-Date: Mon, 6 Mar 2023 12:16:05 +0100
-Subject: [PATCH] kdfa.c Fix problem with FORTIFY_SOURCE on Fedora
-
-The original kdfa implementation did produce an error caused by the flags
--flto -_FORTIFY_SOURCE=2 on Fedora rawhide.
-This error can be avoided by switching off the optimization with pragma.
-Fixes: #3210.
-
-Signed-off-by: Juergen Repp <juergen_repp@web.de>
----
- lib/tpm2_kdfa.c | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/lib/tpm2_kdfa.c b/lib/tpm2_kdfa.c
-index 5eb8d558c..9db0467e4 100644
---- a/lib/tpm2_kdfa.c
-+++ b/lib/tpm2_kdfa.c
-@@ -1,7 +1,6 @@
- /* SPDX-License-Identifier: BSD-3-Clause */
- 
- #include <string.h>
--
- #include <openssl/evp.h>
- #if OPENSSL_VERSION_NUMBER < 0x30000000L
- #include <openssl/hmac.h>
-@@ -13,6 +12,15 @@
- #include "tpm2_kdfa.h"
- #include "tpm2_openssl.h"
- 
-+/*
-+ * Disable optimazation because of an error in FORTIFY_SOURCE
-+ */
-+ 
-+#ifdef _FORTIFY_SOURCE
-+#pragma GCC push_options
-+#pragma GCC optimize ("O0")
-+#endif
-+
- TSS2_RC tpm2_kdfa(TPMI_ALG_HASH hash_alg, TPM2B *key, char *label,
-         TPM2B *context_u, TPM2B *context_v, UINT16 bits,
-         TPM2B_MAX_BUFFER *result_key) {
-@@ -139,3 +147,13 @@ TSS2_RC tpm2_kdfa(TPMI_ALG_HASH hash_alg, TPM2B *key, char *label,
- 
-     return rval;
- }
-+#ifdef _FORTIFY_SOURCE
-+
-+#endif
-+
-+#ifdef _FORTIFY_SOURCE
-+#pragma GCC pop_options
-+#endif
-+
-+
-+
diff --git a/tpm2-tools.spec b/tpm2-tools.spec
index 029178f..9b03a85 100644
--- a/tpm2-tools.spec
+++ b/tpm2-tools.spec
@@ -1,19 +1,14 @@
 #global candidate rc1
 
 Name:    tpm2-tools
-Version: 5.5
-Release: 5%{?candidate:.%{candidate}}%{?dist}
+Version: 5.6
+Release: 1%{?candidate:.%{candidate}}%{?dist}
 Summary: A bunch of TPM testing toolS build upon tpm2-tss
 
 License: BSD-3-Clause
 URL:     https://github.com/tpm2-software/tpm2-tools
 Source0: https://github.com/tpm2-software/tpm2-tools/releases/download/%{version}%{?candidate:-%{candidate}}/%{name}-%{version}%{?candidate:-%{candidate}}.tar.gz
 
-# Disable optimization to avoid LTO + FORTIFY_SOURCE=3 issue:
-# https://bugzilla.redhat.com/show_bug.cgi?id=2171376
-# https://github.com/tpm2-software/tpm2-tools/issues/3210
-Patch0: tpm2-tools-fix-fortify.patch
-
 BuildRequires: make
 BuildRequires: gcc-c++
 BuildRequires: libtool
@@ -60,6 +55,9 @@ tpm2-tools is a batch of tools for tpm2.0. It is based on tpm2-tss.
 %{_mandir}/man1/tss2_*.1.gz
 
 %changelog
+* Sun Nov 12 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 5.6-1
+- Update to 5.6
+
 * Tue Sep 26 2023 Štěpán Horáček <shoracek@redhat.com> - 5.5-5
 - Migrate license to SPDX