Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions library/spdm_common_lib/libspdm_com_opaque_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,9 @@ bool libspdm_process_general_opaque_data_check(libspdm_context_t *spdm_context,
return false;
}

opaque_element_data_len = *(uint16_t *)((size_t)(opaque_element_table_header + 1) +
opaque_element_table_header->vendor_len);
opaque_element_data_len = libspdm_read_uint16(
(const uint8_t *)(opaque_element_table_header + 1) +
opaque_element_table_header->vendor_len);

current_element_len = sizeof(opaque_element_table_header_t) +
opaque_element_table_header->vendor_len +
Expand Down
6 changes: 3 additions & 3 deletions library/spdm_requester_lib/libspdm_req_get_endpoint_info.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Copyright Notice:
* Copyright 2025 DMTF. All rights reserved.
* Copyright 2025-2026 DMTF. All rights reserved.
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
**/

Expand Down Expand Up @@ -240,7 +240,7 @@ static libspdm_return_t libspdm_try_get_endpoint_info(libspdm_context_t *spdm_co
}

ptr += SPDM_NONCE_SIZE;
ep_info_data_len = *(uint32_t *) ptr;
ep_info_data_len = libspdm_read_uint32(ptr);
if (spdm_response_size !=
sizeof(spdm_endpoint_info_response_t) + SPDM_NONCE_SIZE +
signature_size + ep_info_data_len + sizeof(uint32_t)) {
Expand Down Expand Up @@ -286,7 +286,7 @@ static libspdm_return_t libspdm_try_get_endpoint_info(libspdm_context_t *spdm_co

/* nonce and signature not present */
ptr = (uint8_t *)(spdm_response + 1);
ep_info_data_len = *(uint32_t *) ptr;
ep_info_data_len = libspdm_read_uint32(ptr);
if (spdm_response_size <
sizeof(spdm_endpoint_info_response_t) + ep_info_data_len + sizeof(uint32_t)) {
status = LIBSPDM_STATUS_INVALID_MSG_SIZE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@ libspdm_return_t libspdm_handle_error_large_response(
break;
}

large_response_size = *(uint32_t*) (spdm_response + 1);
chunk_ptr = (uint8_t*) (((uint32_t*) (spdm_response + 1)) + 1);
large_response_size = libspdm_read_uint32((const uint8_t *)(spdm_response + 1));
chunk_ptr = (uint8_t *)(spdm_response + 1) + sizeof(uint32_t);

if (spdm_response->chunk_size > large_response_size) {
status = LIBSPDM_STATUS_INVALID_MSG_FIELD;
Expand Down
3 changes: 2 additions & 1 deletion library/spdm_requester_lib/libspdm_req_send_receive.c
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,8 @@ static libspdm_return_t libspdm_handle_large_request(
}

if (send_info->chunk_seq_no == 0) {
*(uint32_t *)(spdm_request + 1) = (uint32_t)send_info->large_message_size;
libspdm_write_uint32((uint8_t *)(spdm_request + 1),
(uint32_t)send_info->large_message_size);
chunk_ptr += sizeof(uint32_t);
copy_size -= sizeof(uint32_t);
}
Expand Down
4 changes: 2 additions & 2 deletions os_stub/spdm_device_secret_lib_sample/psk.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Copyright Notice:
* Copyright 2024 DMTF. All rights reserved.
* Copyright 2024-2026 DMTF. All rights reserved.
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
**/

Expand Down Expand Up @@ -172,7 +172,7 @@ bool libspdm_psk_master_secret_hkdf_expand(
return result;
}

*(uint16_t *)m_libspdm_bin_str0 = (uint16_t)hash_size;
libspdm_write_uint16((uint8_t *)m_libspdm_bin_str0, (uint16_t)hash_size);
/* patch the version*/
m_libspdm_bin_str0[6] = (char)('0' + ((spdm_version >> 12) & 0xF));
m_libspdm_bin_str0[8] = (char)('0' + ((spdm_version >> 8) & 0xF));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Copyright Notice:
* Copyright 2021-2025 DMTF. All rights reserved.
* Copyright 2021-2026 DMTF. All rights reserved.
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
**/

Expand Down Expand Up @@ -85,7 +85,7 @@ libspdm_return_t libspdm_device_receive_message(void *spdm_context, size_t *resp
ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)ptr = 0;
libspdm_write_uint16(ptr, 0);
ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Copyright Notice:
* Copyright 2021-2025 DMTF. All rights reserved.
* Copyright 2021-2026 DMTF. All rights reserved.
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
**/

Expand Down Expand Up @@ -52,7 +52,8 @@ size_t libspdm_test_get_key_exchange_request_size(const void *spdm_context, cons
}

opaque_length =
*(uint16_t *)((size_t)buffer + sizeof(spdm_key_exchange_request_t) + dhe_key_size);
libspdm_read_uint16((const uint8_t *)buffer +
sizeof(spdm_key_exchange_request_t) + dhe_key_size);
message_size += opaque_length;
if (buffer_size < message_size) {
return buffer_size;
Expand Down Expand Up @@ -169,7 +170,7 @@ libspdm_return_t libspdm_device_receive_message(void *spdm_context, size_t *resp
ptr += dhe_key_size;
/* libspdm_zero_mem (ptr, hash_size);
* ptr += hash_size;*/
*(uint16_t *)ptr = (uint16_t)opaque_key_exchange_rsp_size;
libspdm_write_uint16(ptr, (uint16_t)opaque_key_exchange_rsp_size);
ptr += sizeof(uint16_t);
libspdm_build_opaque_data_version_selection_data(spdm_context,
SECURED_SPDM_VERSION_11 <<
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Copyright Notice:
* Copyright 2021-2024 DMTF. All rights reserved.
* Copyright 2021-2026 DMTF. All rights reserved.
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
**/

Expand Down Expand Up @@ -91,7 +91,7 @@ void libspdm_test_responder_key_exchange_case1(void **State)
libspdm_dhe_free(m_libspdm_use_dhe_algo, dhe_context);
opaque_key_exchange_req_size =
libspdm_get_opaque_data_supported_version_data_size(spdm_context);
*(uint16_t *)ptr = (uint16_t)opaque_key_exchange_req_size;
libspdm_write_uint16(ptr, (uint16_t)opaque_key_exchange_req_size);
ptr += sizeof(uint16_t);
libspdm_build_opaque_data_supported_version_data(spdm_context, &opaque_key_exchange_req_size,
ptr);
Expand Down Expand Up @@ -159,7 +159,7 @@ void libspdm_test_responder_key_exchange_case2(void **State)
libspdm_dhe_free(m_libspdm_use_dhe_algo, dhe_context);
opaque_key_exchange_req_size =
libspdm_get_opaque_data_supported_version_data_size(spdm_context);
*(uint16_t *)ptr = (uint16_t)opaque_key_exchange_req_size;
libspdm_write_uint16(ptr, (uint16_t)opaque_key_exchange_req_size);
ptr += sizeof(uint16_t);
libspdm_build_opaque_data_supported_version_data(spdm_context, &opaque_key_exchange_req_size,
ptr);
Expand Down Expand Up @@ -291,7 +291,7 @@ void libspdm_test_responder_key_exchange_case4(void **State)
libspdm_dhe_free(m_libspdm_use_dhe_algo, dhe_context);
opaque_key_exchange_req_size =
libspdm_get_opaque_data_supported_version_data_size(spdm_context);
*(uint16_t *)ptr = (uint16_t)opaque_key_exchange_req_size;
libspdm_write_uint16(ptr, (uint16_t)opaque_key_exchange_req_size);
ptr += sizeof(uint16_t);
libspdm_build_opaque_data_supported_version_data(spdm_context, &opaque_key_exchange_req_size,
ptr);
Expand Down Expand Up @@ -368,7 +368,7 @@ void libspdm_test_responder_key_exchange_case5(void **State)
libspdm_dhe_free(m_libspdm_use_dhe_algo, dhe_context);
opaque_key_exchange_req_size =
libspdm_get_opaque_data_supported_version_data_size(spdm_context);
*(uint16_t *)ptr = (uint16_t)opaque_key_exchange_req_size;
libspdm_write_uint16(ptr, (uint16_t)opaque_key_exchange_req_size);
ptr += sizeof(uint16_t);
libspdm_build_opaque_data_supported_version_data(spdm_context, &opaque_key_exchange_req_size,
ptr);
Expand Down Expand Up @@ -436,7 +436,7 @@ void libspdm_test_responder_key_exchange_case6(void **State)
libspdm_dhe_free(m_libspdm_use_dhe_algo, dhe_context);
opaque_key_exchange_req_size =
libspdm_get_opaque_data_supported_version_data_size(spdm_context);
*(uint16_t *)ptr = (uint16_t)opaque_key_exchange_req_size;
libspdm_write_uint16(ptr, (uint16_t)opaque_key_exchange_req_size);
ptr += sizeof(uint16_t);
libspdm_build_opaque_data_supported_version_data(spdm_context, &opaque_key_exchange_req_size,
ptr);
Expand Down Expand Up @@ -503,7 +503,7 @@ void libspdm_test_responder_key_exchange_case7(void **State)
libspdm_dhe_free(m_libspdm_use_dhe_algo, dhe_context);
opaque_key_exchange_req_size =
libspdm_get_opaque_data_supported_version_data_size(spdm_context);
*(uint16_t *)ptr = (uint16_t)opaque_key_exchange_req_size;
libspdm_write_uint16(ptr, (uint16_t)opaque_key_exchange_req_size);
ptr += sizeof(uint16_t);
libspdm_build_opaque_data_supported_version_data(spdm_context, &opaque_key_exchange_req_size,
ptr);
Expand Down Expand Up @@ -592,7 +592,7 @@ void libspdm_test_responder_key_exchange_case8(void **State)
libspdm_dhe_free(m_libspdm_use_dhe_algo, dhe_context);
opaque_key_exchange_req_size =
libspdm_get_opaque_data_supported_version_data_size(spdm_context);
*(uint16_t *)ptr = (uint16_t)opaque_key_exchange_req_size;
libspdm_write_uint16(ptr, (uint16_t)opaque_key_exchange_req_size);
ptr += sizeof(uint16_t);
libspdm_build_opaque_data_supported_version_data(spdm_context, &opaque_key_exchange_req_size,
ptr);
Expand Down
40 changes: 20 additions & 20 deletions unit_test/test_spdm_requester/challenge.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ static libspdm_return_t receive_message(
ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)ptr = 0;
libspdm_write_uint16(ptr, 0);
ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer) -
Expand Down Expand Up @@ -279,7 +279,7 @@ static libspdm_return_t receive_message(
ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)ptr = 0;
libspdm_write_uint16(ptr, 0);
ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer) -
Expand Down Expand Up @@ -419,7 +419,7 @@ static libspdm_return_t receive_message(
ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)ptr = 0;
libspdm_write_uint16(ptr, 0);
ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer)
Expand Down Expand Up @@ -571,7 +571,7 @@ static libspdm_return_t receive_message(
ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)ptr = 0;
libspdm_write_uint16(ptr, 0);
ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer)
Expand Down Expand Up @@ -649,7 +649,7 @@ static libspdm_return_t receive_message(
Ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (Ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* Ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)Ptr = 0;
libspdm_write_uint16(Ptr, 0);
Ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer) -
Expand Down Expand Up @@ -743,7 +743,7 @@ static libspdm_return_t receive_message(
Ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (Ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* Ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)Ptr = 0;
libspdm_write_uint16(Ptr, 0);
Ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer) -
Expand Down Expand Up @@ -817,7 +817,7 @@ static libspdm_return_t receive_message(
Ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (Ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* Ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)Ptr = 0;
libspdm_write_uint16(Ptr, 0);
Ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer) -
Expand Down Expand Up @@ -891,7 +891,7 @@ static libspdm_return_t receive_message(
Ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (Ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* Ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)Ptr = 0;
libspdm_write_uint16(Ptr, 0);
Ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer) -
Expand Down Expand Up @@ -965,7 +965,7 @@ static libspdm_return_t receive_message(
Ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (Ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* Ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)Ptr = 0;
libspdm_write_uint16(Ptr, 0);
Ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer) -
Expand Down Expand Up @@ -1039,7 +1039,7 @@ static libspdm_return_t receive_message(
Ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (Ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* Ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)Ptr = (uint16_t)strlen("libspdm");
libspdm_write_uint16(Ptr, (uint16_t)strlen("libspdm"));
Ptr += sizeof(uint16_t);
libspdm_copy_mem(Ptr, (size_t)(*response) + *response_size - (size_t)Ptr, "libspdm",
strlen("libspdm"));
Expand Down Expand Up @@ -1116,7 +1116,7 @@ static libspdm_return_t receive_message(
Ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (Ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* Ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)Ptr = 0;
libspdm_write_uint16(Ptr, 0);
Ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer) -
Expand Down Expand Up @@ -1192,7 +1192,7 @@ static libspdm_return_t receive_message(
Ptr += SPDM_NONCE_SIZE;
libspdm_zero_mem (Ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
Ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);
*(uint16_t *)Ptr = 0;
libspdm_write_uint16(Ptr, 0);
Ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer) -
Expand Down Expand Up @@ -1302,7 +1302,7 @@ static libspdm_return_t receive_message(
ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);
libspdm_get_random_number (SPDM_NONCE_SIZE, ptr);
ptr += SPDM_NONCE_SIZE;
*(uint16_t *)ptr = 0;
libspdm_write_uint16(ptr, 0);
ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer) -
Expand Down Expand Up @@ -1372,7 +1372,7 @@ static libspdm_return_t receive_message(
ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (ptr, spdm_get_hash_size (m_libspdm_use_hash_algo));
* ptr += spdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)ptr = 0;
libspdm_write_uint16(ptr, 0);
ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer) - m_libspdm_local_buffer_size,
Expand Down Expand Up @@ -1458,7 +1458,7 @@ static libspdm_return_t receive_message(
ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)ptr = 0;
libspdm_write_uint16(ptr, 0);
ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer) -
Expand Down Expand Up @@ -1537,7 +1537,7 @@ static libspdm_return_t receive_message(
ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)ptr = 0;
libspdm_write_uint16(ptr, 0);
ptr += sizeof(uint16_t);
libspdm_copy_mem(&m_libspdm_local_buffer[m_libspdm_local_buffer_size],
sizeof(m_libspdm_local_buffer) -
Expand Down Expand Up @@ -1621,7 +1621,7 @@ static libspdm_return_t receive_message(
Ptr += SPDM_NONCE_SIZE;
/* libspdm_zero_mem (Ptr, libspdm_get_hash_size (m_libspdm_use_hash_algo));
* Ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);*/
*(uint16_t *)Ptr = opaque_length;
libspdm_write_uint16(Ptr, opaque_length);
Ptr += sizeof(uint16_t);
libspdm_set_mem(Ptr, opaque_length, 255);
Ptr += opaque_length;
Expand Down Expand Up @@ -1743,7 +1743,7 @@ static libspdm_return_t receive_message(
Ptr += libspdm_get_hash_size (m_libspdm_use_hash_algo);
libspdm_get_random_number (SPDM_NONCE_SIZE, Ptr);
Ptr += SPDM_NONCE_SIZE;
*(uint16_t *)Ptr = (uint16_t)m_libspdm_opaque_data_size;
libspdm_write_uint16(Ptr, (uint16_t)m_libspdm_opaque_data_size);
Ptr += sizeof(uint16_t);
libspdm_copy_mem(Ptr, (size_t)(*response) + *response_size - (size_t)Ptr,
m_libspdm_opaque_data,
Expand Down Expand Up @@ -1818,7 +1818,7 @@ static libspdm_return_t receive_message(
ptr += libspdm_get_hash_size(m_libspdm_use_hash_algo);
libspdm_get_random_number(SPDM_NONCE_SIZE, ptr);
ptr += SPDM_NONCE_SIZE;
*(uint16_t *)ptr = 0;
libspdm_write_uint16(ptr, 0);
ptr += sizeof(uint16_t);
libspdm_copy_mem(ptr, SPDM_REQ_CONTEXT_SIZE, m_requester_context, SPDM_REQ_CONTEXT_SIZE);
ptr += SPDM_REQ_CONTEXT_SIZE;
Expand Down Expand Up @@ -1899,7 +1899,7 @@ static libspdm_return_t receive_message(
ptr += libspdm_get_hash_size(m_libspdm_use_hash_algo);
libspdm_get_random_number(SPDM_NONCE_SIZE, ptr);
ptr += SPDM_NONCE_SIZE;
*(uint16_t *)ptr = 0;
libspdm_write_uint16(ptr, 0);
ptr += sizeof(uint16_t);
libspdm_get_random_number(SPDM_REQ_CONTEXT_SIZE,ptr);
ptr += SPDM_REQ_CONTEXT_SIZE;
Expand Down
Loading