From c7a0aca0ed0e9b51efe0c437ff77b30cf1457f8a Mon Sep 17 00:00:00 2001
From: Jiewen Yao <jiewen.yao@intel.com>
Date: Wed, 18 Dec 2019 10:56:28 +0800
Subject: [PATCH] MdePkg/Spdm: fix Nonce structure error.

Align to SPDM 1.0.0 specification.
Fix Nonce data structure error.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
---
 MdePkg/Include/IndustryStandard/Spdm.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/MdePkg/Include/IndustryStandard/Spdm.h b/MdePkg/Include/IndustryStandard/Spdm.h
index c05395fea7..38ec7748a7 100644
--- a/MdePkg/Include/IndustryStandard/Spdm.h
+++ b/MdePkg/Include/IndustryStandard/Spdm.h
@@ -1,6 +1,6 @@
 /** @file
   Definitions of Security Protocol & Data Model Specification (SPDM)
-  version 0.99a in Distributed Management Task Force (DMTF).
+  version 1.0.0 in Distributed Management Task Force (DMTF).
 
 Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -215,7 +215,7 @@ typedef struct {
 ///
 typedef struct {
   SPDM_MESSAGE_HEADER  Header;
-  UINT32               Nonce;
+  UINT8                Nonce[32];
 } SPDM_CHALLENGE_REQUEST;
 
 ///
@@ -224,7 +224,7 @@ typedef struct {
 typedef struct {
   SPDM_MESSAGE_HEADER  Header;
 //UINT8                CertChainHash[DigestSize];
-//UINT32               Nonce;
+//UINT8                Nonce[32];
 //UINT8                MeasurementSummaryHash[DigestSize];
 //UINT16               OpaqueLength;
 //UINT8                OpaqueData[OpaqueLength];
@@ -236,7 +236,7 @@ typedef struct {
 ///
 typedef struct {
   SPDM_MESSAGE_HEADER  Header;
-  UINT32               Nonce;
+  UINT8                Nonce[32];
 } SPDM_GET_MEASUREMENTS_REQUEST;
 
 ///
@@ -277,7 +277,7 @@ typedef struct {
   UINT8                NumberOfBlocks;
   UINT8                MeasurementRecordLength[3];
 //UINT8                MeasurementRecord[MeasurementRecordLength];
-//UINT32               Nonce;
+//UINT8                Nonce[32];
 //UINT16               OpaqueLength;
 //UINT8                OpaqueData[OpaqueLength];
 //UINT8                Signature[KeySize];