Fixed vendor_id address in libspdm_get_vendor_defined_response

Modified libspdm_test_responder_receive_send_rsp_case2 test to use the new API libspdm_register_vendor_callback_func and parameters for VENDOR_DEFINED_RESPONSE
Fixed type cast warning in libspdm_vendor_request
Fixed type casting warning in libspdm_get_vendor_defined_response

Signed-off-by: Ionut Ursachi <[email protected]>

Author: uvinrg

library/spdm_requester_lib/libspdm_req_vendor_request.c

@@ -217,7 +217,7 @@ libspdm_return_t libspdm_vendor_request(void *spdm_context,
         status = libspdm_try_vendor_request(context,
                                             standard_id,
                                             vendor_id_len, (uint8_t *)vendor_id,
-                                            (uint8_t *)request, request_len,
+                                            (uint8_t *)request, (uint16_t)request_len,
                                             (uint8_t *)response, response_len);
         if ((status != LIBSPDM_STATUS_BUSY_PEER) || (retry == 0)) {
             return status;

library/spdm_responder_lib/libspdm_rsp_vendor_response.c

@@ -65,6 +65,12 @@ libspdm_return_t libspdm_get_vendor_defined_response(libspdm_context_t *spdm_con
                                                response_size, response);
     }
 
+    if (spdm_context->vendor_response_callback == NULL) {
+        return libspdm_generate_error_response(spdm_context,
+                                               SPDM_ERROR_CODE_INVALID_REQUEST, 0,
+                                               response_size, response);
+    }
+
     libspdm_reset_message_buffer_via_request_code(spdm_context, NULL,
                                                   spdm_request->header.request_response_code);
 
@@ -107,8 +113,9 @@ libspdm_return_t libspdm_get_vendor_defined_response(libspdm_context_t *spdm_con
 
     /* assign vendors from request
      * req_data advances by spdm_response->len */
+    uint8_t* temp_vendor_ptr = vendor_id;
     for (i = 0; i < spdm_response->len; i++) {
-        *vendor_id++ = *req_data++;
+        *temp_vendor_ptr++ = *req_data++;
     }
 
     /* advance by payload length, so callback gets actual payload */
@@ -127,8 +134,8 @@ libspdm_return_t libspdm_get_vendor_defined_response(libspdm_context_t *spdm_con
                                                     resp_data, &response_capacity);
 
     /* store back the response payload size */
-    *((uint16_t*)(resp_data - sizeof(uint16_t))) = response_capacity;
-    *response_size = response_capacity + header_length;
+    *((uint16_t*)(resp_data - sizeof(uint16_t))) = (uint16_t)response_capacity;
+    *response_size = response_capacity + (size_t)header_length;
 
     /* We are not caching request and response with libspdm_append_message_b
      * as these are used for secure sessions, so out of scope for us */

unit_test/test_spdm_responder/receive_send.c

@@ -12,12 +12,17 @@
 #define CHUNK_GET_UNIT_TEST_OVERRIDE_DATA_TRANSFER_SIZE (64)
 
 libspdm_return_t my_test_get_response_func(
-    void *spdm_context, const uint32_t *session_id, bool is_app_message,
-    size_t request_size, const void *request, size_t *response_size,
-    void *response)
+    void *spdm_context,
+    uint16_t standard_id,
+    uint8_t vendor_id_len,
+    const void *vendor_id,
+    const void *request,
+    size_t request_len,
+    void *resp,
+    size_t *resp_len)
 {
     /* response message size is greater than the sending transmit buffer size of responder */
-    *response_size = CHUNK_GET_UNIT_TEST_OVERRIDE_DATA_TRANSFER_SIZE + 1;
+    *resp_len = CHUNK_GET_UNIT_TEST_OVERRIDE_DATA_TRANSFER_SIZE + 1;
     return LIBSPDM_STATUS_SUCCESS;
 }
 
@@ -213,7 +218,7 @@ void libspdm_test_responder_receive_send_rsp_case2(void** state)
     libspdm_zero_mem(response, response_size);
 
     /* Make response message size greater than the sending transmit buffer size of responder */
-    spdm_context->get_response_func = (void *)my_test_get_response_func;
+    libspdm_register_vendor_callback_func(spdm_context, my_test_get_response_func);
 
     status = libspdm_build_response(spdm_context, NULL, false,
                                     &response_size, (void**)&response);