On 4/16/24 00:23, Stuart Yoder wrote:
The TPMT_HA struct defining event log hash algorithms was cut/pasted
from the TCG EFI Protocol specification which used a C struct
with a flexible array member as the last element. This is incorrect
because TPMT_HA itself is used as an array element, and thus can't
be variable size.
Because the size of hash algorithms varies, this should have been
defined as a union of the sizes of supported hash algorithms. This is
how is it done in the TPM Library specfication and in EDK2.
Signed-off-by: Stuart Yoder <[email protected]>
---
uefi-sct/SctPkg/UEFI/Protocol/TCG2.h | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/uefi-sct/SctPkg/UEFI/Protocol/TCG2.h
b/uefi-sct/SctPkg/UEFI/Protocol/TCG2.h
index a83a84c33134..e42b8b347c05 100644
--- a/uefi-sct/SctPkg/UEFI/Protocol/TCG2.h
+++ b/uefi-sct/SctPkg/UEFI/Protocol/TCG2.h
@@ -51,6 +51,10 @@ Abstract:
#define EFI_TCG2_EVENT_LOG_FORMAT_TCG_2 0x00000002
#define HASH_NUMBER 0x04
+#define SHA1_DIGEST_SIZE 20
+#define SHA256_DIGEST_SIZE 32
We should follow the TCG EFI Protocol Specification and support ShangMi
3 in the test too.
#define SM3_256_DIGEST_SIZE 32
+#define SHA384_DIGEST_SIZE 48
+#define SHA512_DIGEST_SIZE 64
typedef struct _EFI_TCG2_PROTOCOL EFI_TCG2_PROTOCOL;
@@ -117,9 +121,16 @@ typedef struct tdEFI_TCG2_EVENT {
UINT8 Event[];
} EFI_TCG2_EVENT;
+typedef union {
+ UINT8 sha1[SHA1_DIGEST_SIZE];
+ UINT8 sha256[SHA256_DIGEST_SIZE];
UINT8 sm3_256[SM3_256_DIGEST_SIZE];
Best regards
Heinrich
+ UINT8 sha384[SHA384_DIGEST_SIZE];
+ UINT8 sha512[SHA512_DIGEST_SIZE];
+} TPMU_HA;
+
typedef struct {
UINT16 hashAlg;
- UINT8 digest[];
+ TPMU_HA digest;
} TPMT_HA;
typedef struct tdTPML_DIGEST_VALUES {
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#117850): https://edk2.groups.io/g/devel/message/117850
Mute This Topic: https://groups.io/mt/105546455/21656
Group Owner: [email protected]
Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
