aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2020-10-27 10:21:21 +1100
committerCommit Bot <commit-bot@chromium.org>2020-10-27 22:52:02 +0000
commit0702d48f0b2e8d2a34255c1b1cbd6bf99a6cbf52 (patch)
treecc1a5821d0a092159a9c07f4d0289b0b39105a86
parent073dc25aa4dda42475a7a5a140399fc5db61b20f (diff)
downloadtpm2-upstream-master.tar.gz
tpm_manufacture: fix issue with mixed declarationsupstream-master
BUG=b:171728286 TEST=none Change-Id: I092b5eb07becc136f8330eb91ea3bf10cfd41aaa Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/tpm2/+/2500627 Tested-by: Mary Ruthven <mruthven@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Mary Ruthven <mruthven@chromium.org>
-rw-r--r--tpm_manufacture.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tpm_manufacture.c b/tpm_manufacture.c
index f9118f6..519076b 100644
--- a/tpm_manufacture.c
+++ b/tpm_manufacture.c
@@ -30,10 +30,11 @@ int tpm_manufactured(void) {
}
TPM_RC extend_pcr(unsigned int pcr_index, const char *mode_digest) {
+ PCR_Extend_In pcr_in;
+
if (pcr_index >= IMPLEMENTATION_PCR)
return TPM_RC_FAILURE;
- PCR_Extend_In pcr_in;
pcr_in.pcrHandle = HR_PCR + pcr_index;
pcr_in.digests.count = 1;
pcr_in.digests.digests[0].hashAlg = TPM_ALG_SHA256;