aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2015-11-22 16:43:47 -0500
committerKevin O'Connor <kevin@koconnor.net>2015-11-23 22:36:29 -0500
commit8149f1bf5cfd181c38fe8dc47bb64c8d6630dde6 (patch)
tree36b12fc6231c8a6b27559962b0d825771a848912
parent5afdced3c42b2d54dbe88a9446fe14dc129f85bc (diff)
downloadseabios-hppa-8149f1bf5cfd181c38fe8dc47bb64c8d6630dde6.zip
seabios-hppa-8149f1bf5cfd181c38fe8dc47bb64c8d6630dde6.tar.gz
seabios-hppa-8149f1bf5cfd181c38fe8dc47bb64c8d6630dde6.tar.bz2
tpm: There is no need to pass pcrindex to hash_log_extend_event()
The pcrindex is already in pcpes->pcrindex, so no need to pass it as a parameter. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r--src/tcgbios.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/tcgbios.c b/src/tcgbios.c
index 0fbab73..dd83c67 100644
--- a/src/tcgbios.c
+++ b/src/tcgbios.c
@@ -540,8 +540,7 @@ hash_log_event(const void *hashdata, u32 hashdata_length,
static u32
hash_log_extend_event(const void *hashdata, u32 hashdata_length,
struct pcpes *pcpes,
- const void *event, u32 event_length,
- u32 pcrindex)
+ const void *event, u32 event_length)
{
u32 rc;
@@ -550,7 +549,7 @@ hash_log_extend_event(const void *hashdata, u32 hashdata_length,
if (rc)
return rc;
- return tpm_extend(pcpes->digest, pcrindex);
+ return tpm_extend(pcpes->digest, pcpes->pcrindex);
}
/*
@@ -575,7 +574,7 @@ tpm_add_measurement_to_log(u32 pcrindex, u32 event_type,
.eventtype = event_type,
};
return hash_log_extend_event(hashdata, hashdata_length, &pcpes,
- event, event_length, pcrindex);
+ event, event_length);
}
@@ -994,8 +993,7 @@ hash_log_extend_event_int(const struct hleei_short *hleei_s,
rc = hash_log_extend_event(hleei_s->hashdataptr, hleei_s->hashdatalen,
pcpes,
- pcpes->event, pcpes->eventdatasize,
- pcrindex);
+ pcpes->event, pcpes->eventdatasize);
if (rc)
goto err_exit;
@@ -1167,8 +1165,7 @@ compact_hash_log_extend_event_int(u8 *buffer,
rc = hash_log_extend_event(buffer, length,
&pcpes,
- &info, pcpes.eventdatasize,
- pcpes.pcrindex);
+ &info, pcpes.eventdatasize);
if (rc == 0)
*edx_ptr = tpm_state.entry_count;