add SpdmVersion13 enum value.

Signed-off-by: Yang, Longlong <[email protected]>
ccc-spdm-tools · Jan 22, 2024 · 798d607 · 798d607
1 parent 48c79b2
commit 798d607
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/spdmlib/src/protocol/version.rs b/spdmlib/src/protocol/version.rs
@@ -10,6 +10,7 @@ pub enum SpdmVersion {
     SpdmVersion10,
     SpdmVersion11,
     SpdmVersion12,
+    SpdmVersion13,
 }
 
 impl Default for SpdmVersion {
@@ -27,6 +28,8 @@ impl TryFrom<u8> for SpdmVersion {
             Ok(SpdmVersion::SpdmVersion11)
         } else if untrusted_spdm_version == 0x12 {
             Ok(SpdmVersion::SpdmVersion12)
+        } else if untrusted_spdm_version == 0x13 {
+            Ok(SpdmVersion::SpdmVersion13)
         } else {
             Err(())
         }
@@ -39,6 +42,7 @@ impl From<SpdmVersion> for u8 {
             SpdmVersion::SpdmVersion10 => 0x10,
             SpdmVersion::SpdmVersion11 => 0x11,
             SpdmVersion::SpdmVersion12 => 0x12,
+            SpdmVersion::SpdmVersion13 => 0x13,
         }
     }
 }
@@ -60,7 +64,7 @@ impl Codec for SpdmVersion {
     }
 }
 
-pub const MAX_SPDM_VERSION_COUNT: usize = 3;
+pub const MAX_SPDM_VERSION_COUNT: usize = 4;
 
 //SPDM V1.2 signing prefix context
 pub const SPDM_VERSION_1_2_SIGNING_PREFIX_CONTEXT: [u8; 64] = [

diff --git a/test/spdm-requester-emu/src/main.rs b/test/spdm-requester-emu/src/main.rs
@@ -155,6 +155,7 @@ async fn test_spdm(
             Some(SpdmVersion::SpdmVersion10),
             Some(SpdmVersion::SpdmVersion11),
             Some(SpdmVersion::SpdmVersion12),
+            None,
         ],
         req_capabilities,
         req_ct_exponent: 0,
@@ -460,6 +461,7 @@ async fn test_idekm_tdisp(
             Some(SpdmVersion::SpdmVersion10),
             Some(SpdmVersion::SpdmVersion11),
             Some(SpdmVersion::SpdmVersion12),
+            None,
         ],
         req_capabilities,
         req_ct_exponent: 0,

diff --git a/test/spdm-responder-emu/src/main.rs b/test/spdm-responder-emu/src/main.rs
@@ -285,6 +285,7 @@ async fn handle_message(
             Some(SpdmVersion::SpdmVersion10),
             Some(SpdmVersion::SpdmVersion11),
             Some(SpdmVersion::SpdmVersion12),
+            None,
         ],
         rsp_capabilities,
         rsp_ct_exponent: 0,