File 0001-pcr_tss-Fix-compilation-for-old-compilers.... of Package ima-evm-utils

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-pcr_tss-Fix-compilation-for-old-compilers.patch of Package ima-evm-utils (Revision 41569749d8d90c8b3ef8bd881a0b0f50)

Currently displaying revision 41569749d8d90c8b3ef8bd881a0b0f50 , Show latest

From 8e98b5bbf2127131f968a5d864f86e8443505639 Mon Sep 17 00:00:00 2001
From: Petr Vorel <pvorel@suse.cz>
Date: Wed, 22 Jul 2020 12:06:28 +0200
Subject: [PATCH ima-evm-utils v2] pcr_tss: Fix compilation for old compilers
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>

pcr_tss.c: In function 'pcr_selections_match':
pcr_tss.c:73:2: error: 'for' loop initial declarations are only allowed in C99 mode
  for (int i = 0; i < a->count; i++) {
  ^
pcr_tss.c:73:2: note: use option -std=c99 or -std=gnu99 to compile your code
pcr_tss.c:78:3: error: 'for' loop initial declarations are only allowed in C99 mode
   for (int j = 0; j < a->pcrSelections[i].sizeofSelect; j++) {
   ^

Fixes: 03f99ea ("ima-evm-utils: Add support for Intel TSS2 for PCR
reading")

Signed-off-by: Petr Vorel <pvorel@suse.cz>
[ upstream status: https://lore.kernel.org/linux-integrity/20200722105202.32507-1-pvorel@suse.cz/T/#u ]
---
 src/pcr_tss.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pcr_tss.c b/src/pcr_tss.c
index 11b247b..feb1ff7 100644
--- a/src/pcr_tss.c
+++ b/src/pcr_tss.c
@@ -68,14 +68,17 @@ int tpm2_pcr_supported(void)
 
 static int pcr_selections_match(TPML_PCR_SELECTION *a, TPML_PCR_SELECTION *b)
 {
+	int i, j;
+
 	if (a->count != b->count)
 		return 0;
-	for (int i = 0; i < a->count; i++) {
+
+	for (i = 0; i < a->count; i++) {
 		if (a->pcrSelections[i].hash != b->pcrSelections[i].hash)
 			return 0;
 		if (a->pcrSelections[i].sizeofSelect != b->pcrSelections[i].sizeofSelect)
 			return 0;
-		for (int j = 0; j < a->pcrSelections[i].sizeofSelect; j++) {
+		for (j = 0; j < a->pcrSelections[i].sizeofSelect; j++) {
 			if (a->pcrSelections[i].pcrSelect[j] != b->pcrSelections[i].pcrSelect[j])
 				return 0;
 		}
-- 
2.27.0

Places

File 0001-pcr_tss-Fix-compilation-for-old-compilers.patch of Package ima-evm-utils (Revision 41569749d8d90c8b3ef8bd881a0b0f50)

Places