event_log: move definition of ev_log_hash_t to code

It used to be defined in boot.h, even though it isn't expected to be ever needed anywhere but in code for handling event log internally. Signed-off-by: Krystian Hebel <[email protected]>
TrenchBoot · Feb 26, 2024 · fb60951 · fb60951
1 parent 202a44b
commit fb60951
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/event_log.c b/event_log.c
@@ -112,10 +112,19 @@ typedef struct __packed {
     /* u8 event[]; */
 } tpm12_event_t;
 
+/* The same as TPML_DIGEST_VALUES but little endian, as event log expects it */
+typedef struct __packed {
+    u32 count;
+    u16 sha1_id;
+    u8 sha1_hash[20];
+    u16 sha256_id;
+    u8 sha256_hash[32];
+} ev_log_hash_t;
+
 typedef struct __packed {
     u32 pcr;
     u32 event_type;
-    ev_log_hash_t digests;      /* defined in boot.h */
+    ev_log_hash_t digests;
     u32 event_size;
     /* u8 event[]; */
 } tpm20_event_t;

diff --git a/include/boot.h b/include/boot.h
@@ -56,15 +56,6 @@ typedef struct __packed skl_info {
 } skl_info_t;
 extern const skl_info_t skl_info;
 
-/* The same as TPML_DIGEST_VALUES but little endian, as event log expects it */
-typedef struct __packed ev_log_hash {
-    u32 count;
-    u16 sha1_id;
-    u8 sha1_hash[20];
-    u16 sha256_id;
-    u8 sha256_hash[32];
-} ev_log_hash_t;
-
 /* Fences */
 #define mb()        asm volatile("mfence" : : : "memory")
 #define rmb()       asm volatile("lfence" : : : "memory")