MdePkg: Apply uncrustify changes

[mirror_edk2.git] / MdePkg / Include / IndustryStandard / Spdm.h

diff --git a/MdePkg/Include/IndustryStandard/Spdm.h b/MdePkg/Include/IndustryStandard/Spdm.h
index 38ec7748a70acb9a192f471bffdb9b8bb1f93fdd..4ec7a5ed1f9d6478d9ebc782a23462a4cdc4411b 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Spdm.h
+++ b/MdePkg/Include/IndustryStandard/Spdm.h
@@ -7,7 +7,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-\r

 #ifndef __SPDM_H__\r
 #define __SPDM_H__\r
 \r
 #ifndef __SPDM_H__\r
 #define __SPDM_H__\r
 \r


@@ -16,15 +15,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 ///\r
 /// SPDM response code\r
 ///\r
 ///\r
 /// SPDM response code\r
 ///\r

-#define SPDM_DIGESTS               0x01\r
-#define SPDM_CERTIFICATE           0x02\r
-#define SPDM_CHALLENGE_AUTH        0x03\r
-#define SPDM_VERSION               0x04\r
-#define SPDM_MEASUREMENTS          0x60\r
-#define SPDM_CAPABILITIES          0x61\r
-#define SPDM_SET_CERT_RESPONSE     0x62\r
-#define SPDM_ALGORITHMS            0x63\r
-#define SPDM_ERROR                 0x7F\r
+#define SPDM_DIGESTS            0x01\r
+#define SPDM_CERTIFICATE        0x02\r
+#define SPDM_CHALLENGE_AUTH     0x03\r
+#define SPDM_VERSION            0x04\r
+#define SPDM_MEASUREMENTS       0x60\r
+#define SPDM_CAPABILITIES       0x61\r
+#define SPDM_SET_CERT_RESPONSE  0x62\r
+#define SPDM_ALGORITHMS         0x63\r
+#define SPDM_ERROR              0x7F\r

 ///\r
 /// SPDM request code\r
 ///\r
 ///\r
 /// SPDM request code\r
 ///\r


@@ -41,10 +40,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// SPDM message header\r
 ///\r
 typedef struct {\r
 /// SPDM message header\r
 ///\r
 typedef struct {\r

-  UINT8   SPDMVersion;\r
-  UINT8   RequestResponseCode;\r
-  UINT8   Param1;\r
-  UINT8   Param2;\r
+  UINT8    SPDMVersion;\r
+  UINT8    RequestResponseCode;\r
+  UINT8    Param1;\r
+  UINT8    Param2;\r

 } SPDM_MESSAGE_HEADER;\r
 \r
 #define SPDM_MESSAGE_VERSION  0x10\r
 } SPDM_MESSAGE_HEADER;\r
 \r
 #define SPDM_MESSAGE_VERSION  0x10\r


@@ -53,211 +52,211 @@ typedef struct {
 /// SPDM GET_VERSION request\r
 ///\r
 typedef struct {\r
 /// SPDM GET_VERSION request\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
+  SPDM_MESSAGE_HEADER    Header;\r

 } SPDM_GET_VERSION_REQUEST;\r
 \r
 ///\r
 /// SPDM GET_VERSION response\r
 ///\r
 typedef struct {\r
 } SPDM_GET_VERSION_REQUEST;\r
 \r
 ///\r
 /// SPDM GET_VERSION response\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
-  UINT8                Reserved;\r
-  UINT8                VersionNumberEntryCount;\r
-//SPDM_VERSION_NUMBER  VersionNumberEntry[VersionNumberEntryCount];\r
+  SPDM_MESSAGE_HEADER    Header;\r
+  UINT8                  Reserved;\r
+  UINT8                  VersionNumberEntryCount;\r
+  // SPDM_VERSION_NUMBER  VersionNumberEntry[VersionNumberEntryCount];\r

 } SPDM_VERSION_RESPONSE;\r
 \r
 ///\r
 /// SPDM VERSION structure\r
 ///\r
 typedef struct {\r
 } SPDM_VERSION_RESPONSE;\r
 \r
 ///\r
 /// SPDM VERSION structure\r
 ///\r
 typedef struct {\r

-  UINT16               Alpha:4;\r
-  UINT16               UpdateVersionNumber:4;\r
-  UINT16               MinorVersion:4;\r
-  UINT16               MajorVersion:4;\r
+  UINT16    Alpha               : 4;\r
+  UINT16    UpdateVersionNumber : 4;\r
+  UINT16    MinorVersion        : 4;\r
+  UINT16    MajorVersion        : 4;\r

 } SPDM_VERSION_NUMBER;\r
 \r
 ///\r
 /// SPDM GET_CAPABILITIES request\r
 ///\r
 typedef struct {\r
 } SPDM_VERSION_NUMBER;\r
 \r
 ///\r
 /// SPDM GET_CAPABILITIES request\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
+  SPDM_MESSAGE_HEADER    Header;\r

 } SPDM_GET_CAPABILITIES_REQUEST;\r
 \r
 ///\r
 /// SPDM GET_CAPABILITIES response\r
 ///\r
 typedef struct {\r
 } SPDM_GET_CAPABILITIES_REQUEST;\r
 \r
 ///\r
 /// SPDM GET_CAPABILITIES response\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
-  UINT8                Reserved;\r
-  UINT8                CTExponent;\r
-  UINT16               Reserved2;\r
-  UINT32               Flags;\r
+  SPDM_MESSAGE_HEADER    Header;\r
+  UINT8                  Reserved;\r
+  UINT8                  CTExponent;\r
+  UINT16                 Reserved2;\r
+  UINT32                 Flags;\r

 } SPDM_CAPABILITIES_RESPONSE;\r
 \r
 ///\r
 /// SPDM GET_CAPABILITIES response Flags\r
 ///\r
 } SPDM_CAPABILITIES_RESPONSE;\r
 \r
 ///\r
 /// SPDM GET_CAPABILITIES response Flags\r
 ///\r

-#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_CACHE_CAP       BIT0\r
-#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_CERT_CAP        BIT1\r
-#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_CHAL_CAP        BIT2\r
-#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEAS_CAP        (BIT3 | BIT4)\r
-#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEAS_CAP_NO_SIG   BIT3\r
-#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEAS_CAP_SIG      BIT4\r
-#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEAS_FRESH_CAP  BIT5\r
+#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_CACHE_CAP        BIT0\r
+#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_CERT_CAP         BIT1\r
+#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_CHAL_CAP         BIT2\r
+#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEAS_CAP         (BIT3 | BIT4)\r
+#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEAS_CAP_NO_SIG  BIT3\r
+#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEAS_CAP_SIG     BIT4\r
+#define SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEAS_FRESH_CAP   BIT5\r

 \r
 ///\r
 /// SPDM NEGOTIATE_ALGORITHMS request\r
 ///\r
 typedef struct {\r
 \r
 ///\r
 /// SPDM NEGOTIATE_ALGORITHMS request\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
-  UINT16               Length;\r
-  UINT8                MeasurementSpecification;\r
-  UINT8                Reserved;\r
-  UINT32               BaseAsymAlgo;\r
-  UINT32               BaseHashAlgo;\r
-  UINT8                Reserved2[12];\r
-  UINT8                ExtAsymCount;\r
-  UINT8                ExtHashCount;\r
-  UINT16               Reserved3;\r
-//UINT32               ExtAsym[ExtAsymCount];\r
-//UINT32               ExtHash[ExtHashCount];\r
+  SPDM_MESSAGE_HEADER    Header;\r
+  UINT16                 Length;\r
+  UINT8                  MeasurementSpecification;\r
+  UINT8                  Reserved;\r
+  UINT32                 BaseAsymAlgo;\r
+  UINT32                 BaseHashAlgo;\r
+  UINT8                  Reserved2[12];\r
+  UINT8                  ExtAsymCount;\r
+  UINT8                  ExtHashCount;\r
+  UINT16                 Reserved3;\r
+  // UINT32               ExtAsym[ExtAsymCount];\r
+  // UINT32               ExtHash[ExtHashCount];\r

 } SPDM_NEGOTIATE_ALGORITHMS_REQUEST;\r
 \r
 ///\r
 /// SPDM NEGOTIATE_ALGORITHMS request BaseAsymAlgo\r
 ///\r
 } SPDM_NEGOTIATE_ALGORITHMS_REQUEST;\r
 \r
 ///\r
 /// SPDM NEGOTIATE_ALGORITHMS request BaseAsymAlgo\r
 ///\r

-#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSASSA_2048           BIT0\r
-#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSAPSS_2048           BIT1\r
-#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSASSA_3072           BIT2\r
-#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSAPSS_3072           BIT3\r
-#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_ECDSA_ECC_NIST_P256   BIT4\r
-#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSASSA_4096           BIT5\r
-#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSAPSS_4096           BIT6\r
-#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_ECDSA_ECC_NIST_P384   BIT7\r
-#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_ECDSA_ECC_NIST_P521   BIT8\r
+#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSASSA_2048          BIT0\r
+#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSAPSS_2048          BIT1\r
+#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSASSA_3072          BIT2\r
+#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSAPSS_3072          BIT3\r
+#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_ECDSA_ECC_NIST_P256  BIT4\r
+#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSASSA_4096          BIT5\r
+#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSAPSS_4096          BIT6\r
+#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_ECDSA_ECC_NIST_P384  BIT7\r
+#define SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_ECDSA_ECC_NIST_P521  BIT8\r

 \r
 ///\r
 /// SPDM NEGOTIATE_ALGORITHMS request BaseHashAlgo\r
 ///\r
 \r
 ///\r
 /// SPDM NEGOTIATE_ALGORITHMS request BaseHashAlgo\r
 ///\r

-#define SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA_256               BIT0\r
-#define SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA_384               BIT1\r
-#define SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA_512               BIT2\r
-#define SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA3_256              BIT3\r
-#define SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA3_384              BIT4\r
-#define SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA3_512              BIT5\r
+#define SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA_256   BIT0\r
+#define SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA_384   BIT1\r
+#define SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA_512   BIT2\r
+#define SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA3_256  BIT3\r
+#define SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA3_384  BIT4\r
+#define SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA3_512  BIT5\r

 \r
 ///\r
 /// SPDM NEGOTIATE_ALGORITHMS response\r
 ///\r
 typedef struct {\r
 \r
 ///\r
 /// SPDM NEGOTIATE_ALGORITHMS response\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
-  UINT16               Length;\r
-  UINT8                MeasurementSpecificationSel;\r
-  UINT8                Reserved;\r
-  UINT32               MeasurementHashAlgo;\r
-  UINT32               BaseAsymSel;\r
-  UINT32               BaseHashSel;\r
-  UINT8                Reserved2[12];\r
-  UINT8                ExtAsymSelCount;\r
-  UINT8                ExtHashSelCount;\r
-  UINT16               Reserved3;\r
-//UINT32               ExtAsymSel[ExtAsymSelCount];\r
-//UINT32               ExtHashSel[ExtHashSelCount];\r
+  SPDM_MESSAGE_HEADER    Header;\r
+  UINT16                 Length;\r
+  UINT8                  MeasurementSpecificationSel;\r
+  UINT8                  Reserved;\r
+  UINT32                 MeasurementHashAlgo;\r
+  UINT32                 BaseAsymSel;\r
+  UINT32                 BaseHashSel;\r
+  UINT8                  Reserved2[12];\r
+  UINT8                  ExtAsymSelCount;\r
+  UINT8                  ExtHashSelCount;\r
+  UINT16                 Reserved3;\r
+  // UINT32               ExtAsymSel[ExtAsymSelCount];\r
+  // UINT32               ExtHashSel[ExtHashSelCount];\r

 } SPDM_ALGORITHMS_RESPONSE;\r
 \r
 ///\r
 /// SPDM NEGOTIATE_ALGORITHMS response MeasurementHashAlgo\r
 ///\r
 } SPDM_ALGORITHMS_RESPONSE;\r
 \r
 ///\r
 /// SPDM NEGOTIATE_ALGORITHMS response MeasurementHashAlgo\r
 ///\r

-#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_RAW_BIT_STREAM_ONLY BIT0\r
-#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_TPM_ALG_SHA_256     BIT1\r
-#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_TPM_ALG_SHA_384     BIT2\r
-#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_TPM_ALG_SHA_512     BIT3\r
-#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_TPM_ALG_SHA3_256    BIT4\r
-#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_TPM_ALG_SHA3_384    BIT5\r
-#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_TPM_ALG_SHA3_512    BIT6\r
+#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_RAW_BIT_STREAM_ONLY  BIT0\r
+#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_TPM_ALG_SHA_256      BIT1\r
+#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_TPM_ALG_SHA_384      BIT2\r
+#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_TPM_ALG_SHA_512      BIT3\r
+#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_TPM_ALG_SHA3_256     BIT4\r
+#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_TPM_ALG_SHA3_384     BIT5\r
+#define SPDM_ALGORITHMS_MEASUREMENT_HASH_ALGO_TPM_ALG_SHA3_512     BIT6\r

 \r
 ///\r
 /// SPDM GET_DIGESTS request\r
 ///\r
 typedef struct {\r
 \r
 ///\r
 /// SPDM GET_DIGESTS request\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
+  SPDM_MESSAGE_HEADER    Header;\r

 } SPDM_GET_DIGESTS_REQUEST;\r
 \r
 ///\r
 /// SPDM GET_DIGESTS response\r
 ///\r
 typedef struct {\r
 } SPDM_GET_DIGESTS_REQUEST;\r
 \r
 ///\r
 /// SPDM GET_DIGESTS response\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
-//UINT8                Digest[DigestSize];\r
+  SPDM_MESSAGE_HEADER    Header;\r
+  // UINT8                Digest[DigestSize];\r

 } SPDM_DIGESTS_RESPONSE;\r
 \r
 ///\r
 /// SPDM GET_DIGESTS request\r
 ///\r
 typedef struct {\r
 } SPDM_DIGESTS_RESPONSE;\r
 \r
 ///\r
 /// SPDM GET_DIGESTS request\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
-  UINT16               Offset;\r
-  UINT16               Length;\r
+  SPDM_MESSAGE_HEADER    Header;\r
+  UINT16                 Offset;\r
+  UINT16                 Length;\r

 } SPDM_GET_CERTIFICATE_REQUEST;\r
 \r
 ///\r
 /// SPDM GET_DIGESTS response\r
 ///\r
 typedef struct {\r
 } SPDM_GET_CERTIFICATE_REQUEST;\r
 \r
 ///\r
 /// SPDM GET_DIGESTS response\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
-  UINT16               PortionLength;\r
-  UINT16               RemainderLength;\r
-//UINT8                CertChain[CertChainSize];\r
+  SPDM_MESSAGE_HEADER    Header;\r
+  UINT16                 PortionLength;\r
+  UINT16                 RemainderLength;\r
+  // UINT8                CertChain[CertChainSize];\r

 } SPDM_CERTIFICATE_RESPONSE;\r
 \r
 ///\r
 /// SPDM CHALLENGE request\r
 ///\r
 typedef struct {\r
 } SPDM_CERTIFICATE_RESPONSE;\r
 \r
 ///\r
 /// SPDM CHALLENGE request\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
-  UINT8                Nonce[32];\r
+  SPDM_MESSAGE_HEADER    Header;\r
+  UINT8                  Nonce[32];\r

 } SPDM_CHALLENGE_REQUEST;\r
 \r
 ///\r
 /// SPDM CHALLENGE response\r
 ///\r
 typedef struct {\r
 } SPDM_CHALLENGE_REQUEST;\r
 \r
 ///\r
 /// SPDM CHALLENGE response\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
-//UINT8                CertChainHash[DigestSize];\r
-//UINT8                Nonce[32];\r
-//UINT8                MeasurementSummaryHash[DigestSize];\r
-//UINT16               OpaqueLength;\r
-//UINT8                OpaqueData[OpaqueLength];\r
-//UINT8                Signature[KeySize];\r
+  SPDM_MESSAGE_HEADER    Header;\r
+  // UINT8                CertChainHash[DigestSize];\r
+  // UINT8                Nonce[32];\r
+  // UINT8                MeasurementSummaryHash[DigestSize];\r
+  // UINT16               OpaqueLength;\r
+  // UINT8                OpaqueData[OpaqueLength];\r
+  // UINT8                Signature[KeySize];\r

 } SPDM_CHALLENGE_AUTH_RESPONSE;\r
 \r
 ///\r
 /// SPDM GET_MEASUREMENTS request\r
 ///\r
 typedef struct {\r
 } SPDM_CHALLENGE_AUTH_RESPONSE;\r
 \r
 ///\r
 /// SPDM GET_MEASUREMENTS request\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
-  UINT8                Nonce[32];\r
+  SPDM_MESSAGE_HEADER    Header;\r
+  UINT8                  Nonce[32];\r

 } SPDM_GET_MEASUREMENTS_REQUEST;\r
 \r
 ///\r
 /// SPDM MEASUREMENTS block common header\r
 ///\r
 typedef struct {\r
 } SPDM_GET_MEASUREMENTS_REQUEST;\r
 \r
 ///\r
 /// SPDM MEASUREMENTS block common header\r
 ///\r
 typedef struct {\r

-  UINT8                Index;\r
-  UINT8                MeasurementSpecification;\r
-  UINT16               MeasurementSize;\r
-//UINT8                Measurement[MeasurementSize];\r
+  UINT8     Index;\r
+  UINT8     MeasurementSpecification;\r
+  UINT16    MeasurementSize;\r
+  // UINT8                Measurement[MeasurementSize];\r

 } SPDM_MEASUREMENT_BLOCK_COMMON_HEADER;\r
 \r
 } SPDM_MEASUREMENT_BLOCK_COMMON_HEADER;\r
 \r

-#define SPDM_MEASUREMENT_BLOCK_HEADER_SPECIFICATION_DMTF BIT0\r
+#define SPDM_MEASUREMENT_BLOCK_HEADER_SPECIFICATION_DMTF  BIT0\r

 \r
 ///\r
 /// SPDM MEASUREMENTS block DMTF header\r
 ///\r
 typedef struct {\r
 \r
 ///\r
 /// SPDM MEASUREMENTS block DMTF header\r
 ///\r
 typedef struct {\r

-  UINT8                DMTFSpecMeasurementValueType;\r
-  UINT16               DMTFSpecMeasurementValueSize;\r
-//UINT8                DMTFSpecMeasurementValue[DMTFSpecMeasurementValueSize];\r
+  UINT8     DMTFSpecMeasurementValueType;\r
+  UINT16    DMTFSpecMeasurementValueSize;\r
+  // UINT8                DMTFSpecMeasurementValue[DMTFSpecMeasurementValueSize];\r

 } SPDM_MEASUREMENT_BLOCK_DMTF_HEADER;\r
 \r
 ///\r
 } SPDM_MEASUREMENT_BLOCK_DMTF_HEADER;\r
 \r
 ///\r


@@ -273,24 +272,24 @@ typedef struct {
 /// SPDM GET_MEASUREMENTS response\r
 ///\r
 typedef struct {\r
 /// SPDM GET_MEASUREMENTS response\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
-  UINT8                NumberOfBlocks;\r
-  UINT8                MeasurementRecordLength[3];\r
-//UINT8                MeasurementRecord[MeasurementRecordLength];\r
-//UINT8                Nonce[32];\r
-//UINT16               OpaqueLength;\r
-//UINT8                OpaqueData[OpaqueLength];\r
-//UINT8                Signature[KeySize];\r
+  SPDM_MESSAGE_HEADER    Header;\r
+  UINT8                  NumberOfBlocks;\r
+  UINT8                  MeasurementRecordLength[3];\r
+  // UINT8                MeasurementRecord[MeasurementRecordLength];\r
+  // UINT8                Nonce[32];\r
+  // UINT16               OpaqueLength;\r
+  // UINT8                OpaqueData[OpaqueLength];\r
+  // UINT8                Signature[KeySize];\r

 } SPDM_MEASUREMENTS_RESPONSE;\r
 \r
 ///\r
 /// SPDM ERROR response\r
 ///\r
 typedef struct {\r
 } SPDM_MEASUREMENTS_RESPONSE;\r
 \r
 ///\r
 /// SPDM ERROR response\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
+  SPDM_MESSAGE_HEADER    Header;\r

   // Param1 == Error Code\r
   // Param2 == Error Data\r
   // Param1 == Error Code\r
   // Param2 == Error Data\r

-//UINT8                ExtendedErrorData[];\r
+  // UINT8                ExtendedErrorData[];\r

 } SPDM_ERROR_RESPONSE;\r
 \r
 ///\r
 } SPDM_ERROR_RESPONSE;\r
 \r
 ///\r


@@ -309,7 +308,7 @@ typedef struct {
 /// SPDM RESPONSE_IF_READY request\r
 ///\r
 typedef struct {\r
 /// SPDM RESPONSE_IF_READY request\r
 ///\r
 typedef struct {\r

-  SPDM_MESSAGE_HEADER  Header;\r
+  SPDM_MESSAGE_HEADER    Header;\r

   // Param1 == RequestCode\r
   // Param2 == Token\r
 } SPDM_RESPONSE_IF_READY_REQUEST;\r
   // Param1 == RequestCode\r
   // Param2 == Token\r
 } SPDM_RESPONSE_IF_READY_REQUEST;\r


@@ -317,4 +316,3 @@ typedef struct {
 #pragma pack()\r
 \r
 #endif\r
 #pragma pack()\r
 \r
 #endif\r

-\r