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 · Mar 4, 2024 · b9aaa5c · b9aaa5c
1 parent 2ab63dc
commit b9aaa5c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/event_log.c b/event_log.c
@@ -107,15 +107,24 @@ typedef struct __packed {
 typedef struct __packed {
     u32 pcr;
     u32 event_type;
-    u8  digest[20];
+    u8  digest[SHA1_DIGEST_SIZE];
     u32 event_size;
     /* 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[SHA1_DIGEST_SIZE];
+    u16 sha256_id;
+    u8 sha256_hash[SHA256_DIGEST_SIZE];
+} 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;
@@ -157,7 +166,7 @@ static const tpm20_spec_id_ev_t tpm20_id_struct = {
     .el.next_record_offset = sizeof(tpm20_spec_id_ev_t) + sizeof(tpm12_event_t)
 };
 
-int log_event_tpm12(u32 pcr, u8 sha1[20], char *event)
+int log_event_tpm12(u32 pcr, u8 sha1[SHA1_DIGEST_SIZE], char *event)
 {
     tpm12_event_t ev;
     tpm12_spec_id_ev_t *base = (tpm12_spec_id_ev_t *)
@@ -178,7 +187,8 @@ int log_event_tpm12(u32 pcr, u8 sha1[20], char *event)
     return 1;
 }
 
-int log_event_tpm20(u32 pcr, u8 sha1[20], u8 sha256[32], char *event)
+int log_event_tpm20(u32 pcr, u8 sha1[SHA1_DIGEST_SIZE],
+                    u8 sha256[SHA256_DIGEST_SIZE], char *event)
 {
     tpm20_event_t ev;
     tpm20_spec_id_ev_t *base = (tpm20_spec_id_ev_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")