Skip to content

Commit 4bf0964

Browse files
Remove unused parameters from internal functions
Signed-off-by: Steven Bellock <sbellock@nvidia.com>
1 parent b4311fd commit 4bf0964

17 files changed

+39
-72
lines changed

include/internal/libspdm_common_lib.h

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ void libspdm_internal_dump_hex(const uint8_t *data, size_t size);
778778
*/
779779
#if LIBSPDM_ENABLE_CAPABILITY_CHUNK_CAP
780780
/* first section */
781-
uint32_t libspdm_get_scratch_buffer_secure_message_offset(libspdm_context_t *spdm_context);
781+
uint32_t libspdm_get_scratch_buffer_secure_message_offset(void);
782782
uint32_t libspdm_get_scratch_buffer_secure_message_capacity(libspdm_context_t *spdm_context);
783783

784784
/* second section */
@@ -1411,10 +1411,9 @@ void libspdm_reset_message_k(libspdm_context_t *spdm_context, void *spdm_session
14111411
/**
14121412
* Reset message EncapD cache in SPDM context.
14131413
*
1414-
* @param spdm_context A pointer to the SPDM context.
14151414
* @param spdm_session_info A pointer to the SPDM session context.
14161415
**/
1417-
void libspdm_reset_message_encap_d(libspdm_context_t *spdm_context, void *spdm_session_info);
1416+
void libspdm_reset_message_encap_d(void *spdm_session_info);
14181417

14191418
/**
14201419
* Reset message F cache in SPDM context.
@@ -1559,18 +1558,15 @@ libspdm_return_t libspdm_append_message_k(libspdm_context_t *spdm_context,
15591558
/**
15601559
* Append message EncapD cache in SPDM context.
15611560
*
1562-
* @param spdm_context A pointer to the SPDM context.
15631561
* @param spdm_session_info A pointer to the SPDM session context.
1564-
* @param is_requester Indicate of the key generation for a requester or a responder.
15651562
* @param message Message buffer.
15661563
* @param message_size Size in bytes of message buffer.
15671564
*
15681565
* @retval RETURN_SUCCESS message is appended.
15691566
* @retval RETURN_OUT_OF_RESOURCES message is not appended because the internal cache is full.
15701567
**/
1571-
libspdm_return_t libspdm_append_message_encap_d(libspdm_context_t *spdm_context,
1572-
void *spdm_session_info,
1573-
bool is_requester, const void *message,
1568+
libspdm_return_t libspdm_append_message_encap_d(void *spdm_session_info,
1569+
const void *message,
15741570
size_t message_size);
15751571

15761572
/**
@@ -1961,8 +1957,7 @@ uint32_t libspdm_mask_measurement_hash_algo(libspdm_context_t *spdm_context,
19611957
*
19621958
* @return The masked MeasurementSpecification.
19631959
*/
1964-
uint8_t libspdm_mask_measurement_specification(libspdm_context_t *spdm_context,
1965-
uint8_t measurement_specification);
1960+
uint8_t libspdm_mask_measurement_specification(uint8_t measurement_specification);
19661961

19671962
/**
19681963
* Return MELspecification that is masked by the negotiated SPDM version.

include/internal/libspdm_responder_lib.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2021-2025 DMTF. All rights reserved.
3+
* Copyright 2021-2026 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -694,13 +694,11 @@ void libspdm_init_basic_mut_auth_encap_state(libspdm_context_t *spdm_context);
694694
/**
695695
* This function handles the encap error response.
696696
*
697-
* @param spdm_context A pointer to the SPDM context.
698697
* @param error_code Indicate the error code.
699698
*
700699
* @retval RETURN_DEVICE_ERROR A device error occurs when communicates with the device.
701700
**/
702-
libspdm_return_t libspdm_handle_encap_error_response_main(
703-
libspdm_context_t *spdm_context, uint8_t error_code);
701+
libspdm_return_t libspdm_handle_encap_error_response_main(uint8_t error_code);
704702

705703
/**
706704
* Set session_state to an SPDM secured message context and trigger callback.

library/spdm_common_lib/libspdm_com_context_data.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#if LIBSPDM_ENABLE_CAPABILITY_CHUNK_CAP
1212
/* first section */
13-
uint32_t libspdm_get_scratch_buffer_secure_message_offset(libspdm_context_t *spdm_context) {
13+
uint32_t libspdm_get_scratch_buffer_secure_message_offset(void) {
1414
return 0;
1515
}
1616

@@ -1359,7 +1359,7 @@ void libspdm_reset_message_k(libspdm_context_t *spdm_context, void *session_info
13591359
#endif
13601360
}
13611361

1362-
void libspdm_reset_message_encap_d(libspdm_context_t *spdm_context, void *session_info)
1362+
void libspdm_reset_message_encap_d(void *session_info)
13631363
{
13641364
libspdm_session_info_t *spdm_session_info;
13651365

@@ -2000,9 +2000,8 @@ libspdm_return_t libspdm_append_message_k(libspdm_context_t *spdm_context,
20002000
#endif
20012001
}
20022002

2003-
libspdm_return_t libspdm_append_message_encap_d(libspdm_context_t *spdm_context,
2004-
void *session_info,
2005-
bool is_requester, const void *message,
2003+
libspdm_return_t libspdm_append_message_encap_d(void *session_info,
2004+
const void *message,
20062005
size_t message_size)
20072006
{
20082007
libspdm_session_info_t *spdm_session_info;
@@ -3038,7 +3037,7 @@ void libspdm_deinit_context(void *spdm_context)
30383037
libspdm_reset_message_m(context, session_info);
30393038
libspdm_reset_message_e(context, session_info);
30403039
libspdm_reset_message_encap_e(context, session_info);
3041-
libspdm_reset_message_encap_d(context, session_info);
3040+
libspdm_reset_message_encap_d(session_info);
30423041
libspdm_reset_message_k(context, session_info);
30433042
libspdm_reset_message_f(context, session_info);
30443043
}

library/spdm_common_lib/libspdm_com_support.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,7 @@ uint32_t libspdm_mask_measurement_hash_algo(libspdm_context_t *spdm_context,
372372
}
373373
}
374374

375-
uint8_t libspdm_mask_measurement_specification(libspdm_context_t *spdm_context,
376-
uint8_t measurement_specification)
375+
uint8_t libspdm_mask_measurement_specification(uint8_t measurement_specification)
377376
{
378377
return (measurement_specification & SPDM_MEASUREMENT_SPECIFICATION_10_MASK);
379378
}

library/spdm_crypt_lib/libspdm_crypt_asym.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ static const libspdm_signing_context_str_t m_libspdm_signing_context_str_table[]
3636

3737
#if LIBSPDM_RSA_SSA_SUPPORT
3838
static bool libspdm_rsa_pkcs1_sign_with_nid_wrap (void *context, size_t hash_nid,
39-
const uint8_t *param, size_t param_size,
4039
const uint8_t *message,
4140
size_t message_size, uint8_t *signature,
4241
size_t *sig_size)
@@ -48,7 +47,6 @@ static bool libspdm_rsa_pkcs1_sign_with_nid_wrap (void *context, size_t hash_nid
4847

4948
#if LIBSPDM_RSA_PSS_SUPPORT
5049
static bool libspdm_rsa_pss_sign_wrap (void *context, size_t hash_nid,
51-
const uint8_t *param, size_t param_size,
5250
const uint8_t *message,
5351
size_t message_size, uint8_t *signature,
5452
size_t *sig_size)
@@ -60,7 +58,6 @@ static bool libspdm_rsa_pss_sign_wrap (void *context, size_t hash_nid,
6058

6159
#if LIBSPDM_ECDSA_SUPPORT
6260
static bool libspdm_ecdsa_sign_wrap (void *context, size_t hash_nid,
63-
const uint8_t *param, size_t param_size,
6461
const uint8_t *message,
6562
size_t message_size, uint8_t *signature,
6663
size_t *sig_size)
@@ -260,7 +257,6 @@ static bool libspdm_asym_sign_wrap (void *context, size_t hash_nid, uint32_t bas
260257
LIBSPDM_ASSERT(base_asym_algo!= SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSASSA_4096);
261258
#endif
262259
return libspdm_rsa_pkcs1_sign_with_nid_wrap(context, hash_nid,
263-
param, param_size,
264260
message, message_size,
265261
signature, sig_size);
266262
#else
@@ -281,7 +277,6 @@ static bool libspdm_asym_sign_wrap (void *context, size_t hash_nid, uint32_t bas
281277
LIBSPDM_ASSERT(base_asym_algo!= SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSAPSS_4096);
282278
#endif
283279
return libspdm_rsa_pss_sign_wrap(context, hash_nid,
284-
param, param_size,
285280
message, message_size,
286281
signature, sig_size);
287282
#else
@@ -302,7 +297,6 @@ static bool libspdm_asym_sign_wrap (void *context, size_t hash_nid, uint32_t bas
302297
LIBSPDM_ASSERT(base_asym_algo!= SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_ECDSA_ECC_NIST_P521);
303298
#endif
304299
return libspdm_ecdsa_sign_wrap(context, hash_nid,
305-
param, param_size,
306300
message, message_size,
307301
signature, sig_size);
308302
#else
@@ -738,7 +732,6 @@ bool libspdm_is_signature_buffer_palindrome(
738732

739733
#if LIBSPDM_RSA_SSA_SUPPORT
740734
static bool libspdm_rsa_pkcs1_verify_with_nid_wrap (void *context, size_t hash_nid,
741-
const uint8_t *param, size_t param_size,
742735
const uint8_t *message,
743736
size_t message_size,
744737
const uint8_t *signature,
@@ -751,7 +744,6 @@ static bool libspdm_rsa_pkcs1_verify_with_nid_wrap (void *context, size_t hash_n
751744

752745
#if LIBSPDM_RSA_PSS_SUPPORT
753746
static bool libspdm_rsa_pss_verify_wrap (void *context, size_t hash_nid,
754-
const uint8_t *param, size_t param_size,
755747
const uint8_t *message,
756748
size_t message_size,
757749
const uint8_t *signature,
@@ -763,7 +755,6 @@ static bool libspdm_rsa_pss_verify_wrap (void *context, size_t hash_nid,
763755

764756
#if LIBSPDM_ECDSA_SUPPORT
765757
static bool libspdm_ecdsa_verify_wrap (void *context, size_t hash_nid,
766-
const uint8_t *param, size_t param_size,
767758
const uint8_t *message,
768759
size_t message_size,
769760
const uint8_t *signature,
@@ -820,7 +811,6 @@ static bool libspdm_asym_verify_wrap(
820811
LIBSPDM_ASSERT(base_asym_algo!= SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSASSA_4096);
821812
#endif
822813
return libspdm_rsa_pkcs1_verify_with_nid_wrap(context, hash_nid,
823-
param, param_size,
824814
message, message_size,
825815
signature, sig_size);
826816
#else
@@ -841,7 +831,6 @@ static bool libspdm_asym_verify_wrap(
841831
LIBSPDM_ASSERT(base_asym_algo!= SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_RSAPSS_4096);
842832
#endif
843833
return libspdm_rsa_pss_verify_wrap(context, hash_nid,
844-
param, param_size,
845834
message, message_size,
846835
signature, sig_size);
847836
#else
@@ -862,7 +851,6 @@ static bool libspdm_asym_verify_wrap(
862851
LIBSPDM_ASSERT(base_asym_algo!= SPDM_ALGORITHMS_BASE_ASYM_ALGO_TPM_ALG_ECDSA_ECC_NIST_P521);
863852
#endif
864853
return libspdm_ecdsa_verify_wrap(context, hash_nid,
865-
param, param_size,
866854
message, message_size,
867855
signature, sig_size);
868856
#else

library/spdm_crypt_lib/libspdm_crypt_cert.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,6 @@ static bool libspdm_verify_leaf_cert_spdm_extension(const uint8_t *cert, size_t
13931393
* @param[in] cert Pointer to the DER-encoded certificate data.
13941394
* @param[in] cert_size The size of certificate data in bytes.
13951395
* @param[in] base_asym_algo SPDM base_asym_algo
1396-
* @param[in] base_hash_algo SPDM base_hash_algo
13971396
* @param[in] is_requester_cert Is the function verifying requester or responder cert.
13981397
* @param[in] cert_model One of the SPDM_CERTIFICATE_INFO_CERT_MODEL_* macros.
13991398
* @param[in] set_cert Is the function verifying a set certificate operation.
@@ -1403,7 +1402,7 @@ static bool libspdm_verify_leaf_cert_spdm_extension(const uint8_t *cert, size_t
14031402
**/
14041403
static bool libspdm_x509_common_certificate_check(
14051404
const uint8_t *cert, size_t cert_size,
1406-
uint32_t base_asym_algo, uint32_t pqc_asym_algo, uint32_t base_hash_algo,
1405+
uint32_t base_asym_algo, uint32_t pqc_asym_algo,
14071406
bool is_requester_cert, uint8_t cert_model,
14081407
bool set_cert)
14091408
{
@@ -1626,9 +1625,7 @@ bool libspdm_x509_certificate_check(
16261625
bool need_basic_constraints;
16271626

16281627
status = libspdm_x509_common_certificate_check(
1629-
cert, cert_size, base_asym_algo, pqc_asym_algo,
1630-
base_hash_algo, is_requester,
1631-
cert_model, false);
1628+
cert, cert_size, base_asym_algo, pqc_asym_algo, is_requester, cert_model, false);
16321629
if (!status) {
16331630
return false;
16341631
}
@@ -1655,9 +1652,7 @@ bool libspdm_x509_set_cert_certificate_check(
16551652
bool need_basic_constraints;
16561653

16571654
status = libspdm_x509_common_certificate_check(
1658-
cert, cert_size, base_asym_algo, pqc_asym_algo,
1659-
base_hash_algo, is_requester,
1660-
cert_model, true);
1655+
cert, cert_size, base_asym_algo, pqc_asym_algo, is_requester, cert_model, true);
16611656
if (!status) {
16621657
return false;
16631658
}

library/spdm_requester_lib/libspdm_req_encap_digests.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2021-2025 DMTF. All rights reserved.
3+
* Copyright 2021-2026 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -151,8 +151,7 @@ libspdm_return_t libspdm_get_encap_response_digest(void *spdm_context,
151151
}
152152
if (session_info != NULL) {
153153
if (context->connection_info.multi_key_conn_req) {
154-
status = libspdm_append_message_encap_d(context, session_info, true,
155-
spdm_response, *response_size);
154+
status = libspdm_append_message_encap_d(session_info, spdm_response, *response_size);
156155
if (LIBSPDM_STATUS_IS_ERROR(status)) {
157156
return libspdm_generate_encap_error_response(
158157
context, SPDM_ERROR_CODE_UNSPECIFIED, 0,

library/spdm_requester_lib/libspdm_req_send_receive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ libspdm_return_t libspdm_receive_response(void *spdm_context, const uint32_t *se
185185
transport_header_size = context->local_context.capability.transport_header_size;
186186
libspdm_get_scratch_buffer (context, (void **)&scratch_buffer, &scratch_buffer_size);
187187
#if LIBSPDM_ENABLE_CAPABILITY_CHUNK_CAP
188-
*response = scratch_buffer + libspdm_get_scratch_buffer_secure_message_offset(context) +
188+
*response = scratch_buffer + libspdm_get_scratch_buffer_secure_message_offset() +
189189
transport_header_size;
190190
*response_size = libspdm_get_scratch_buffer_secure_message_capacity(context) -
191191
transport_header_size;

library/spdm_responder_lib/libspdm_rsp_encap_challenge.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ libspdm_return_t libspdm_process_encap_response_challenge_auth(
104104
return LIBSPDM_STATUS_INVALID_MSG_FIELD;
105105
}
106106
if (spdm_response->header.request_response_code == SPDM_ERROR) {
107-
status = libspdm_handle_encap_error_response_main(
108-
spdm_context, spdm_response->header.param1);
107+
status = libspdm_handle_encap_error_response_main(spdm_response->header.param1);
109108
if (LIBSPDM_STATUS_IS_ERROR(status)) {
110109
return status;
111110
}

library/spdm_responder_lib/libspdm_rsp_encap_get_certificate.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2021-2025 DMTF. All rights reserved.
3+
* Copyright 2021-2026 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -133,8 +133,7 @@ libspdm_return_t libspdm_process_encap_response_certificate(
133133
return LIBSPDM_STATUS_INVALID_MSG_FIELD;
134134
}
135135
if (spdm_response->header.request_response_code == SPDM_ERROR) {
136-
status = libspdm_handle_encap_error_response_main(
137-
spdm_context, spdm_response->header.param1);
136+
status = libspdm_handle_encap_error_response_main(spdm_response->header.param1);
138137
if (LIBSPDM_STATUS_IS_ERROR(status)) {
139138
return status;
140139
}

0 commit comments

Comments
 (0)