Skip to content

Commit 15611d1

Browse files
steven-bellocksteven-bellock
committed
mut_auth_requested is not a boolean
Signed-off-by: Steven Bellock <sbellock@nvidia.com>
1 parent 5271753 commit 15611d1

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

‎library/spdm_common_lib/libspdm_com_context_data.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2164,7 +2164,7 @@ libspdm_return_t libspdm_append_message_f(libspdm_context_t *spdm_context,
21642164
}
21652165
}
21662166

2167-
if (!spdm_session_info->use_psk && spdm_session_info->mut_auth_requested) {
2167+
if (!spdm_session_info->use_psk && (spdm_session_info->mut_auth_requested != 0)) {
21682168
if (is_requester) {
21692169
slot_id = spdm_context->connection_info.local_used_cert_chain_slot_id;
21702170
LIBSPDM_ASSERT((slot_id < SPDM_MAX_SLOT_COUNT) || (slot_id == 0xFF));
@@ -2249,7 +2249,7 @@ libspdm_return_t libspdm_append_message_f(libspdm_context_t *spdm_context,
22492249

22502250
LIBSPDM_ASSERT (spdm_session_info->session_transcript.digest_context_th != NULL);
22512251
if (!spdm_session_info->session_transcript.message_f_initialized) {
2252-
if (!spdm_session_info->use_psk && spdm_session_info->mut_auth_requested) {
2252+
if (!spdm_session_info->use_psk && (spdm_session_info->mut_auth_requested != 0)) {
22532253
if (spdm_context->connection_info.multi_key_conn_req) {
22542254
result = libspdm_hash_update (
22552255
spdm_context->connection_info.algorithm.base_hash_algo,

‎library/spdm_common_lib/libspdm_com_crypto_service_session.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2021-2022 DMTF. All rights reserved.
3+
* Copyright 2021-2025 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

@@ -674,7 +674,7 @@ bool libspdm_calculate_th2_hash(libspdm_context_t *spdm_context,
674674
if (!result) {
675675
return false;
676676
}
677-
if (session_info->mut_auth_requested) {
677+
if (session_info->mut_auth_requested != 0) {
678678
if (is_requester) {
679679
slot_id = spdm_context->connection_info.local_used_cert_chain_slot_id;
680680
LIBSPDM_ASSERT((slot_id < SPDM_MAX_SLOT_COUNT) || (slot_id == 0xFF));

‎library/spdm_requester_lib/libspdm_req_finish.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2021-2024 DMTF. All rights reserved.
3+
* Copyright 2021-2025 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

@@ -58,7 +58,7 @@ bool libspdm_verify_finish_rsp_hmac(libspdm_context_t *spdm_context,
5858
return false;
5959
}
6060

61-
if (session_info->mut_auth_requested) {
61+
if (session_info->mut_auth_requested != 0) {
6262
slot_id = spdm_context->connection_info.local_used_cert_chain_slot_id;
6363
LIBSPDM_ASSERT((slot_id < SPDM_MAX_SLOT_COUNT) || (slot_id == 0xFF));
6464
if (slot_id == 0xFF) {
@@ -153,7 +153,7 @@ bool libspdm_generate_finish_req_hmac(libspdm_context_t *spdm_context,
153153
return false;
154154
}
155155

156-
if (session_info->mut_auth_requested) {
156+
if (session_info->mut_auth_requested != 0) {
157157
slot_id = spdm_context->connection_info.local_used_cert_chain_slot_id;
158158
LIBSPDM_ASSERT((slot_id < SPDM_MAX_SLOT_COUNT) || (slot_id == 0xFF));
159159
if (slot_id == 0xFF) {
@@ -419,7 +419,7 @@ static libspdm_return_t libspdm_try_send_receive_finish(libspdm_context_t *spdm_
419419
spdm_request->header.param2 = 0;
420420
signature_size = 0;
421421
#if LIBSPDM_ENABLE_CAPABILITY_MUT_AUTH_CAP
422-
if (session_info->mut_auth_requested) {
422+
if (session_info->mut_auth_requested != 0) {
423423
spdm_request->header.param1 = SPDM_FINISH_REQUEST_ATTRIBUTES_SIGNATURE_INCLUDED;
424424
spdm_request->header.param2 = req_slot_id_param;
425425
signature_size = libspdm_get_req_asym_signature_size(
@@ -428,7 +428,7 @@ static libspdm_return_t libspdm_try_send_receive_finish(libspdm_context_t *spdm_
428428
#endif
429429

430430
spdm_context->connection_info.local_used_cert_chain_slot_id = req_slot_id_param;
431-
if (session_info->mut_auth_requested && (req_slot_id_param != 0xFF)) {
431+
if ((session_info->mut_auth_requested != 0) && (req_slot_id_param != 0xFF)) {
432432
LIBSPDM_ASSERT(req_slot_id_param < SPDM_MAX_SLOT_COUNT);
433433
spdm_context->connection_info.local_used_cert_chain_buffer =
434434
spdm_context->local_context.local_cert_chain_provision[req_slot_id_param];
@@ -449,7 +449,7 @@ static libspdm_return_t libspdm_try_send_receive_finish(libspdm_context_t *spdm_
449449
goto error;
450450
}
451451
#if LIBSPDM_ENABLE_CAPABILITY_MUT_AUTH_CAP
452-
if (session_info->mut_auth_requested) {
452+
if (session_info->mut_auth_requested != 0) {
453453
result = libspdm_generate_finish_req_signature(spdm_context, session_info, ptr);
454454
if (!result) {
455455
libspdm_release_sender_buffer (spdm_context);

‎library/spdm_responder_lib/libspdm_rsp_finish.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2021-2024 DMTF. All rights reserved.
3+
* Copyright 2021-2025 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

@@ -45,7 +45,7 @@ bool libspdm_verify_finish_req_hmac(libspdm_context_t *spdm_context,
4545
return false;
4646
}
4747

48-
if (session_info->mut_auth_requested) {
48+
if (session_info->mut_auth_requested != 0) {
4949
slot_id = spdm_context->connection_info.peer_used_cert_chain_slot_id;
5050
LIBSPDM_ASSERT((slot_id < SPDM_MAX_SLOT_COUNT) || (slot_id == 0xFF));
5151
if (slot_id == 0xFF) {
@@ -303,7 +303,7 @@ bool libspdm_generate_finish_rsp_hmac(libspdm_context_t *spdm_context,
303303
return false;
304304
}
305305

306-
if (session_info->mut_auth_requested) {
306+
if (session_info->mut_auth_requested != 0) {
307307
slot_id = spdm_context->connection_info.peer_used_cert_chain_slot_id;
308308
LIBSPDM_ASSERT((slot_id < SPDM_MAX_SLOT_COUNT) || (slot_id == 0xFF));
309309
if (slot_id == 0xFF) {
@@ -482,7 +482,7 @@ libspdm_return_t libspdm_get_response_finish(libspdm_context_t *spdm_context, si
482482
hmac_size = libspdm_get_hash_size(spdm_context->connection_info.algorithm.base_hash_algo);
483483
signature_size = 0;
484484
#if LIBSPDM_ENABLE_CAPABILITY_MUT_AUTH_CAP
485-
if (session_info->mut_auth_requested) {
485+
if (session_info->mut_auth_requested != 0) {
486486
signature_size = libspdm_get_req_asym_signature_size(
487487
spdm_context->connection_info.algorithm.req_base_asym_alg);
488488
}
@@ -531,7 +531,7 @@ libspdm_return_t libspdm_get_response_finish(libspdm_context_t *spdm_context, si
531531
response_size, response);
532532
}
533533
#if LIBSPDM_ENABLE_CAPABILITY_MUT_AUTH_CAP
534-
if (session_info->mut_auth_requested) {
534+
if (session_info->mut_auth_requested != 0) {
535535
result = libspdm_verify_finish_req_signature(
536536
spdm_context, session_info,
537537
(const uint8_t *)request + sizeof(spdm_finish_request_t), signature_size);

0 commit comments

Comments
 (0)