From 383268517c43ba20e1f607452331b4f52cde8e42 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Thu, 29 Oct 2020 15:10:19 -0600
Subject: [PATCH]  Fix buglet exposed by gcc-11 -Warray-parameter  Temporarily
 disable -Wstringop-overflow due to false positive in gcc-11

---
 tboot-gcc11.patch | 27 +++++++++++++++++++++++++++
 tboot.spec        |  6 +++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/tboot-gcc11.patch b/tboot-gcc11.patch
index 10b0331..be993e5 100644
--- a/tboot-gcc11.patch
+++ b/tboot-gcc11.patch
@@ -53,3 +53,30 @@ index a62e570..504b874 100644
  }
  
  static bool tpm12_check(void)
+diff --git a/tboot/include/rijndael.h b/tboot/include/rijndael.h
+index 2974602..8dbcc7c 100644
+--- a/tboot/include/rijndael.h
++++ b/tboot/include/rijndael.h
+@@ -52,7 +52,7 @@ void	 rijndael_encrypt(rijndael_ctx *, const u_char *, u_char *);
+ 
+ int	rijndaelKeySetupEnc(unsigned int [], const unsigned char [], int);
+ int	rijndaelKeySetupDec(unsigned int [], const unsigned char [], int);
+-void	rijndaelEncrypt(const unsigned int [], int, const unsigned char [],
+-	    unsigned char []);
++void	rijndaelEncrypt(const unsigned int [], int, const unsigned char [16],
++	    unsigned char [16]);
+ 
+ #endif /* __RIJNDAEL_H */
+diff --git a/Config.mk b/Config.mk
+index 6d2fe14..8234edd 100644
+--- a/Config.mk
++++ b/Config.mk
+@@ -74,6 +74,8 @@ TARGET_ARCH  ?= $(shell uname -m | sed -e s/i.86/x86_32/ -e s/i86pc/x86_32/)
+ CFLAGS += $(CFLAGS_WARN) -fno-strict-aliasing -std=gnu99
+ # due to bug in gcc v4.2,3,?
+ CFLAGS += $(call cc-option,$(CC),-Wno-array-bounds,)
++# Due to a bug in gcc-11
++CFLAGS += $(call cc-option,$(CC),-Wno-stringop-overflow,)
+ 
+ 
+ ifeq ($(debug),y)
diff --git a/tboot.spec b/tboot.spec
index af4b2a0..7b19f8c 100644
--- a/tboot.spec
+++ b/tboot.spec
@@ -1,7 +1,7 @@
 Summary:        Performs a verified launch using Intel TXT
 Name:           tboot
 Version:        1.9.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 
 License:        BSD
@@ -66,6 +66,10 @@ make debug=y DISTDIR=$RPM_BUILD_ROOT install
 /boot/tboot-syms
 
 %changelog
+* Thu Oct 29 2020 Jeff Law <law@redhat.com> - 1:1.9.11-4
+- Fix buglet exposed by gcc-11 -Warray-parameter
+- Temporarily disable -Wstringop-overflow due to false positive in gcc-11
+
 * Wed Jul 29 2020 Jeff Law <law@redhat.com> - 1:1.9.11-3
 - Explicitly allow uninitialized variables in a few places that do it
 - on purpose