Skip to content

Split negotiate_algorithm in send_request and process_response #3523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
itsManjeet wants to merge 2 commits into from
Closed

Split negotiate_algorithm in send_request and process_response #3523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b16dc7
split libspdm_try_get_capabilities
itsManjeet Jan 22, 2026
4ba142e
Split negotiate_algorithm in send_request and process_response
itsManjeet Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 77 additions & 30 deletions library/spdm_requester_lib/libspdm_req_get_capabilities.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,40 +197,21 @@ static bool validate_responder_capability(uint32_t capabilities_flag, uint8_t ve
return true;
}

/**
* This function sends GET_CAPABILITIES and receives CAPABILITIES.
*
* @param spdm_context A pointer to the SPDM context.
*
* @retval LIBSPDM_STATUS_SUCCESS
* GET_CAPABILITIES was sent and CAPABILITIES was received.
* @retval LIBSPDM_STATUS_INVALID_STATE_LOCAL
* Cannot send GET_CAPABILITIES due to Requester's state. Send GET_VERSION first.
* @retval LIBSPDM_STATUS_INVALID_MSG_SIZE
* The size of the CAPABILITIES response is invalid.
* @retval LIBSPDM_STATUS_INVALID_MSG_FIELD
* The CAPABILITIES response contains one or more invalid fields.
* @retval LIBSPDM_STATUS_ERROR_PEER
* The Responder returned an unexpected error.
* @retval LIBSPDM_STATUS_BUSY_PEER
* The Responder continually returned Busy error messages.
* @retval LIBSPDM_STATUS_RESYNCH_PEER
* The Responder returned a RequestResynch error message.
* @retval LIBSPDM_STATUS_BUFFER_FULL
* The buffer used to store transcripts is exhausted.
**/
static libspdm_return_t libspdm_try_get_capabilities(libspdm_context_t *spdm_context,
size_t *supported_algs_length,
void *supported_algs)
static libspdm_return_t
libspdm_get_capabilities_send_request(libspdm_context_t *spdm_context,
spdm_get_capabilities_request_t **request,
size_t *request_size,
size_t *supported_algs_length,
void *supported_algs)
{
libspdm_return_t status;
spdm_get_capabilities_request_t *spdm_request;
size_t spdm_request_size;
spdm_capabilities_response_t *spdm_response;
size_t spdm_response_size;
uint8_t *message;
size_t message_size;
size_t transport_header_size;
spdm_get_capabilities_request_t *spdm_request;
size_t spdm_request_size;

spdm_request = *request;

/* -=[Verify State Phase]=- */
if (spdm_context->connection_info.connection_state != LIBSPDM_CONNECTION_STATE_AFTER_VERSION) {
Expand Down Expand Up @@ -305,14 +286,34 @@ static libspdm_return_t libspdm_try_get_capabilities(libspdm_context_t *spdm_con
return status;
}
libspdm_release_sender_buffer (spdm_context);
spdm_request = (void *)spdm_context->last_spdm_request;
*request = (void *)spdm_context->last_spdm_request;
*request_size = spdm_request_size;

return status;
}

static libspdm_return_t
libspdm_get_capabilities_process_response(libspdm_context_t *spdm_context,
spdm_get_capabilities_request_t *spdm_request,
size_t spdm_request_size,
size_t *supported_algs_length,
void *supported_algs)
{
libspdm_return_t status;
spdm_capabilities_response_t *spdm_response;
size_t spdm_response_size;
uint8_t *message;
size_t message_size;
size_t transport_header_size;

/* -=[Receive Response Phase]=- */
transport_header_size = spdm_context->local_context.capability.transport_header_size;
status = libspdm_acquire_receiver_buffer (spdm_context, &message_size, (void **)&message);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
}
LIBSPDM_ASSERT (message_size >= transport_header_size);
(void)(transport_header_size);
spdm_response = (void *)(message);
spdm_response_size = message_size;

Expand Down Expand Up @@ -460,6 +461,52 @@ static libspdm_return_t libspdm_try_get_capabilities(libspdm_context_t *spdm_con
libspdm_release_receiver_buffer (spdm_context);
return status;
}
/**
* This function sends GET_CAPABILITIES and receives CAPABILITIES.
*
* @param spdm_context A pointer to the SPDM context.
*
* @retval LIBSPDM_STATUS_SUCCESS
* GET_CAPABILITIES was sent and CAPABILITIES was received.
* @retval LIBSPDM_STATUS_INVALID_STATE_LOCAL
* Cannot send GET_CAPABILITIES due to Requester's state. Send GET_VERSION first.
* @retval LIBSPDM_STATUS_INVALID_MSG_SIZE
* The size of the CAPABILITIES response is invalid.
* @retval LIBSPDM_STATUS_INVALID_MSG_FIELD
* The CAPABILITIES response contains one or more invalid fields.
* @retval LIBSPDM_STATUS_ERROR_PEER
* The Responder returned an unexpected error.
* @retval LIBSPDM_STATUS_BUSY_PEER
* The Responder continually returned Busy error messages.
* @retval LIBSPDM_STATUS_RESYNCH_PEER
* The Responder returned a RequestResynch error message.
* @retval LIBSPDM_STATUS_BUFFER_FULL
* The buffer used to store transcripts is exhausted.
**/
static libspdm_return_t libspdm_try_get_capabilities(libspdm_context_t *spdm_context,
size_t *supported_algs_length,
void *supported_algs)
{
libspdm_return_t status;
spdm_get_capabilities_request_t *spdm_request;
size_t spdm_request_size;

status = libspdm_get_capabilities_send_request(
spdm_context,
&spdm_request, &spdm_request_size,
supported_algs_length, supported_algs
);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
}

status = libspdm_get_capabilities_process_response(
spdm_context,
spdm_request, spdm_request_size,
supported_algs_length, supported_algs
);
return status;
}

libspdm_return_t libspdm_get_capabilities(libspdm_context_t *spdm_context)
{
Expand Down
109 changes: 74 additions & 35 deletions library/spdm_requester_lib/libspdm_req_negotiate_algorithms.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,48 +45,18 @@ typedef struct {
} libspdm_algorithms_response_max_t;
#pragma pack()

/**
* This function sends NEGOTIATE_ALGORITHMS and receives ALGORITHMS.
*
* @param spdm_context A pointer to the SPDM context.
*
* @retval LIBSPDM_STATUS_SUCCESS
* NEGOTIATE_ALGORITHMS was sent and ALGORITHMS was received.
* @retval LIBSPDM_STATUS_INVALID_STATE_LOCAL
* Cannot send NEGOTIATE_ALGORITHMS due to Requester's state.
* @retval LIBSPDM_STATUS_INVALID_MSG_SIZE
* The size of the ALGORITHMS response is invalid.
* @retval LIBSPDM_STATUS_INVALID_MSG_FIELD
* The ALGORITHMS response contains one or more invalid fields.
* @retval LIBSPDM_STATUS_ERROR_PEER
* The Responder returned an unexpected error.
* @retval LIBSPDM_STATUS_BUSY_PEER
* The Responder continually returned Busy error messages.
* @retval LIBSPDM_STATUS_RESYNCH_PEER
* The Responder returned a RequestResynch error message.
* @retval LIBSPDM_STATUS_BUFFER_FULL
* The buffer used to store transcripts is exhausted.
* @retval LIBSPDM_STATUS_NEGOTIATION_FAIL
* The Requester and Responder could not agree on mutual algorithms.
* Note: This return value may be removed in the future.
**/
static libspdm_return_t libspdm_try_negotiate_algorithms(libspdm_context_t *spdm_context)
static libspdm_return_t
libspdm_negotiate_algorithms_send_request(libspdm_context_t *spdm_context,
libspdm_negotiate_algorithms_request_mine_t **request,
size_t *request_size)
{
libspdm_return_t status;
libspdm_negotiate_algorithms_request_mine_t *spdm_request;
size_t spdm_request_size;
libspdm_algorithms_response_max_t *spdm_response;
size_t spdm_response_size;
uint32_t algo_size;
uint32_t pqc_algo_size;
size_t index = 0;
spdm_negotiate_algorithms_common_struct_table_t *struct_table;
uint8_t fixed_alg_size;
uint8_t ext_alg_count;
uint8_t *message;
size_t message_size;
size_t transport_header_size;
uint8_t alg_type_pre;
uint8_t req_param1 = 0;

/* -=[Verify State Phase]=- */
Expand Down Expand Up @@ -181,6 +151,7 @@ static libspdm_return_t libspdm_try_negotiate_algorithms(libspdm_context_t *spdm
}
break;
default:
libspdm_release_sender_buffer (spdm_context);
return LIBSPDM_STATUS_INVALID_MSG_FIELD;
}
if (spdm_context->connection_info.multi_key_conn_rsp) {
Expand Down Expand Up @@ -265,14 +236,40 @@ static libspdm_return_t libspdm_try_negotiate_algorithms(libspdm_context_t *spdm
return status;
}
libspdm_release_sender_buffer (spdm_context);
spdm_request = (void *)spdm_context->last_spdm_request;
*request = (void *)spdm_context->last_spdm_request;
*request_size = spdm_request_size;

return status;
}

static libspdm_return_t
libspdm_negotiate_algorithms_process_response(
libspdm_context_t *spdm_context,
libspdm_negotiate_algorithms_request_mine_t *spdm_request,
size_t spdm_request_size)
{
libspdm_return_t status;
libspdm_algorithms_response_max_t *spdm_response;
size_t spdm_response_size;
uint32_t algo_size;
uint32_t pqc_algo_size;
size_t index;
spdm_negotiate_algorithms_common_struct_table_t *struct_table;
uint8_t fixed_alg_size;
uint8_t ext_alg_count;
uint8_t *message;
size_t message_size;
size_t transport_header_size;
uint8_t alg_type_pre;

/* -=[Receive Response Phase]=- */
transport_header_size = spdm_context->local_context.capability.transport_header_size;
status = libspdm_acquire_receiver_buffer (spdm_context, &message_size, (void **)&message);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
}
LIBSPDM_ASSERT (message_size >= transport_header_size);
(void)(transport_header_size);
spdm_response = (void *)(message);
spdm_response_size = message_size;

Expand Down Expand Up @@ -758,6 +755,48 @@ static libspdm_return_t libspdm_try_negotiate_algorithms(libspdm_context_t *spdm
return status;
}

/**
* This function sends NEGOTIATE_ALGORITHMS and receives ALGORITHMS.
*
* @param spdm_context A pointer to the SPDM context.
*
* @retval LIBSPDM_STATUS_SUCCESS
* NEGOTIATE_ALGORITHMS was sent and ALGORITHMS was received.
* @retval LIBSPDM_STATUS_INVALID_STATE_LOCAL
* Cannot send NEGOTIATE_ALGORITHMS due to Requester's state.
* @retval LIBSPDM_STATUS_INVALID_MSG_SIZE
* The size of the ALGORITHMS response is invalid.
* @retval LIBSPDM_STATUS_INVALID_MSG_FIELD
* The ALGORITHMS response contains one or more invalid fields.
* @retval LIBSPDM_STATUS_ERROR_PEER
* The Responder returned an unexpected error.
* @retval LIBSPDM_STATUS_BUSY_PEER
* The Responder continually returned Busy error messages.
* @retval LIBSPDM_STATUS_RESYNCH_PEER
* The Responder returned a RequestResynch error message.
* @retval LIBSPDM_STATUS_BUFFER_FULL
* The buffer used to store transcripts is exhausted.
* @retval LIBSPDM_STATUS_NEGOTIATION_FAIL
* The Requester and Responder could not agree on mutual algorithms.
* Note: This return value may be removed in the future.
**/
static libspdm_return_t libspdm_try_negotiate_algorithms(libspdm_context_t *spdm_context)
{
libspdm_return_t status;
libspdm_negotiate_algorithms_request_mine_t *spdm_request;
size_t spdm_request_size;

status = libspdm_negotiate_algorithms_send_request(
spdm_context, &spdm_request, &spdm_request_size);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
}

status = libspdm_negotiate_algorithms_process_response(
spdm_context, spdm_request, spdm_request_size);
return status;
}

libspdm_return_t libspdm_negotiate_algorithms(libspdm_context_t *spdm_context)
{
size_t retry;
Expand Down
Loading