From 3be1527b407dacc0ca494fc16d898bf11a80f98d Mon Sep 17 00:00:00 2001 From: Christian Plappert Date: Wed, 3 Jul 2024 17:50:31 +0200 Subject: [PATCH] update --- include/tss2/tss2_mu.h | 21 +++++++++++---------- lib/tss2-mu.def | 3 +++ lib/tss2-mu.map | 3 +++ src/tss2-mu/tpm2b-types.c | 2 ++ 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/include/tss2/tss2_mu.h b/include/tss2/tss2_mu.h index 0381cbaf9..959193c94 100644 --- a/include/tss2/tss2_mu.h +++ b/include/tss2/tss2_mu.h @@ -468,6 +468,7 @@ Tss2_MU_TPM2B_ECC_POINT_Unmarshal( size_t *offset, TPM2B_ECC_POINT *dest); + TSS2_RC Tss2_MU_TPM2B_LABEL_Marshal( TPM2B_LABEL const *src, @@ -747,7 +748,7 @@ Tss2_MU_TPMS_DERIVE_Unmarshal( uint8_t const buffer[], size_t buffer_size, size_t *offset, - TPMS_DERIVE *dest); + TPMS_DERIVE *dest); TSS2_RC Tss2_MU_TPMS_NV_PUBLIC_Marshal( @@ -1701,7 +1702,7 @@ Tss2_MU_TPMU_PUBLIC_ID_DERIVE_Unmarshal( size_t buffer_size, size_t *offset, uint32_t selector_value, - TPMU_PUBLIC_ID_DERIVE *dest); + TPMU_PUBLIC_ID_DERIVE *dest); TSS2_RC Tss2_MU_TPMU_NAME_Marshal( @@ -1902,32 +1903,32 @@ Tss2_MU_TPMT_PUBLIC_Unmarshal( TPMT_PUBLIC *dest); TSS2_RC -Tss2_MU_TPMT_PUBLIC_DERIVE_Marshal( - TPMT_PUBLIC const *src, +Tss2_MU_TPMT_PUBLIC_PARMS_Marshal( + TPMT_PUBLIC_PARMS const *src, uint8_t buffer[], size_t buffer_size, size_t *offset); TSS2_RC -Tss2_MU_TPMT_PUBLIC_DERIVE_Unmarshal( +Tss2_MU_TPMT_PUBLIC_PARMS_Unmarshal( uint8_t const buffer[], size_t buffer_size, size_t *offset, - TPMT_PUBLIC *dest); + TPMT_PUBLIC_PARMS *dest); TSS2_RC -Tss2_MU_TPMT_PUBLIC_PARMS_Marshal( - TPMT_PUBLIC_PARMS const *src, +Tss2_MU_TPMT_PUBLIC_DERIVE_Marshal( + TPMT_PUBLIC const *src, uint8_t buffer[], size_t buffer_size, size_t *offset); TSS2_RC -Tss2_MU_TPMT_PUBLIC_PARMS_Unmarshal( +Tss2_MU_TPMT_PUBLIC_DERIVE_Unmarshal( uint8_t const buffer[], size_t buffer_size, size_t *offset, - TPMT_PUBLIC_PARMS *dest); + TPMT_PUBLIC *dest); TSS2_RC Tss2_MU_TPMT_TK_CREATION_Marshal( diff --git a/lib/tss2-mu.def b/lib/tss2-mu.def index 32f9e8505..5ce8c28db 100644 --- a/lib/tss2-mu.def +++ b/lib/tss2-mu.def @@ -80,6 +80,7 @@ EXPORTS Tss2_MU_TPM2B_ENCRYPTED_SECRET_Unmarshal Tss2_MU_TPM2B_ATTEST_Marshal Tss2_MU_TPM2B_ATTEST_Unmarshal + Tss2_MU_TPM2B_LABEL_Marshal Tss2_MU_TPM2B_MAX_BUFFER_Marshal Tss2_MU_TPM2B_MAX_BUFFER_Unmarshal Tss2_MU_TPM2B_MAX_CAP_BUFFER_Marshal @@ -106,6 +107,7 @@ EXPORTS Tss2_MU_TPMS_TIME_INFO_Unmarshal Tss2_MU_TPMS_ECC_POINT_Marshal Tss2_MU_TPMS_ECC_POINT_Unmarshal + Tss2_MU_TPMS_DERIVE_Marshal Tss2_MU_TPMS_NV_PUBLIC_Marshal Tss2_MU_TPMS_NV_PUBLIC_Unmarshal Tss2_MU_TPMS_ALG_PROPERTY_Marshal @@ -236,6 +238,7 @@ EXPORTS Tss2_MU_TPMU_PUBLIC_PARMS_Unmarshal Tss2_MU_TPMU_PUBLIC_ID_Marshal Tss2_MU_TPMU_PUBLIC_ID_Unmarshal + Tss2_MU_TPMU_PUBLIC_ID_DERIVE_Marshal Tss2_MU_TPMU_NAME_Marshal Tss2_MU_TPMU_NAME_Unmarshal Tss2_MU_TPMU_ENCRYPTED_SECRET_Marshal diff --git a/lib/tss2-mu.map b/lib/tss2-mu.map index b3eb609ac..31b838171 100644 --- a/lib/tss2-mu.map +++ b/lib/tss2-mu.map @@ -80,6 +80,7 @@ Tss2_MU_TPM2B_ENCRYPTED_SECRET_Unmarshal; Tss2_MU_TPM2B_ATTEST_Marshal; Tss2_MU_TPM2B_ATTEST_Unmarshal; + Tss2_MU_TPM2B_LABEL_Marshal; Tss2_MU_TPM2B_MAX_BUFFER_Marshal; Tss2_MU_TPM2B_MAX_BUFFER_Unmarshal; Tss2_MU_TPM2B_MAX_CAP_BUFFER_Marshal; @@ -106,6 +107,7 @@ Tss2_MU_TPMS_TIME_INFO_Unmarshal; Tss2_MU_TPMS_ECC_POINT_Marshal; Tss2_MU_TPMS_ECC_POINT_Unmarshal; + Tss2_MU_TPMS_DERIVE_Marshal; Tss2_MU_TPMS_NV_PUBLIC_Marshal; Tss2_MU_TPMS_NV_PUBLIC_Unmarshal; Tss2_MU_TPMS_ALG_PROPERTY_Marshal; @@ -236,6 +238,7 @@ Tss2_MU_TPMU_PUBLIC_PARMS_Unmarshal; Tss2_MU_TPMU_PUBLIC_ID_Marshal; Tss2_MU_TPMU_PUBLIC_ID_Unmarshal; + Tss2_MU_TPMU_PUBLIC_ID_DERIVE_Marshal; Tss2_MU_TPMU_NAME_Marshal; Tss2_MU_TPMU_NAME_Unmarshal; Tss2_MU_TPMU_ENCRYPTED_SECRET_Marshal; diff --git a/src/tss2-mu/tpm2b-types.c b/src/tss2-mu/tpm2b-types.c index a72a1b364..a1a476b98 100644 --- a/src/tss2-mu/tpm2b-types.c +++ b/src/tss2-mu/tpm2b-types.c @@ -347,6 +347,8 @@ TPM2B_MARSHAL (TPM2B_OPERAND); TPM2B_UNMARSHAL(TPM2B_OPERAND, buffer); TPM2B_MARSHAL (TPM2B_TEMPLATE); TPM2B_UNMARSHAL(TPM2B_TEMPLATE, buffer); +TPM2B_MARSHAL (TPM2B_LABEL); +TPM2B_UNMARSHAL(TPM2B_LABEL, buffer); TPM2B_MARSHAL(TPM2B_MAX_CAP_BUFFER); TPM2B_UNMARSHAL(TPM2B_MAX_CAP_BUFFER, buffer); TPM2B_MARSHAL_SUBTYPE(TPM2B_ECC_POINT, TPMS_ECC_POINT, point);