summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Pronin <apronin@google.com>2016-07-25 15:15:04 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-07-26 17:31:57 -0700
commit085c20557c1f0b936a27b945185e620fdf47c36d (patch)
tree276bf6e169c5e90c985e2830ec7560a5aeb4233f
parent0960682caa1fd27539b0c2100e4f8766ebe66640 (diff)
downloadvboot-085c20557c1f0b936a27b945185e620fdf47c36d.tar.gz
tlcl: tpm2: fix unmarshal_u32 return value
Before the fix, unmarshal_u32 returned only 16 bits of the value. BRANCH=none BUG=chrome-os-partner:55210 TEST=boot on keving, verify that 'tpmc getvf' correctly returns the 'orderly' flag (bit 31 of a 32-bit flags value) Change-Id: I182abdd78a6bdcbc21fe631492559099caeb934f Reviewed-on: https://chromium-review.googlesource.com/362994 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
-rw-r--r--firmware/lib/tpm2_lite/marshaling.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/lib/tpm2_lite/marshaling.c b/firmware/lib/tpm2_lite/marshaling.c
index 61f726c4..73285c3d 100644
--- a/firmware/lib/tpm2_lite/marshaling.c
+++ b/firmware/lib/tpm2_lite/marshaling.c
@@ -85,7 +85,7 @@ static uint16_t unmarshal_u16(void **buffer, int *buffer_space)
return value;
}
-static uint16_t unmarshal_u32(void **buffer, int *buffer_space)
+static uint32_t unmarshal_u32(void **buffer, int *buffer_space)
{
uint32_t value;