tpm: Refactor tpml_digest_values_sha1 structure

Refactor the tpml_digest_values_sha1 structure so we can later cast it
to the more general tpml_digest_values structure. Move the count member
into this structure.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/std/tcg.h b/src/std/tcg.h
index 16446841..730b39c0 100644
--- a/src/std/tcg.h
+++ b/src/std/tcg.h
@@ -507,15 +507,15 @@ struct tpml_pcr_selection {
 /* TPM 2 log entry */
 
 struct tpml_digest_values_sha1 {
+    u32 count; /* number of digests */
     u16 hashtype;
     u8 sha1[SHA1_BUFSIZE];
-};
+} PACKED;
 
 struct tcg_pcr_event2_sha1 {
     u32 pcrindex;
     u32 eventtype;
-    u32 count; /* number of digests */
-    struct tpml_digest_values_sha1 digests[1];
+    struct tpml_digest_values_sha1 digest;
     u32 eventdatasize;
     u8 event[0];
 } PACKED;