move send_message to process_message.

fix #42 Signed-off-by: Yang, Longlong <[email protected]>
intel · Sep 1, 2023 · f34b46c · f34b46c
1 parent d99f45f
commit f34b46c
Show file tree

Hide file tree

Showing 72 changed files with 584 additions and 376 deletions.
diff --git a/codec/src/codec.rs b/codec/src/codec.rs
@@ -65,6 +65,10 @@ impl<'a> Writer<'a> {
         }
     }
 
+    pub fn clear(&mut self) {
+        self.offs = 0;
+    }
+
     pub fn extend_from_slice(&mut self, value: &[u8]) -> Option<usize> {
         if self.left() < value.len() {
             return None;

diff --git a/fuzz-target/responder/algorithm_rsp/Cargo.toml b/fuzz-target/responder/algorithm_rsp/Cargo.toml
@@ -14,6 +14,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 fuzzlogfile = []

diff --git a/fuzz-target/responder/algorithm_rsp/src/main.rs b/fuzz-target/responder/algorithm_rsp/src/main.rs
@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
+use fuzzlib::config::MAX_SPDM_MSG_SIZE;
 use fuzzlib::{spdmlib::protocol::SpdmVersion, *};
 use spdmlib::common::SpdmConnectionState;
 use spin::Mutex;
@@ -33,7 +34,10 @@ async fn fuzz_handle_spdm_algorithm(data: Arc<Vec<u8>>) {
         .runtime_info
         .set_connection_state(SpdmConnectionState::SpdmConnectionAfterCapabilities);
 
-    context.handle_spdm_algorithm(&data).await.unwrap();
+    let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+    let mut writer = codec::Writer::init(&mut response_buffer);
+    let (status, send_buffer) = context.handle_spdm_algorithm(&data, &mut writer);
+    assert!(status.is_ok());
 }
 
 #[cfg(not(feature = "use_libfuzzer"))]

diff --git a/fuzz-target/responder/capability_rsp/Cargo.toml b/fuzz-target/responder/capability_rsp/Cargo.toml
@@ -14,6 +14,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 fuzzlogfile = []

diff --git a/fuzz-target/responder/capability_rsp/src/main.rs b/fuzz-target/responder/capability_rsp/src/main.rs
@@ -33,7 +33,10 @@ async fn fuzz_handle_spdm_capability(data: Arc<Vec<u8>>) {
         .runtime_info
         .set_connection_state(SpdmConnectionState::SpdmConnectionAfterVersion);
 
-    context.handle_spdm_capability(&data).await.unwrap();
+    let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+    let mut writer = codec::Writer::init(&mut response_buffer);
+    let (status, send_buffer) = context.handle_spdm_capability(&data, &mut writer);
+    assert!(status.is_ok());
 }
 
 #[cfg(not(feature = "use_libfuzzer"))]

diff --git a/fuzz-target/responder/certificate_rsp/Cargo.toml b/fuzz-target/responder/certificate_rsp/Cargo.toml
@@ -14,6 +14,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 default = ["hashed-transcript-data"]

diff --git a/fuzz-target/responder/certificate_rsp/src/main.rs b/fuzz-target/responder/certificate_rsp/src/main.rs
@@ -54,7 +54,10 @@ async fn fuzz_handle_spdm_certificate(data: Arc<Vec<u8>>) {
             .runtime_info
             .set_connection_state(SpdmConnectionState::SpdmConnectionNegotiated);
 
-        let _ = context.handle_spdm_certificate(&data, None).await.is_ok();
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) = context.handle_spdm_certificate(&data, None, &mut writer);
+        assert!(status.is_ok());
     }
     // TCD:
     // - id: 0
@@ -103,10 +106,11 @@ async fn fuzz_handle_spdm_certificate(data: Arc<Vec<u8>>) {
             .runtime_info
             .set_connection_state(SpdmConnectionState::SpdmConnectionNegotiated);
 
-        let _ = context
-            .handle_spdm_certificate(&data, Some(4294836221))
-            .await
-            .is_ok();
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) =
+            context.handle_spdm_certificate(&data, Some(4294836221), &mut writer);
+        assert!(status.is_ok());
     }
 }
 

diff --git a/fuzz-target/responder/challenge_rsp/Cargo.toml b/fuzz-target/responder/challenge_rsp/Cargo.toml
@@ -14,6 +14,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 default = ["hashed-transcript-data"]

diff --git a/fuzz-target/responder/challenge_rsp/src/main.rs b/fuzz-target/responder/challenge_rsp/src/main.rs
@@ -53,7 +53,10 @@ async fn fuzz_handle_spdm_challenge(data: Arc<Vec<u8>>) {
             .runtime_info
             .set_connection_state(SpdmConnectionState::SpdmConnectionNegotiated);
 
-        let _ = context.handle_spdm_challenge(&data).await.is_ok();
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) = context.handle_spdm_challenge(&data, &mut writer);
+        assert!(status.is_ok());
     }
     // TCD:
     // - id: 0
@@ -96,7 +99,10 @@ async fn fuzz_handle_spdm_challenge(data: Arc<Vec<u8>>) {
             .runtime_info
             .set_connection_state(SpdmConnectionState::SpdmConnectionNegotiated);
 
-        let _ = context.handle_spdm_challenge(&data).await.is_ok();
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) = context.handle_spdm_challenge(&data, &mut writer);
+        assert!(status.is_ok());
     }
 }
 

diff --git a/fuzz-target/responder/deliver_encapsulated_response_certificate_rsp/Cargo.toml b/fuzz-target/responder/deliver_encapsulated_response_certificate_rsp/Cargo.toml
@@ -14,6 +14,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 default = ["hashed-transcript-data", "mut-auth"]

diff --git a/fuzz-target/responder/deliver_encapsulated_response_digest_rsp/Cargo.toml b/fuzz-target/responder/deliver_encapsulated_response_digest_rsp/Cargo.toml
@@ -14,6 +14,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 default = ["hashed-transcript-data", "mut-auth"]

diff --git a/fuzz-target/responder/deliver_encapsulated_response_rsp/Cargo.toml b/fuzz-target/responder/deliver_encapsulated_response_rsp/Cargo.toml
@@ -14,6 +14,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 default = ["hashed-transcript-data", "mut-auth"]

diff --git a/fuzz-target/responder/deliver_encapsulated_response_rsp/src/main.rs b/fuzz-target/responder/deliver_encapsulated_response_rsp/src/main.rs
@@ -52,10 +52,10 @@ async fn fuzz_handle_deliver_encapsulated_reponse(data: Arc<Vec<u8>>) {
 
         context.common.peer_info.peer_cert_chain_temp = Some(SpdmCertChainBuffer::default());
 
-        let _ = context
-            .handle_deliver_encapsulated_reponse(4294836221, &data)
-            .await
-            .is_err();
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) = context.handle_deliver_encapsulated_reponse(&data, &mut writer);
+        assert!(status.is_ok());
     }
     // TCD:
     // - id: 0
@@ -94,10 +94,10 @@ async fn fuzz_handle_deliver_encapsulated_reponse(data: Arc<Vec<u8>>) {
 
         context.common.peer_info.peer_cert_chain_temp = Some(SpdmCertChainBuffer::default());
 
-        let _ = context
-            .handle_deliver_encapsulated_reponse(4294836221, &data)
-            .await
-            .is_err();
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) = context.handle_deliver_encapsulated_reponse(&data, &mut writer);
+        assert!(status.is_ok());
     }
     // TCD:
     // - id: 0
@@ -134,10 +134,11 @@ async fn fuzz_handle_deliver_encapsulated_reponse(data: Arc<Vec<u8>>) {
 
         context.common.peer_info.peer_cert_chain_temp = Some(SpdmCertChainBuffer::default());
 
-        let _ = context
-            .handle_deliver_encapsulated_reponse(4294836221, &data)
-            .await
-            .is_err();
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) = context.handle_deliver_encapsulated_reponse(&data, &mut writer);
+
+        assert!(status.is_ok());
     }
 }
 

diff --git a/fuzz-target/responder/digest_rsp/Cargo.toml b/fuzz-target/responder/digest_rsp/Cargo.toml
@@ -14,6 +14,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 default = ["hashed-transcript-data"]

diff --git a/fuzz-target/responder/digest_rsp/src/main.rs b/fuzz-target/responder/digest_rsp/src/main.rs
@@ -55,7 +55,10 @@ async fn fuzz_handle_spdm_digest(data: Arc<Vec<u8>>) {
             .runtime_info
             .set_connection_state(SpdmConnectionState::SpdmConnectionNegotiated);
 
-        let _ = context.handle_spdm_digest(&data, None).await.is_ok();
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) = context.handle_spdm_digest(&data, None, &mut writer);
+        assert!(status.is_ok());
     }
     // TCD:
     // - id: 0
@@ -107,10 +110,11 @@ async fn fuzz_handle_spdm_digest(data: Arc<Vec<u8>>) {
             .runtime_info
             .set_connection_state(SpdmConnectionState::SpdmConnectionNegotiated);
 
-        let _ = context
-            .handle_spdm_digest(&data, Some(4294836221))
-            .await
-            .is_ok();
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) =
+            context.handle_spdm_digest(&data, Some(4294836221), &mut writer);
+        assert!(status.is_ok());
     }
 }
 

diff --git a/fuzz-target/responder/end_session_rsp/Cargo.toml b/fuzz-target/responder/end_session_rsp/Cargo.toml
@@ -13,6 +13,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 fuzzlogfile = []

diff --git a/fuzz-target/responder/end_session_rsp/src/main.rs b/fuzz-target/responder/end_session_rsp/src/main.rs
@@ -42,7 +42,10 @@ async fn fuzz_handle_spdm_end_session(data: Arc<Vec<u8>>) {
         SpdmKeyScheduleAlgo::SPDM_KEY_SCHEDULE,
     );
 
-    context.handle_spdm_end_session(4294901758, &data).await;
+    let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+    let mut writer = codec::Writer::init(&mut response_buffer);
+    let (status, send_buffer) = context.handle_spdm_end_session(4294901758, &data, &mut writer);
+    assert!(status.is_ok());
 }
 
 #[cfg(not(feature = "use_libfuzzer"))]

diff --git a/fuzz-target/responder/finish_rsp/Cargo.toml b/fuzz-target/responder/finish_rsp/Cargo.toml
@@ -13,6 +13,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 default = ["hashed-transcript-data"]

diff --git a/fuzz-target/responder/finish_rsp/src/main.rs b/fuzz-target/responder/finish_rsp/src/main.rs
@@ -83,7 +83,11 @@ async fn fuzz_handle_spdm_finish(data: Arc<Vec<u8>>) {
             .common
             .runtime_info
             .set_last_session_id(Some(4294836221));
-        let _ = context.handle_spdm_finish(4294836221, &data).await.is_ok();
+
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) = context.handle_spdm_finish(4294836221, &data, &mut writer);
+        // assert!(status.is_ok());
     }
     // TCD:
     // - id: 0
@@ -148,7 +152,11 @@ async fn fuzz_handle_spdm_finish(data: Arc<Vec<u8>>) {
             .common
             .runtime_info
             .set_last_session_id(Some(4294836221));
-        let _ = context.handle_spdm_finish(4294836221, &data).await.is_ok();
+
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) = context.handle_spdm_finish(4294836221, &data, &mut writer);
+        // assert!(status.is_ok());
     }
     // TCD:
     // - id: 0
@@ -212,7 +220,11 @@ async fn fuzz_handle_spdm_finish(data: Arc<Vec<u8>>) {
             .common
             .runtime_info
             .set_last_session_id(Some(4294836221));
-        let _ = context.handle_spdm_finish(4294836221, &data).await.is_ok();
+
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) = context.handle_spdm_finish(4294836221, &data, &mut writer);
+        // assert!(status.is_ok());
     }
     // TCD:
     // - id: 0
@@ -282,7 +294,11 @@ async fn fuzz_handle_spdm_finish(data: Arc<Vec<u8>>) {
             .common
             .runtime_info
             .set_last_session_id(Some(4294836221));
-        let _ = context.handle_spdm_finish(4294836221, &data).await.is_ok();
+
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) = context.handle_spdm_finish(4294836221, &data, &mut writer);
+        // assert!(status.is_ok());
     }
     // TCD:
     // - id: 0
@@ -351,7 +367,11 @@ async fn fuzz_handle_spdm_finish(data: Arc<Vec<u8>>) {
             .common
             .runtime_info
             .set_last_session_id(Some(4294836221));
-        let _ = context.handle_spdm_finish(4294836221, &data).await.is_ok();
+
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) = context.handle_spdm_finish(4294836221, &data, &mut writer);
+        // assert!(status.is_ok());
     }
 }
 fn main() {

diff --git a/fuzz-target/responder/get_encapsulated_request_rsp/Cargo.toml b/fuzz-target/responder/get_encapsulated_request_rsp/Cargo.toml
@@ -14,6 +14,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 default = ["hashed-transcript-data", "mut-auth"]

diff --git a/fuzz-target/responder/get_encapsulated_request_rsp/src/main.rs b/fuzz-target/responder/get_encapsulated_request_rsp/src/main.rs
@@ -51,10 +51,10 @@ async fn fuzz_handle_get_encapsulated_request(data: Arc<Vec<u8>>) {
 
         context.common.peer_info.peer_cert_chain_temp = Some(SpdmCertChainBuffer::default());
 
-        let _ = context
-            .handle_get_encapsulated_request(4294836221, &data)
-            .await
-            .is_err();
+        let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+        let mut writer = codec::Writer::init(&mut response_buffer);
+        let (status, send_buffer) = context.handle_get_encapsulated_request(&data, &mut writer);
+        // assert!(status.is_ok());
     }
 }
 

diff --git a/fuzz-target/responder/heartbeat_rsp/Cargo.toml b/fuzz-target/responder/heartbeat_rsp/Cargo.toml
@@ -13,6 +13,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 fuzzlogfile = []

diff --git a/fuzz-target/responder/heartbeat_rsp/src/main.rs b/fuzz-target/responder/heartbeat_rsp/src/main.rs
@@ -42,7 +42,10 @@ async fn fuzz_handle_spdm_heartbeat(data: Arc<Vec<u8>>) {
         SpdmKeyScheduleAlgo::SPDM_KEY_SCHEDULE,
     );
 
-    context.handle_spdm_heartbeat(4294901758, &data).await;
+    let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+    let mut writer = codec::Writer::init(&mut response_buffer);
+    let (status, send_buffer) = context.handle_spdm_heartbeat(4294901758, &data, &mut writer);
+    assert!(status.is_ok());
 }
 
 #[cfg(not(feature = "use_libfuzzer"))]

diff --git a/fuzz-target/responder/key_update_rsp/Cargo.toml b/fuzz-target/responder/key_update_rsp/Cargo.toml
@@ -13,6 +13,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 fuzzlogfile = []

diff --git a/fuzz-target/responder/key_update_rsp/src/main.rs b/fuzz-target/responder/key_update_rsp/src/main.rs
@@ -42,7 +42,10 @@ async fn fuzz_handle_spdm_key_update(data: Arc<Vec<u8>>) {
         SpdmKeyScheduleAlgo::SPDM_KEY_SCHEDULE,
     );
 
-    context.handle_spdm_key_update(4294901758, &data).await;
+    let mut response_buffer = [0u8; spdmlib::config::MAX_SPDM_MSG_SIZE];
+    let mut writer = codec::Writer::init(&mut response_buffer);
+    let (status, send_buffer) = context.handle_spdm_key_update(4294901758, &data, &mut writer);
+    assert!(status.is_ok());
 }
 
 #[cfg(not(feature = "use_libfuzzer"))]

diff --git a/fuzz-target/responder/keyexchange_rsp/Cargo.toml b/fuzz-target/responder/keyexchange_rsp/Cargo.toml
@@ -14,6 +14,7 @@ async-trait = "0.1.71"
 async-recursion = "1.0.4"
 spin = { version = "0.9.8" }
 executor = { path = "../../../executor" }
+codec = {path= "../../../codec"}
 
 [features]
 fuzzlogfile = []