From 2dd7ea9b7a34fd02c10b67bccebfb3c04b7ab3bf Mon Sep 17 00:00:00 2001
From: root <root@lamia.panaceas.james.local>
Date: Wed, 15 Mar 2017 13:50:51 +0000
Subject: patch up C99isms and a missing define

---
 tboot/include/tb_policy.h | 15 ++++++++++-----
 tboot/include/tpm.h       |  9 ++++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'tboot/include')

diff --git a/tboot/include/tb_policy.h b/tboot/include/tb_policy.h
index 118a735..3632262 100644
--- a/tboot/include/tb_policy.h
+++ b/tboot/include/tb_policy.h
@@ -174,11 +174,12 @@ static inline size_t calc_policy_entry_size(const tb_policy_entry_t *pol_entry,
 static inline size_t calc_policy_size(const tb_policy_t *policy)
 {
     size_t size = sizeof(*policy);
+    int i;
 
     /* tb_policy_t has empty array, which isn't counted in size */
     /* so add size of each policy */
     const tb_policy_entry_t *pol_entry = policy->entries;
-    for ( int i = 0; i < policy->num_entries; i++ ) {
+    for ( i = 0; i < policy->num_entries; i++ ) {
         size_t entry_size = calc_policy_entry_size(pol_entry,
                                                    policy->hash_alg);
         pol_entry = (void *)pol_entry + entry_size;
@@ -210,6 +211,7 @@ static inline tb_hash_t *get_policy_entry_hash(
 static inline tb_policy_entry_t* get_policy_entry(const tb_policy_t *policy,
                                                   int i)
 {
+    int j;
     /* assumes policy has already been validated */
 
     if ( policy == NULL ) {
@@ -223,7 +225,7 @@ static inline tb_policy_entry_t* get_policy_entry(const tb_policy_t *policy,
     }
 
     tb_policy_entry_t *pol_entry = (tb_policy_entry_t *)policy->entries;
-    for ( int j = 0; j < i; j++ ) {
+    for ( j = 0; j < i; j++ ) {
         pol_entry = (void *)pol_entry +
             calc_policy_entry_size(pol_entry, policy->hash_alg);
     }
@@ -234,6 +236,7 @@ static inline tb_policy_entry_t* get_policy_entry(const tb_policy_t *policy,
 static inline tb_policy_entry_t* find_policy_entry(const tb_policy_t *policy,
                                                    uint8_t mod_num)
 {
+    int i;
     /* assumes policy has already been validated */
 
     if ( policy == NULL ) {
@@ -241,7 +244,7 @@ static inline tb_policy_entry_t* find_policy_entry(const tb_policy_t *policy,
         return NULL;
     }
 
-    for ( int i = 0; i < policy->num_entries; i++ ) {
+    for ( i = 0; i < policy->num_entries; i++ ) {
         tb_policy_entry_t *pol_entry = get_policy_entry(policy, i);
         if ( pol_entry == NULL )
             return NULL;
@@ -259,6 +262,8 @@ static inline tb_policy_entry_t* find_policy_entry(const tb_policy_t *policy,
  */
 static inline bool verify_policy(const tb_policy_t *policy, size_t size, bool print)
 {
+    int i, j;
+
     if ( print ) PRINT(TBOOT_DETA"policy:\n");
 
     if ( policy == NULL ) {
@@ -293,7 +298,7 @@ static inline bool verify_policy(const tb_policy_t *policy, size_t size, bool pr
     if ( print ) PRINT(TBOOT_DETA"\t num_entries: %u\n", policy->num_entries);
 
     const tb_policy_entry_t *pol_entry = policy->entries;
-    for ( int i = 0; i < policy->num_entries; i++ ) {
+    for ( i = 0; i < policy->num_entries; i++ ) {
         /* check header of policy entry */
         if ( ((void *)pol_entry - (void *)policy + sizeof(*pol_entry)) >
              size ) {
@@ -358,7 +363,7 @@ static inline bool verify_policy(const tb_policy_t *policy, size_t size, bool pr
             return false;
         }
 
-        for ( int j = 0; j < pol_entry->num_hashes; j++ ) {
+        for ( j = 0; j < pol_entry->num_hashes; j++ ) {
             if ( print ) {
                 PRINT(TBOOT_DETA"\t\t hashes[%d]: ", j);
                 print_hash(get_policy_entry_hash(pol_entry,
diff --git a/tboot/include/tpm.h b/tboot/include/tpm.h
index 59ebde1..07631c8 100644
--- a/tboot/include/tpm.h
+++ b/tboot/include/tpm.h
@@ -381,12 +381,14 @@ typedef union {
 
 static inline void _read_tpm_reg(int locality, u32 reg, u8 *_raw, size_t size)
 {
-    for ( size_t i = 0; i < size; i++ )   _raw[i] = readb((TPM_LOCALITY_BASE_N(locality) | reg) + i);
+    size_t i;
+    for ( i = 0; i < size; i++ )   _raw[i] = readb((TPM_LOCALITY_BASE_N(locality) | reg) + i);
 }
 
 static inline void _write_tpm_reg(int locality, u32 reg, u8 *_raw, size_t size)
 {
-    for ( size_t i = 0; i < size; i++ )  writeb((TPM_LOCALITY_BASE_N(locality) | reg) + i, _raw[i]);
+    size_t i;
+    for ( i = 0; i < size; i++ )  writeb((TPM_LOCALITY_BASE_N(locality) | reg) + i, _raw[i]);
 }
 
 
@@ -398,7 +400,8 @@ static inline void _write_tpm_reg(int locality, u32 reg, u8 *_raw, size_t size)
 
 static inline void _reverse_copy(uint8_t *out, uint8_t *in, uint32_t count)
 {
-    for ( uint32_t i = 0; i < count; i++ )
+    uint32_t i;
+    for ( i = 0; i < count; i++ )
         out[i] = in[count - i - 1];
 }
 
-- 
cgit v1.2.3