Let responder handlers upward propagate spdm status when error happens

Author: IntelCaisui

spdmlib/src/responder/algorithm_rsp.rs

@@ -20,8 +20,7 @@ impl ResponderContext {
         bytes: &[u8],
         writer: &'a mut Writer,
     ) -> (SpdmResult, Option<&'a [u8]>) {
-        let (_, rsp_slice) = self.write_spdm_algorithm(bytes, writer);
-        (Ok(()), rsp_slice)
+        self.write_spdm_algorithm(bytes, writer)
     }
 
     pub fn write_spdm_algorithm<'a>(

spdmlib/src/responder/capability_rsp.rs

@@ -18,8 +18,7 @@ impl ResponderContext {
         bytes: &[u8],
         writer: &'a mut Writer,
     ) -> (SpdmResult, Option<&'a [u8]>) {
-        let (_, rsp_slice) = self.write_spdm_capability_response(bytes, writer);
-        (Ok(()), rsp_slice)
+        self.write_spdm_capability_response(bytes, writer)
     }
 
     pub fn write_spdm_capability_response<'a>(

spdmlib/src/responder/certificate_rsp.rs

@@ -19,8 +19,7 @@ impl ResponderContext {
         session_id: Option<u32>,
         writer: &'a mut Writer,
     ) -> (SpdmResult, Option<&'a [u8]>) {
-        let (_, rsp_slice) = self.write_spdm_certificate_response(session_id, bytes, writer);
-        (Ok(()), rsp_slice)
+        self.write_spdm_certificate_response(session_id, bytes, writer)
     }
 
     fn write_spdm_certificate_response<'a>(

spdmlib/src/responder/challenge_rsp.rs

@@ -26,8 +26,7 @@ impl ResponderContext {
         bytes: &[u8],
         writer: &'a mut Writer,
     ) -> (SpdmResult, Option<&'a [u8]>) {
-        let (_, rsp_slice) = self.write_spdm_challenge_response(bytes, writer);
-        (Ok(()), rsp_slice)
+        self.write_spdm_challenge_response(bytes, writer)
     }
 
     pub fn write_spdm_challenge_response<'a>(

spdmlib/src/responder/context.rs

@@ -805,15 +805,6 @@ impl ResponderContext {
             self.common.chunk_context.chunk_status = common::SpdmChunkStatus::Idle;
         }
 
-        // Propagate the error upward if it is VDM defined error, otherwise remap to Ok.
-        let result = result.or_else(|e| {
-            if e.severity == StatusSeverity::ERROR && matches!(e.status_code, StatusCode::VDM(_)) {
-                Err(e)
-            } else {
-                Ok(())
-            }
-        });
-
         (result, rsp_slice)
     }
 
@@ -1085,8 +1076,7 @@ impl ResponderContext {
             self.common.chunk_context.chunk_message_data.fill(0);
         }
 
-        // Error Response contained in rsp_slice, remap error to Ok(()) for dispatcher.
-        (Ok(()), rsp_slice)
+        (result, rsp_slice)
     }
 
     #[cfg(feature = "chunk-cap")]

spdmlib/src/responder/digest_rsp.rs

@@ -23,8 +23,7 @@ impl ResponderContext {
         session_id: Option<u32>,
         writer: &'a mut Writer,
     ) -> (SpdmResult, Option<&'a [u8]>) {
-        let (_, rsp_slice) = self.write_spdm_digest_response(session_id, bytes, writer);
-        (Ok(()), rsp_slice)
+        self.write_spdm_digest_response(session_id, bytes, writer)
     }
 
     fn write_spdm_digest_response<'a>(

spdmlib/src/responder/encap_rsp.rs

@@ -27,18 +27,14 @@ impl ResponderContext {
         bytes: &[u8],
         writer: &'a mut Writer,
     ) -> (SpdmResult, Option<&'a [u8]>) {
-        if self
-            .encap_check_version_cap_state(
-                SpdmRequestResponseCode::SpdmRequestGetEncapsulatedRequest.get_u8(),
-                writer,
-            )
-            .is_err()
-        {
-            (Ok(()), Some(writer.used_slice()))
-        } else {
-            let (_, rsp_slice) = self.write_encap_request_response(bytes, writer);
-            (Ok(()), rsp_slice)
+        let result = self.encap_check_version_cap_state(
+            SpdmRequestResponseCode::SpdmRequestGetEncapsulatedRequest.get_u8(),
+            writer,
+        );
+        if result.is_err() {
+            return (result, Some(writer.used_slice()));
         }
+        self.write_encap_request_response(bytes, writer)
     }
 
     fn write_encap_request_response<'a>(

spdmlib/src/responder/end_session_rsp.rs

@@ -33,8 +33,7 @@ impl ResponderContext {
             stop_watchdog(session_id);
         }
 
-        let (_, rsp_slice) = self.write_spdm_end_session_response(session_id, bytes, writer);
-        (Ok(()), rsp_slice)
+        self.write_spdm_end_session_response(session_id, bytes, writer)
     }
 
     pub fn write_spdm_end_session_response<'a>(

spdmlib/src/responder/error_rsp.rs

@@ -40,8 +40,7 @@ impl ResponderContext {
         bytes: &[u8],
         writer: &'a mut Writer,
     ) -> (SpdmResult, Option<&'a [u8]>) {
-        let (_, rsp_slice) = self.write_error_response(error_code, bytes, writer);
-        (Ok(()), rsp_slice)
+        self.write_error_response(error_code, bytes, writer)
     }
 
     pub fn write_error_response<'a>(

spdmlib/src/responder/finish_rsp.rs

@@ -34,7 +34,7 @@ impl ResponderContext {
             }
         }
 
-        (Ok(()), rsp_slice)
+        (result, rsp_slice)
     }
 
     // Return true on success, false otherwise.