From 088290254a7b390e969eca53bfe15c73d50a3f83 Mon Sep 17 00:00:00 2001
From: Steven Bellock <sbellock@nvidia.com>
Date: Thu, 15 Feb 2024 11:22:35 -0800
Subject: [PATCH] Fix conversion specifiers

Fix #2573.

Signed-off-by: Steven Bellock <sbellock@nvidia.com>
---
 .../libspdm_com_context_data.c                |  4 +-
 library/spdm_common_lib/libspdm_com_msg_log.c |  6 +--
 library/spdm_common_lib/libspdm_com_support.c | 10 ++--
 .../libspdm_req_challenge.c                   |  8 +--
 .../libspdm_req_communication.c               | 24 ++++-----
 .../spdm_requester_lib/libspdm_req_finish.c   |  4 +-
 .../libspdm_req_get_digests.c                 | 10 ++--
 .../libspdm_req_get_measurements.c            |  4 +-
 .../libspdm_req_key_exchange.c                |  6 +--
 .../libspdm_req_psk_exchange.c                |  4 +-
 .../libspdm_req_send_receive.c                | 14 ++---
 .../libspdm_rsp_encap_challenge.c             |  6 +--
 .../libspdm_rsp_encap_get_digests.c           | 10 ++--
 .../libspdm_rsp_key_exchange.c                |  6 +--
 .../libspdm_rsp_receive_send.c                | 12 ++---
 .../libspdm_secmes_session.c                  | 48 ++++++++---------
 .../libspdm_mctp_common.c                     | 16 +++---
 .../libspdm_doe_common.c                      | 14 ++---
 .../test_spdm_requester_get_csr/get_csr.c     |  2 +-
 .../key_exchange.c                            |  2 +-
 .../psk_exchange.c                            |  2 +-
 .../set_certificate.c                         |  2 +-
 unit_test/spdm_transport_test_lib/common.c    | 14 ++---
 unit_test/test_crypt/x509_verify.c            | 10 ++--
 .../spdm_requester_init.c                     |  2 +-
 .../spdm_requester_session.c                  |  4 +-
 unit_test/test_spdm_requester/challenge.c     | 12 ++---
 unit_test/test_spdm_requester/chunk_get.c     |  2 +-
 unit_test/test_spdm_requester/encap_request.c |  2 +-
 .../error_test/get_measurements_err.c         | 24 ++++-----
 .../error_test/key_exchange_err.c             | 48 ++++++++---------
 .../test_spdm_requester/get_capabilities.c    |  2 +-
 .../test_spdm_requester/get_certificate.c     | 10 ++--
 .../test_spdm_requester/get_measurements.c    | 32 +++++------
 unit_test/test_spdm_requester/get_version.c   |  2 +-
 unit_test/test_spdm_requester/key_exchange.c  | 54 +++++++++----------
 unit_test/test_spdm_requester/key_update.c    |  2 +-
 unit_test/test_spdm_requester/psk_exchange.c  | 42 +++++++--------
 .../test_spdm_requester/set_certificate.c     |  2 +-
 39 files changed, 239 insertions(+), 239 deletions(-)

diff --git a/library/spdm_common_lib/libspdm_com_context_data.c b/library/spdm_common_lib/libspdm_com_context_data.c
index b7de2a16c0d..c5a9006a6f8 100644
--- a/library/spdm_common_lib/libspdm_com_context_data.c
+++ b/library/spdm_common_lib/libspdm_com_context_data.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -1212,7 +1212,7 @@ bool libspdm_check_context (void *spdm_context)
                  context->local_context.capability.max_spdm_msg_size)) {
                 LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR,
                                "max_spdm_msg_size (%d) must be greater than or "
-                               "equal to local_cert_chain_provision_size[%d] (%d).\n",
+                               "equal to local_cert_chain_provision_size[%zu] (%zu).\n",
                                context->local_context.capability.max_spdm_msg_size, index,
                                context->local_context.local_cert_chain_provision_size[index]));
                 return false;
diff --git a/library/spdm_common_lib/libspdm_com_msg_log.c b/library/spdm_common_lib/libspdm_com_msg_log.c
index 01119f505ef..e2380984696 100644
--- a/library/spdm_common_lib/libspdm_com_msg_log.c
+++ b/library/spdm_common_lib/libspdm_com_msg_log.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -89,8 +89,8 @@ void libspdm_append_msg_log(libspdm_context_t *spdm_context, void *message, size
             spdm_context->msg_log.buffer_size += message_size;
         }
 
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Message Logging Status = [%x] Buffer Size = [%x] "
-                       "Max Buffer Size = [%x]\n", spdm_context->msg_log.status,
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Message Logging Status = [%x] Buffer Size = [%zx] "
+                       "Max Buffer Size = [%zx]\n", spdm_context->msg_log.status,
                        spdm_context->msg_log.buffer_size, spdm_context->msg_log.max_buffer_size));
         LIBSPDM_INTERNAL_DUMP_HEX(spdm_context->msg_log.buffer, spdm_context->msg_log.buffer_size);
     }
diff --git a/library/spdm_common_lib/libspdm_com_support.c b/library/spdm_common_lib/libspdm_com_support.c
index e59ceb72b10..48abc3c32c3 100644
--- a/library/spdm_common_lib/libspdm_com_support.c
+++ b/library/spdm_common_lib/libspdm_com_support.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -84,7 +84,7 @@ void libspdm_internal_dump_hex_str(const uint8_t *data, size_t size)
 {
     size_t index;
     for (index = 0; index < size; index++) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "%02x", (size_t)data[index]));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "%02x", data[index]));
     }
 }
 
@@ -92,7 +92,7 @@ void libspdm_internal_dump_data(const uint8_t *data, size_t size)
 {
     size_t index;
     for (index = 0; index < size; index++) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "%02x ", (size_t)data[index]));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "%02x ", data[index]));
     }
 }
 
@@ -107,13 +107,13 @@ void libspdm_internal_dump_hex(const uint8_t *data, size_t size)
     count = size / COLUMN_SIZE;
     left = size % COLUMN_SIZE;
     for (index = 0; index < count; index++) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "%04x: ", index * COLUMN_SIZE));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "%04zx: ", index * COLUMN_SIZE));
         LIBSPDM_INTERNAL_DUMP_DATA(data + index * COLUMN_SIZE, COLUMN_SIZE);
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n"));
     }
 
     if (left != 0) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "%04x: ", index * COLUMN_SIZE));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "%04zx: ", index * COLUMN_SIZE));
         LIBSPDM_INTERNAL_DUMP_DATA(data + index * COLUMN_SIZE, left);
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n"));
     }
diff --git a/library/spdm_requester_lib/libspdm_req_challenge.c b/library/spdm_requester_lib/libspdm_req_challenge.c
index fae9ef04940..7dbb163c5be 100644
--- a/library/spdm_requester_lib/libspdm_req_challenge.c
+++ b/library/spdm_requester_lib/libspdm_req_challenge.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -240,7 +240,7 @@ static libspdm_return_t libspdm_try_challenge(libspdm_context_t *spdm_context,
 
     cert_chain_hash = ptr;
     ptr += hash_size;
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "cert_chain_hash (0x%x) - ", hash_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "cert_chain_hash (0x%zx) - ", hash_size));
     LIBSPDM_INTERNAL_DUMP_DATA(cert_chain_hash, hash_size);
     LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n"));
     if (slot_id == 0xFF) {
@@ -353,7 +353,7 @@ static libspdm_return_t libspdm_try_challenge(libspdm_context_t *spdm_context,
     }
 
     signature = ptr;
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "signature (0x%x):\n", signature_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "signature (0x%zx):\n", signature_size));
     LIBSPDM_INTERNAL_DUMP_HEX(signature, signature_size);
     result = libspdm_verify_challenge_auth_signature(spdm_context, true, signature, signature_size);
     if (!result) {
@@ -379,7 +379,7 @@ static libspdm_return_t libspdm_try_challenge(libspdm_context_t *spdm_context,
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "BasicMutAuth :\n"));
         status = libspdm_encapsulated_request(spdm_context, NULL, 0, NULL);
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                       "libspdm_challenge - libspdm_encapsulated_request - %p\n", status));
+                       "libspdm_challenge - libspdm_encapsulated_request - %xu\n", status));
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
             libspdm_reset_message_c(spdm_context);
             return status;
diff --git a/library/spdm_requester_lib/libspdm_req_communication.c b/library/spdm_requester_lib/libspdm_req_communication.c
index b4af0769929..c9a8376bccd 100644
--- a/library/spdm_requester_lib/libspdm_req_communication.c
+++ b/library/spdm_requester_lib/libspdm_req_communication.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -61,7 +61,7 @@ libspdm_return_t libspdm_start_session(void *spdm_context, bool use_psk,
             measurement_hash);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                           "libspdm_start_session - libspdm_send_receive_key_exchange - %p\n",
+                           "libspdm_start_session - libspdm_send_receive_key_exchange - %xu\n",
                            status));
             return status;
         }
@@ -91,7 +91,7 @@ libspdm_return_t libspdm_start_session(void *spdm_context, bool use_psk,
                 session_info->mut_auth_requested,
                 &req_slot_id_param);
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                           "libspdm_start_session - libspdm_encapsulated_request - %p\n", status));
+                           "libspdm_start_session - libspdm_encapsulated_request - %xu\n", status));
             if (LIBSPDM_STATUS_IS_ERROR(status)) {
                 return status;
             }
@@ -114,7 +114,7 @@ libspdm_return_t libspdm_start_session(void *spdm_context, bool use_psk,
         }
         status = libspdm_send_receive_finish(context, *session_id, req_slot_id_param);
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                       "libspdm_start_session - libspdm_send_receive_finish - %p\n", status));
+                       "libspdm_start_session - libspdm_send_receive_finish - %xu\n", status));
     #else /* LIBSPDM_ENABLE_CAPABILITY_KEY_EX_CAP*/
         LIBSPDM_ASSERT(false);
         return LIBSPDM_STATUS_UNSUPPORTED_CAP;
@@ -127,7 +127,7 @@ libspdm_return_t libspdm_start_session(void *spdm_context, bool use_psk,
             heartbeat_period, measurement_hash);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                           "libspdm_start_session - libspdm_send_receive_psk_exchange - %p\n",
+                           "libspdm_start_session - libspdm_send_receive_psk_exchange - %xu\n",
                            status));
             return status;
         }
@@ -138,7 +138,7 @@ libspdm_return_t libspdm_start_session(void *spdm_context, bool use_psk,
                 SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_PSK_CAP_RESPONDER_WITH_CONTEXT)) {
             status = libspdm_send_receive_psk_finish(context, *session_id);
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                           "libspdm_start_session - libspdm_send_receive_psk_finish - %p\n",
+                           "libspdm_start_session - libspdm_send_receive_psk_finish - %xu\n",
                            status));
         }
     #endif /* LIBSPDM_ENABLE_CAPABILITY_PSK_CAP*/
@@ -194,7 +194,7 @@ libspdm_return_t libspdm_start_session_ex(void *spdm_context, bool use_psk,
             responder_opaque_data, responder_opaque_data_size);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                           "libspdm_start_session - libspdm_send_receive_key_exchange - %p\n",
+                           "libspdm_start_session - libspdm_send_receive_key_exchange - %xu\n",
                            status));
             return status;
         }
@@ -224,7 +224,7 @@ libspdm_return_t libspdm_start_session_ex(void *spdm_context, bool use_psk,
                 session_info->mut_auth_requested,
                 &req_slot_id_param);
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                           "libspdm_start_session - libspdm_encapsulated_request - %p\n", status));
+                           "libspdm_start_session - libspdm_encapsulated_request - %xu\n", status));
             if (LIBSPDM_STATUS_IS_ERROR(status)) {
                 return status;
             }
@@ -247,7 +247,7 @@ libspdm_return_t libspdm_start_session_ex(void *spdm_context, bool use_psk,
         }
         status = libspdm_send_receive_finish(context, *session_id, req_slot_id_param);
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                       "libspdm_start_session - libspdm_send_receive_finish - %p\n", status));
+                       "libspdm_start_session - libspdm_send_receive_finish - %xu\n", status));
     #else /* LIBSPDM_ENABLE_CAPABILITY_KEY_EX_CAP*/
         LIBSPDM_ASSERT(false);
         return LIBSPDM_STATUS_UNSUPPORTED_CAP;
@@ -265,7 +265,7 @@ libspdm_return_t libspdm_start_session_ex(void *spdm_context, bool use_psk,
             responder_opaque_data, responder_opaque_data_size);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                           "libspdm_start_session - libspdm_send_receive_psk_exchange - %p\n",
+                           "libspdm_start_session - libspdm_send_receive_psk_exchange - %xu\n",
                            status));
             return status;
         }
@@ -276,7 +276,7 @@ libspdm_return_t libspdm_start_session_ex(void *spdm_context, bool use_psk,
                 SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_PSK_CAP_RESPONDER_WITH_CONTEXT)) {
             status = libspdm_send_receive_psk_finish(context, *session_id);
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                           "libspdm_start_session - libspdm_send_receive_psk_finish - %p\n",
+                           "libspdm_start_session - libspdm_send_receive_psk_finish - %xu\n",
                            status));
         }
     #else /* LIBSPDM_ENABLE_CAPABILITY_PSK_CAP*/
@@ -297,7 +297,7 @@ libspdm_return_t libspdm_stop_session(void *spdm_context, uint32_t session_id,
     context = spdm_context;
 
     status = libspdm_send_receive_end_session(context, session_id, end_session_attributes);
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "libspdm_stop_session - %p\n", status));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "libspdm_stop_session - %xu\n", status));
 
     return status;
 }
diff --git a/library/spdm_requester_lib/libspdm_req_finish.c b/library/spdm_requester_lib/libspdm_req_finish.c
index 3ea64b47f5a..561f1a314d0 100644
--- a/library/spdm_requester_lib/libspdm_req_finish.c
+++ b/library/spdm_requester_lib/libspdm_req_finish.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -548,7 +548,7 @@ static libspdm_return_t libspdm_try_send_receive_finish(libspdm_context_t *spdm_
             spdm_context, true,
             SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HANDSHAKE_IN_THE_CLEAR_CAP,
             SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_HANDSHAKE_IN_THE_CLEAR_CAP)) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "verify_data (0x%x):\n", hmac_size));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "verify_data (0x%zx):\n", hmac_size));
         LIBSPDM_INTERNAL_DUMP_HEX(spdm_response->verify_data, hmac_size);
         result = libspdm_verify_finish_rsp_hmac(spdm_context, session_info,
                                                 spdm_response->verify_data,
diff --git a/library/spdm_requester_lib/libspdm_req_get_digests.c b/library/spdm_requester_lib/libspdm_req_get_digests.c
index adfdd6a4505..c05c5ccfb58 100644
--- a/library/spdm_requester_lib/libspdm_req_get_digests.c
+++ b/library/spdm_requester_lib/libspdm_req_get_digests.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -235,22 +235,22 @@ static libspdm_return_t libspdm_try_get_digest(libspdm_context_t *spdm_context,
         (spdm_key_usage_bit_mask_t *)((uint8_t *)cert_info + sizeof(spdm_certificate_info_t) *
                                       digest_count);
     for (index = 0; index < digest_count; index++) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "digest (0x%x) - ", index));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "digest (0x%zx) - ", index));
         LIBSPDM_INTERNAL_DUMP_DATA(&spdm_response->digest[digest_size * index], digest_size);
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n"));
     }
     if ((spdm_request->header.spdm_version >= SPDM_MESSAGE_VERSION_13) &&
         spdm_context->connection_info.multi_key_conn_rsp) {
         for (index = 0; index < digest_count; index++) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "key_pair_id (0x%x) - 0x%02x\n", index,
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "key_pair_id (0x%zx) - 0x%02x\n", index,
                            key_pair_id[index]));
         }
         for (index = 0; index < digest_count; index++) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "cert_info (0x%x) - 0x%02x\n", index,
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "cert_info (0x%zx) - 0x%02x\n", index,
                            cert_info[index]));
         }
         for (index = 0; index < digest_count; index++) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "key_usage_bit_mask (0x%x) - 0x%04x\n", index,
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "key_usage_bit_mask (0x%zx) - 0x%04x\n", index,
                            key_usage_bit_mask[index]));
         }
     }
diff --git a/library/spdm_requester_lib/libspdm_req_get_measurements.c b/library/spdm_requester_lib/libspdm_req_get_measurements.c
index ec6e3c125e5..7ee0f1d92f7 100644
--- a/library/spdm_requester_lib/libspdm_req_get_measurements.c
+++ b/library/spdm_requester_lib/libspdm_req_get_measurements.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -481,7 +481,7 @@ static libspdm_return_t libspdm_try_get_measurement(libspdm_context_t *spdm_cont
         }
 
         signature = ptr;
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "signature (0x%x):\n", signature_size));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "signature (0x%zx):\n", signature_size));
         LIBSPDM_INTERNAL_DUMP_HEX(signature, signature_size);
 
         result = libspdm_verify_measurement_signature(
diff --git a/library/spdm_requester_lib/libspdm_req_key_exchange.c b/library/spdm_requester_lib/libspdm_req_key_exchange.c
index 0116754b580..06ca20aaf5f 100644
--- a/library/spdm_requester_lib/libspdm_req_key_exchange.c
+++ b/library/spdm_requester_lib/libspdm_req_key_exchange.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -397,7 +397,7 @@ static libspdm_return_t libspdm_try_send_receive_key_exchange(
         libspdm_release_sender_buffer (spdm_context);
         return LIBSPDM_STATUS_CRYPTO_ERROR;
     }
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "RequesterKey (0x%x):\n", dhe_key_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "RequesterKey (0x%zx):\n", dhe_key_size));
     LIBSPDM_INTERNAL_DUMP_HEX(ptr, dhe_key_size);
     ptr += dhe_key_size;
 
@@ -580,7 +580,7 @@ static libspdm_return_t libspdm_try_send_receive_key_exchange(
                          spdm_response->random_data, SPDM_RANDOM_DATA_SIZE);
     }
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "ResponderKey (0x%x):\n", dhe_key_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "ResponderKey (0x%zx):\n", dhe_key_size));
     LIBSPDM_INTERNAL_DUMP_HEX(spdm_response->exchange_data, dhe_key_size);
 
     ptr = spdm_response->exchange_data;
diff --git a/library/spdm_requester_lib/libspdm_req_psk_exchange.c b/library/spdm_requester_lib/libspdm_req_psk_exchange.c
index a81467045a9..321637ce3e4 100644
--- a/library/spdm_requester_lib/libspdm_req_psk_exchange.c
+++ b/library/spdm_requester_lib/libspdm_req_psk_exchange.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -530,7 +530,7 @@ static libspdm_return_t libspdm_try_send_receive_psk_exchange(
         /* No need to send PSK_FINISH, enter application phase directly.*/
 
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "libspdm_generate_session_data_key[%x]\n",
-                       session_id));
+                       *session_id));
         result = libspdm_calculate_th2_hash(spdm_context, session_info,
                                             true, th2_hash_data);
         if (!result) {
diff --git a/library/spdm_requester_lib/libspdm_req_send_receive.c b/library/spdm_requester_lib/libspdm_req_send_receive.c
index b24fb220302..fd54d692ee4 100644
--- a/library/spdm_requester_lib/libspdm_req_send_receive.c
+++ b/library/spdm_requester_lib/libspdm_req_send_receive.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -25,7 +25,7 @@ libspdm_return_t libspdm_send_request(void *spdm_context, const uint32_t *sessio
     context = spdm_context;
 
     LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                   "libspdm_send_spdm_request[%x] msg %s(0x%x), size (0x%x): \n",
+                   "libspdm_send_spdm_request[%x] msg %s(0x%x), size (0x%zx): \n",
                    (session_id != NULL) ? *session_id : 0x0,
                    libspdm_get_code_str(((spdm_message_header_t *)request)->
                                         request_response_code),
@@ -99,7 +99,7 @@ libspdm_return_t libspdm_send_request(void *spdm_context, const uint32_t *sessio
         context, session_id, is_app_message, true, request_size,
         request, &message_size, (void **)&message);
     if (LIBSPDM_STATUS_IS_ERROR(status)) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "transport_encode_message status - %p\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "transport_encode_message status - %xu\n",
                        status));
         if ((session_id != NULL) &&
             ((status == LIBSPDM_STATUS_SEQUENCE_NUMBER_OVERFLOW) ||
@@ -114,7 +114,7 @@ libspdm_return_t libspdm_send_request(void *spdm_context, const uint32_t *sessio
     status = context->send_message(context, message_size, message,
                                    timeout);
     if (LIBSPDM_STATUS_IS_ERROR(status)) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "libspdm_send_spdm_request[%x] status - %p\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "libspdm_send_spdm_request[%x] status - %xu\n",
                        (session_id != NULL) ? *session_id : 0x0, status));
     }
 
@@ -158,7 +158,7 @@ libspdm_return_t libspdm_receive_response(void *spdm_context, const uint32_t *se
                                       (void **)&message, timeout);
     if (LIBSPDM_STATUS_IS_ERROR(status)) {
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                       "libspdm_receive_spdm_response[%x] status - %p\n",
+                       "libspdm_receive_spdm_response[%x] status - %xu\n",
                        (session_id != NULL) ? *session_id : 0x0, status));
         return status;
     }
@@ -260,11 +260,11 @@ libspdm_return_t libspdm_receive_response(void *spdm_context, const uint32_t *se
             libspdm_free_session_id(context, *session_id);
         }
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                       "libspdm_receive_spdm_response[%x] status - %p\n",
+                       "libspdm_receive_spdm_response[%x] status - %xu\n",
                        (session_id != NULL) ? *session_id : 0x0, status));
     } else {
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                       "libspdm_receive_spdm_response[%x] msg %s(0x%x), size (0x%x): \n",
+                       "libspdm_receive_spdm_response[%x] msg %s(0x%x), size (0x%zx): \n",
                        (session_id != NULL) ? *session_id : 0x0,
                        libspdm_get_code_str(((spdm_message_header_t *)*response)->
                                             request_response_code),
diff --git a/library/spdm_responder_lib/libspdm_rsp_encap_challenge.c b/library/spdm_responder_lib/libspdm_rsp_encap_challenge.c
index 038f1c6bec8..923736869b6 100644
--- a/library/spdm_responder_lib/libspdm_rsp_encap_challenge.c
+++ b/library/spdm_responder_lib/libspdm_rsp_encap_challenge.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -163,7 +163,7 @@ libspdm_return_t libspdm_process_encap_response_challenge_auth(
 
     cert_chain_hash = ptr;
     ptr += hash_size;
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Encap cert_chain_hash (0x%x) - ", hash_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Encap cert_chain_hash (0x%zx) - ", hash_size));
     LIBSPDM_INTERNAL_DUMP_DATA(cert_chain_hash, hash_size);
     LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n"));
     if (spdm_context->connection_info.peer_used_cert_chain_slot_id == 0xFF) {
@@ -250,7 +250,7 @@ libspdm_return_t libspdm_process_encap_response_challenge_auth(
     }
 
     signature = ptr;
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Encap signature (0x%x):\n", signature_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Encap signature (0x%zx):\n", signature_size));
     LIBSPDM_INTERNAL_DUMP_HEX(signature, signature_size);
     result = libspdm_verify_challenge_auth_signature(
         spdm_context, false, signature, signature_size);
diff --git a/library/spdm_responder_lib/libspdm_rsp_encap_get_digests.c b/library/spdm_responder_lib/libspdm_rsp_encap_get_digests.c
index c368e521b12..eb671b73b75 100644
--- a/library/spdm_responder_lib/libspdm_rsp_encap_get_digests.c
+++ b/library/spdm_responder_lib/libspdm_rsp_encap_get_digests.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -176,7 +176,7 @@ libspdm_return_t libspdm_process_encap_response_digest(
         (spdm_key_usage_bit_mask_t *)((uint8_t *)cert_info + sizeof(spdm_certificate_info_t) *
                                       digest_count);
     for (index = 0; index < digest_count; index++) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "digest (0x%x) - ", index));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "digest (0x%zx) - ", index));
         LIBSPDM_INTERNAL_DUMP_DATA(
             (const uint8_t *)(spdm_response + 1) + (digest_size * index), digest_size);
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n"));
@@ -184,15 +184,15 @@ libspdm_return_t libspdm_process_encap_response_digest(
     if ((spdm_response->header.spdm_version >= SPDM_MESSAGE_VERSION_13) &&
         spdm_context->connection_info.multi_key_conn_req) {
         for (index = 0; index < digest_count; index++) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "key_pair_id (0x%x) - 0x%02x\n", index,
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "key_pair_id (0x%zx) - 0x%02x\n", index,
                            key_pair_id[index]));
         }
         for (index = 0; index < digest_count; index++) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "cert_info (0x%x) - 0x%02x\n", index,
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "cert_info (0x%zx) - 0x%02x\n", index,
                            cert_info[index]));
         }
         for (index = 0; index < digest_count; index++) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "key_usage_bit_mask (0x%x) - 0x%04x\n", index,
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "key_usage_bit_mask (0x%zx) - 0x%04x\n", index,
                            key_usage_bit_mask[index]));
         }
     }
diff --git a/library/spdm_responder_lib/libspdm_rsp_key_exchange.c b/library/spdm_responder_lib/libspdm_rsp_key_exchange.c
index 36b517f64fa..430396d0015 100644
--- a/library/spdm_responder_lib/libspdm_rsp_key_exchange.c
+++ b/library/spdm_responder_lib/libspdm_rsp_key_exchange.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -469,10 +469,10 @@ libspdm_return_t libspdm_get_response_key_exchange(libspdm_context_t *spdm_conte
                                                SPDM_ERROR_CODE_UNSPECIFIED, 0,
                                                response_size, response);
     }
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Calc SelfKey (0x%x):\n", dhe_key_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Calc SelfKey (0x%zx):\n", dhe_key_size));
     LIBSPDM_INTERNAL_DUMP_HEX(ptr, dhe_key_size);
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Calc peer_key (0x%x):\n", dhe_key_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Calc peer_key (0x%zx):\n", dhe_key_size));
     LIBSPDM_INTERNAL_DUMP_HEX((const uint8_t *)request +
                               sizeof(spdm_key_exchange_request_t),
                               dhe_key_size);
diff --git a/library/spdm_responder_lib/libspdm_rsp_receive_send.c b/library/spdm_responder_lib/libspdm_rsp_receive_send.c
index 51a2c261cf6..2dba5df7ad6 100644
--- a/library/spdm_responder_lib/libspdm_rsp_receive_send.c
+++ b/library/spdm_responder_lib/libspdm_rsp_receive_send.c
@@ -228,7 +228,7 @@ libspdm_return_t libspdm_process_request(void *spdm_context, uint32_t **session_
     }
 
     if (LIBSPDM_STATUS_IS_ERROR(status)) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "transport_decode_message : %p\n", status));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "transport_decode_message : %xu\n", status));
         if (context->last_spdm_error.error_code != 0) {
 
             /* If the SPDM error code is Non-Zero, that means we need send the error message back to requester.
@@ -287,7 +287,7 @@ libspdm_return_t libspdm_process_request(void *spdm_context, uint32_t **session_
         context->last_spdm_request_session_id_valid = true;
     }
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "SpdmReceiveRequest[%x] msg %s(0x%x), size (0x%x): \n",
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "SpdmReceiveRequest[%x] msg %s(0x%x), size (0x%zx): \n",
                    (message_session_id != NULL) ? *message_session_id : 0,
                    libspdm_get_code_str(((spdm_message_header_t *)context->last_spdm_request)->
                                         request_response_code),
@@ -511,7 +511,7 @@ libspdm_return_t libspdm_build_response(void *spdm_context, const uint32_t *sess
             return status;
         }
 
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "SpdmSendResponse[%x]: msg %s(0x%x), size (0x%x): \n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "SpdmSendResponse[%x]: msg %s(0x%x), size (0x%zx): \n",
                        (session_id != NULL) ? *session_id : 0,
                        libspdm_get_code_str(spdm_response->request_response_code),
                        spdm_response->request_response_code,
@@ -527,7 +527,7 @@ libspdm_return_t libspdm_build_response(void *spdm_context, const uint32_t *sess
                  (status == LIBSPDM_STATUS_CRYPTO_ERROR))) {
                 libspdm_free_session_id(context, *session_id);
             }
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "transport_encode_message : %p\n", status));
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "transport_encode_message : %xu\n", status));
             return status;
         }
 
@@ -729,7 +729,7 @@ libspdm_return_t libspdm_build_response(void *spdm_context, const uint32_t *sess
         }
     }
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "SpdmSendResponse[%x]: msg %s(0x%x), size (0x%x): \n",
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "SpdmSendResponse[%x]: msg %s(0x%x), size (0x%zx): \n",
                    (session_id != NULL) ? *session_id : 0,
                    libspdm_get_code_str(spdm_response->request_response_code),
                    spdm_response->request_response_code,
@@ -745,7 +745,7 @@ libspdm_return_t libspdm_build_response(void *spdm_context, const uint32_t *sess
              (status == LIBSPDM_STATUS_CRYPTO_ERROR))) {
             libspdm_free_session_id(context, *session_id);
         }
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "transport_encode_message : %p\n", status));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "transport_encode_message : %xu\n", status));
         return status;
     }
 
diff --git a/library/spdm_secured_message_lib/libspdm_secmes_session.c b/library/spdm_secured_message_lib/libspdm_secmes_session.c
index 2447aa1a4ea..4ec08b6892d 100644
--- a/library/spdm_secured_message_lib/libspdm_secmes_session.c
+++ b/library/spdm_secured_message_lib/libspdm_secmes_session.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -91,7 +91,7 @@ bool libspdm_generate_aead_key_and_iv(
                        NULL, (uint16_t)key_length, hash_size, bin_str5,
                        &bin_str5_size);
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str5 (0x%x):\n", bin_str5_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str5 (0x%zx):\n", bin_str5_size));
     LIBSPDM_INTERNAL_DUMP_HEX(bin_str5, bin_str5_size);
     status = libspdm_hkdf_expand(secured_message_context->base_hash_algo,
                                  major_secret, hash_size, bin_str5,
@@ -99,7 +99,7 @@ bool libspdm_generate_aead_key_and_iv(
     if (!status) {
         return false;
     }
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "key (0x%x) - ", key_length));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "key (0x%zx) - ", key_length));
     LIBSPDM_INTERNAL_DUMP_DATA(key, key_length);
     LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n"));
 
@@ -109,7 +109,7 @@ bool libspdm_generate_aead_key_and_iv(
                        NULL, (uint16_t)iv_length, hash_size, bin_str6,
                        &bin_str6_size);
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str6 (0x%x):\n", bin_str6_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str6 (0x%zx):\n", bin_str6_size));
     LIBSPDM_INTERNAL_DUMP_HEX(bin_str6, bin_str6_size);
     status = libspdm_hkdf_expand(secured_message_context->base_hash_algo,
                                  major_secret, hash_size, bin_str6,
@@ -117,7 +117,7 @@ bool libspdm_generate_aead_key_and_iv(
     if (!status) {
         return false;
     }
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "iv (0x%x) - ", iv_length));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "iv (0x%zx) - ", iv_length));
     LIBSPDM_INTERNAL_DUMP_DATA(iv, iv_length);
     LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n"));
 
@@ -150,7 +150,7 @@ bool libspdm_generate_finished_key(
                        NULL, (uint16_t)hash_size, hash_size, bin_str7,
                        &bin_str7_size);
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str7 (0x%x):\n", bin_str7_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str7 (0x%zx):\n", bin_str7_size));
     LIBSPDM_INTERNAL_DUMP_HEX(bin_str7, bin_str7_size);
     status = libspdm_hkdf_expand(secured_message_context->base_hash_algo,
                                  handshake_secret, hash_size, bin_str7,
@@ -158,7 +158,7 @@ bool libspdm_generate_finished_key(
     if (!status) {
         return false;
     }
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "finished_key (0x%x) - ", hash_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "finished_key (0x%zx) - ", hash_size));
     LIBSPDM_INTERNAL_DUMP_DATA(finished_key, hash_size);
     LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n"));
 
@@ -205,7 +205,7 @@ bool libspdm_generate_session_handshake_key(void *spdm_secured_message_context,
         if (!status) {
             return false;
         }
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "handshake_secret (0x%x) - ", hash_size));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "handshake_secret (0x%zx) - ", hash_size));
         LIBSPDM_INTERNAL_DUMP_DATA(
             secured_message_context->master_secret.handshake_secret,
             hash_size);
@@ -218,7 +218,7 @@ bool libspdm_generate_session_handshake_key(void *spdm_secured_message_context,
                        th1_hash_data, (uint16_t)hash_size, hash_size,
                        bin_str1, &bin_str1_size);
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str1 (0x%x):\n", bin_str1_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str1 (0x%zx):\n", bin_str1_size));
     LIBSPDM_INTERNAL_DUMP_HEX(bin_str1, bin_str1_size);
 
     #if LIBSPDM_ENABLE_CAPABILITY_PSK_CAP
@@ -250,7 +250,7 @@ bool libspdm_generate_session_handshake_key(void *spdm_secured_message_context,
         }
     }
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "request_handshake_secret (0x%x) - ", hash_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "request_handshake_secret (0x%zx) - ", hash_size));
     LIBSPDM_INTERNAL_DUMP_DATA(secured_message_context->handshake_secret
                                .request_handshake_secret,
                                hash_size);
@@ -261,7 +261,7 @@ bool libspdm_generate_session_handshake_key(void *spdm_secured_message_context,
                        th1_hash_data, (uint16_t)hash_size, hash_size,
                        bin_str2, &bin_str2_size);
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str2 (0x%x):\n", bin_str2_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str2 (0x%zx):\n", bin_str2_size));
     LIBSPDM_INTERNAL_DUMP_HEX(bin_str2, bin_str2_size);
 
     #if LIBSPDM_ENABLE_CAPABILITY_PSK_CAP
@@ -293,7 +293,7 @@ bool libspdm_generate_session_handshake_key(void *spdm_secured_message_context,
         }
     }
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "response_handshake_secret (0x%x) - ", hash_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "response_handshake_secret (0x%zx) - ", hash_size));
     LIBSPDM_INTERNAL_DUMP_DATA(secured_message_context->handshake_secret.response_handshake_secret,
                                hash_size);
     LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n"));
@@ -379,7 +379,7 @@ bool libspdm_generate_session_data_key(void *spdm_secured_message_context,
                            (uint16_t)hash_size, hash_size, bin_str0,
                            &bin_str0_size);
 
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str0 (0x%x):\n", bin_str0_size));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str0 (0x%zx):\n", bin_str0_size));
         LIBSPDM_INTERNAL_DUMP_HEX(bin_str0, bin_str0_size);
 
         status = libspdm_hkdf_expand(
@@ -389,7 +389,7 @@ bool libspdm_generate_session_data_key(void *spdm_secured_message_context,
         if (!status) {
             return false;
         }
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "salt1 (0x%x) - ", hash_size));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "salt1 (0x%zx) - ", hash_size));
         LIBSPDM_INTERNAL_DUMP_DATA(salt1, hash_size);
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n"));
 
@@ -401,7 +401,7 @@ bool libspdm_generate_session_data_key(void *spdm_secured_message_context,
         if (!status) {
             goto cleanup;
         }
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "master_secret (0x%x) - ", hash_size));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "master_secret (0x%zx) - ", hash_size));
         LIBSPDM_INTERNAL_DUMP_DATA(
             secured_message_context->master_secret.master_secret,
             hash_size);
@@ -414,7 +414,7 @@ bool libspdm_generate_session_data_key(void *spdm_secured_message_context,
                        th2_hash_data, (uint16_t)hash_size, hash_size,
                        bin_str3, &bin_str3_size);
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str3 (0x%x):\n", bin_str3_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str3 (0x%zx):\n", bin_str3_size));
     LIBSPDM_INTERNAL_DUMP_HEX(bin_str3, bin_str3_size);
 
     #if LIBSPDM_ENABLE_CAPABILITY_PSK_CAP
@@ -446,7 +446,7 @@ bool libspdm_generate_session_data_key(void *spdm_secured_message_context,
         }
     }
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "request_data_secret (0x%x) - ", hash_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "request_data_secret (0x%zx) - ", hash_size));
     LIBSPDM_INTERNAL_DUMP_DATA(
         secured_message_context->application_secret.request_data_secret,
         hash_size);
@@ -457,7 +457,7 @@ bool libspdm_generate_session_data_key(void *spdm_secured_message_context,
                        th2_hash_data, (uint16_t)hash_size, hash_size,
                        bin_str4, &bin_str4_size);
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str4 (0x%x):\n", bin_str4_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str4 (0x%zx):\n", bin_str4_size));
     LIBSPDM_INTERNAL_DUMP_HEX(bin_str4, bin_str4_size);
 
     #if LIBSPDM_ENABLE_CAPABILITY_PSK_CAP
@@ -489,7 +489,7 @@ bool libspdm_generate_session_data_key(void *spdm_secured_message_context,
         }
     }
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "response_data_secret (0x%x) - ", hash_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "response_data_secret (0x%zx) - ", hash_size));
     LIBSPDM_INTERNAL_DUMP_DATA(
         secured_message_context->application_secret.response_data_secret,
         hash_size);
@@ -501,7 +501,7 @@ bool libspdm_generate_session_data_key(void *spdm_secured_message_context,
                        th2_hash_data, (uint16_t)hash_size, hash_size,
                        bin_str8, &bin_str8_size);
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str8 (0x%x):\n", bin_str8_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str8 (0x%zx):\n", bin_str8_size));
     LIBSPDM_INTERNAL_DUMP_HEX(bin_str8, bin_str8_size);
 
     #if LIBSPDM_ENABLE_CAPABILITY_PSK_CAP
@@ -533,7 +533,7 @@ bool libspdm_generate_session_data_key(void *spdm_secured_message_context,
         }
     }
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "export_master_secret (0x%x) - ", hash_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "export_master_secret (0x%zx) - ", hash_size));
     LIBSPDM_INTERNAL_DUMP_DATA(
         secured_message_context->export_master_secret, hash_size);
     LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n"));
@@ -591,7 +591,7 @@ bool libspdm_create_update_session_data_key(void *spdm_secured_message_context,
                        NULL, (uint16_t)hash_size, hash_size, bin_str9,
                        &bin_str9_size);
 
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str9 (0x%x):\n", bin_str9_size));
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "bin_str9 (0x%zx):\n", bin_str9_size));
     LIBSPDM_INTERNAL_DUMP_HEX(bin_str9, bin_str9_size);
 
     if (action == LIBSPDM_KEY_UPDATE_ACTION_REQUESTER) {
@@ -629,7 +629,7 @@ bool libspdm_create_update_session_data_key(void *spdm_secured_message_context,
         if (!status) {
             return false;
         }
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "RequestDataSecretUpdate (0x%x) - ", hash_size));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "RequestDataSecretUpdate (0x%zx) - ", hash_size));
         LIBSPDM_INTERNAL_DUMP_DATA(secured_message_context->application_secret.request_data_secret,
                                    hash_size);
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n"));
@@ -680,7 +680,7 @@ bool libspdm_create_update_session_data_key(void *spdm_secured_message_context,
         if (!status) {
             return false;
         }
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "ResponseDataSecretUpdate (0x%x) - ",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "ResponseDataSecretUpdate (0x%zx) - ",
                        hash_size));
         LIBSPDM_INTERNAL_DUMP_DATA(secured_message_context->application_secret.response_data_secret,
                                    hash_size);
diff --git a/library/spdm_transport_mctp_lib/libspdm_mctp_common.c b/library/spdm_transport_mctp_lib/libspdm_mctp_common.c
index a7ae2cd4c0e..886283e71dd 100644
--- a/library/spdm_transport_mctp_lib/libspdm_mctp_common.c
+++ b/library/spdm_transport_mctp_lib/libspdm_mctp_common.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -124,7 +124,7 @@ libspdm_return_t libspdm_transport_mctp_encode_message(
                                                  &app_message);
             if (LIBSPDM_STATUS_IS_ERROR(status)) {
                 LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR,
-                               "transport_encode_message - %p\n",
+                               "transport_encode_message - %xu\n",
                                status));
                 return status;
             }
@@ -142,7 +142,7 @@ libspdm_return_t libspdm_transport_mctp_encode_message(
             secured_message, &spdm_secured_message_callbacks);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR,
-                           "libspdm_encode_secured_message - %p\n", status));
+                           "libspdm_encode_secured_message - %xu\n", status));
             return status;
         }
 
@@ -151,7 +151,7 @@ libspdm_return_t libspdm_transport_mctp_encode_message(
             session_id, secured_message_size, secured_message,
             transport_message_size, transport_message);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_encode_message - %p\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_encode_message - %xu\n",
                            status));
             return status;
         }
@@ -161,7 +161,7 @@ libspdm_return_t libspdm_transport_mctp_encode_message(
                                              transport_message_size,
                                              transport_message);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_encode_message - %p\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_encode_message - %xu\n",
                            status));
             return status;
         }
@@ -239,7 +239,7 @@ libspdm_return_t libspdm_transport_mctp_decode_message(
         &secured_message_session_id, transport_message_size,
         transport_message, &secured_message_size, (void **)&secured_message);
     if (LIBSPDM_STATUS_IS_ERROR(status)) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %p\n", status));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %xu\n", status));
         return status;
     }
 
@@ -267,7 +267,7 @@ libspdm_return_t libspdm_transport_mctp_decode_message(
             &spdm_secured_message_callbacks);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR,
-                           "libspdm_decode_secured_message - %p\n", status));
+                           "libspdm_decode_secured_message - %xu\n", status));
             libspdm_secured_message_get_last_spdm_error_struct(
                 secured_message_context, &spdm_error);
             libspdm_set_last_spdm_error_struct(spdm_context,
@@ -304,7 +304,7 @@ libspdm_return_t libspdm_transport_mctp_decode_message(
                                              transport_message,
                                              message_size, message);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %p\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %xu\n",
                            status));
             return status;
         }
diff --git a/library/spdm_transport_pcidoe_lib/libspdm_doe_common.c b/library/spdm_transport_pcidoe_lib/libspdm_doe_common.c
index 36ffff240df..9b518714cb3 100644
--- a/library/spdm_transport_pcidoe_lib/libspdm_doe_common.c
+++ b/library/spdm_transport_pcidoe_lib/libspdm_doe_common.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
+ *  Copyright 2021-2024 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -119,7 +119,7 @@ libspdm_return_t libspdm_transport_pci_doe_encode_message(
             secured_message, &spdm_secured_message_callbacks);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR,
-                           "libspdm_encode_secured_message - %p\n", status));
+                           "libspdm_encode_secured_message - %xu\n", status));
             return status;
         }
 
@@ -128,7 +128,7 @@ libspdm_return_t libspdm_transport_pci_doe_encode_message(
             session_id, secured_message_size, secured_message,
             transport_message_size, transport_message);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_encode_message - %p\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_encode_message - %xu\n",
                            status));
             return status;
         }
@@ -138,7 +138,7 @@ libspdm_return_t libspdm_transport_pci_doe_encode_message(
                                                 transport_message_size,
                                                 transport_message);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_encode_message - %p\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_encode_message - %xu\n",
                            status));
             return status;
         }
@@ -215,7 +215,7 @@ libspdm_return_t libspdm_transport_pci_doe_decode_message(
         &secured_message_session_id, transport_message_size,
         transport_message, &secured_message_size, (void **)&secured_message);
     if (LIBSPDM_STATUS_IS_ERROR(status)) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %p\n", status));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %xu\n", status));
         return status;
     }
 
@@ -241,7 +241,7 @@ libspdm_return_t libspdm_transport_pci_doe_decode_message(
             &spdm_secured_message_callbacks);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR,
-                           "libspdm_decode_secured_message - %p\n", status));
+                           "libspdm_decode_secured_message - %xu\n", status));
             libspdm_secured_message_get_last_spdm_error_struct(
                 secured_message_context, &spdm_error);
             libspdm_set_last_spdm_error_struct(spdm_context,
@@ -256,7 +256,7 @@ libspdm_return_t libspdm_transport_pci_doe_decode_message(
                                                 transport_message,
                                                 message_size, message);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %p\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %xu\n",
                            status));
             return status;
         }
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_csr/get_csr.c b/unit_test/fuzzing/test_requester/test_spdm_requester_get_csr/get_csr.c
index f5b48b02c9d..912e8942814 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_csr/get_csr.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_csr/get_csr.c
@@ -43,7 +43,7 @@ libspdm_return_t libspdm_device_send_message(void *spdm_context,
         if (session_info == NULL) {
             return LIBSPDM_STATUS_SEND_FAIL;
         }
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Request (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Request (0x%zx):\n",
                        request_size));
         libspdm_dump_hex(request, request_size);
 
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_key_exchange/key_exchange.c b/unit_test/fuzzing/test_requester/test_spdm_requester_key_exchange/key_exchange.c
index 9151b6511e7..b712e8870e9 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_key_exchange/key_exchange.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_key_exchange/key_exchange.c
@@ -186,7 +186,7 @@ libspdm_return_t libspdm_device_receive_message(void *spdm_context, size_t *resp
                          spdm_response,
                          (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_psk_exchange/psk_exchange.c b/unit_test/fuzzing/test_requester/test_spdm_requester_psk_exchange/psk_exchange.c
index d10076aa1d9..e6a5cc257ef 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_psk_exchange/psk_exchange.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_psk_exchange/psk_exchange.c
@@ -131,7 +131,7 @@ libspdm_return_t libspdm_device_receive_message(void *spdm_context, size_t *resp
                      (&m_libspdm_local_buffer[m_libspdm_local_buffer_size] - m_libspdm_local_buffer),
                      spdm_response, (size_t)ptr - (size_t)spdm_response);
     m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                    m_libspdm_local_buffer_size));
     libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
     libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_set_certificate/set_certificate.c b/unit_test/fuzzing/test_requester/test_spdm_requester_set_certificate/set_certificate.c
index bca32b19035..0ac6f1c9501 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_set_certificate/set_certificate.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_set_certificate/set_certificate.c
@@ -41,7 +41,7 @@ libspdm_return_t libspdm_device_send_message(void *spdm_context,
         if (session_info == NULL) {
             return LIBSPDM_STATUS_SEND_FAIL;
         }
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Request (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Request (0x%zx):\n",
                        request_size));
         libspdm_dump_hex(request, request_size);
 
diff --git a/unit_test/spdm_transport_test_lib/common.c b/unit_test/spdm_transport_test_lib/common.c
index 1ead6eab1f0..59604bfa2aa 100644
--- a/unit_test/spdm_transport_test_lib/common.c
+++ b/unit_test/spdm_transport_test_lib/common.c
@@ -122,7 +122,7 @@ libspdm_return_t libspdm_transport_test_encode_message(
                                                  &app_message);
             if (LIBSPDM_STATUS_IS_ERROR(status)) {
                 LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR,
-                               "transport_encode_message - %p\n",
+                               "transport_encode_message - %xu\n",
                                status));
                 return status;
             }
@@ -139,7 +139,7 @@ libspdm_return_t libspdm_transport_test_encode_message(
             secured_message, &spdm_secured_message_callbacks);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR,
-                           "libspdm_encode_secured_message - %p\n", status));
+                           "libspdm_encode_secured_message - %xu\n", status));
             return status;
         }
 
@@ -148,7 +148,7 @@ libspdm_return_t libspdm_transport_test_encode_message(
             session_id, secured_message_size, secured_message,
             transport_message_size, transport_message);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_encode_message - %p\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_encode_message - %xu\n",
                            status));
             return status;
         }
@@ -158,7 +158,7 @@ libspdm_return_t libspdm_transport_test_encode_message(
                                              transport_message_size,
                                              transport_message);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_encode_message - %p\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_encode_message - %xu\n",
                            status));
             return status;
         }
@@ -236,7 +236,7 @@ libspdm_return_t libspdm_transport_test_decode_message(
         &secured_message_session_id, transport_message_size,
         transport_message, &secured_message_size, (void **)&secured_message);
     if (LIBSPDM_STATUS_IS_ERROR(status)) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %p\n", status));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %xu\n", status));
         return status;
     }
 
@@ -264,7 +264,7 @@ libspdm_return_t libspdm_transport_test_decode_message(
             &spdm_secured_message_callbacks);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR,
-                           "libspdm_decode_secured_message - %p\n", status));
+                           "libspdm_decode_secured_message - %xu\n", status));
             libspdm_secured_message_get_last_spdm_error_struct(
                 secured_message_context, &spdm_error);
             libspdm_set_last_spdm_error_struct(spdm_context,
@@ -301,7 +301,7 @@ libspdm_return_t libspdm_transport_test_decode_message(
                                              transport_message,
                                              message_size, message);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %p\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %xu\n",
                            status));
             return status;
         }
diff --git a/unit_test/test_crypt/x509_verify.c b/unit_test/test_crypt/x509_verify.c
index 7ab715d50a9..07606efa6dd 100644
--- a/unit_test/test_crypt/x509_verify.c
+++ b/unit_test/test_crypt/x509_verify.c
@@ -263,7 +263,7 @@ bool libspdm_validate_crypt_x509(char *Path, size_t len)
         goto cleanup;
     } else {
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                       "\n  - Retrieving Common name = \"%s\" (size = %d)",
+                       "\n  - Retrieving Common name = \"%s\" (size = %zu)",
                        common_name, common_name_size));
         libspdm_my_print(" - [PASS]");
     }
@@ -287,7 +287,7 @@ bool libspdm_validate_crypt_x509(char *Path, size_t len)
         libspdm_my_print("\n  - Retrieving version - [Fail]");
         goto cleanup;
     } else {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n  - Retrieving version = %d - ",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n  - Retrieving version = %zu - ",
                        cert_version));
         libspdm_my_print("[Pass]");
     }
@@ -301,7 +301,7 @@ bool libspdm_validate_crypt_x509(char *Path, size_t len)
         libspdm_my_print("\n  - Retrieving serial_number - [Fail]");
         goto cleanup;
     } else {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n  - Retrieving serial_number = %d - ",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "\n  - Retrieving serial_number = %llu - ",
                        *((uint64_t *)asn1_buffer)));
         libspdm_my_print("[Pass]");
     }
@@ -332,7 +332,7 @@ bool libspdm_validate_crypt_x509(char *Path, size_t len)
         goto cleanup;
     } else {
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                       "\n  - Retrieving Issuer Common name = \"%s\" (size = %d) - ",
+                       "\n  - Retrieving Issuer Common name = \"%s\" (size = %zu) - ",
                        common_name, common_name_size));
         libspdm_my_print("[Pass]");
     }
@@ -361,7 +361,7 @@ bool libspdm_validate_crypt_x509(char *Path, size_t len)
         goto cleanup;
     } else {
         LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO,
-                       "\n  - Retrieving  SubjectAltName (size = %d) ",
+                       "\n  - Retrieving  SubjectAltName (size = %zu) ",
                        asn1_buffer_len));
         libspdm_my_print("- [Pass]");
     }
diff --git a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_init.c b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_init.c
index 4896df70a38..65f80320e96 100644
--- a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_init.c
+++ b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_init.c
@@ -148,7 +148,7 @@ void *spdm_client_init(void)
 
     status = libspdm_init_connection(spdm_context, false);
     if (LIBSPDM_STATUS_IS_ERROR(status)) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "libspdm_init_connection - %r\n", status));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "libspdm_init_connection - %xu\n", status));
         free_pool(spdm_context);
         return NULL;
     }
diff --git a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_session.c b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_session.c
index 9d210cd488c..0b17f26046a 100644
--- a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_session.c
+++ b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_session.c
@@ -23,7 +23,7 @@ libspdm_return_t do_session_via_spdm(void *spdm_context)
         SPDM_KEY_EXCHANGE_REQUEST_TCB_COMPONENT_MEASUREMENT_HASH, 0, 0,
         &session_id, &heartbeat_period, measurement_hash);
     if (LIBSPDM_STATUS_IS_ERROR(status)) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "libspdm_start_session - %r\n", status));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "libspdm_start_session - %xu\n", status));
         return status;
     }
 
@@ -33,7 +33,7 @@ libspdm_return_t do_session_via_spdm(void *spdm_context)
 
     status = libspdm_stop_session(spdm_context, session_id, 0);
     if (LIBSPDM_STATUS_IS_ERROR(status)) {
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "libspdm_stop_session - %r\n", status));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "libspdm_stop_session - %xu\n", status));
         return status;
     }
 
diff --git a/unit_test/test_spdm_requester/challenge.c b/unit_test/test_spdm_requester/challenge.c
index 2b640501344..0352b18ed89 100644
--- a/unit_test/test_spdm_requester/challenge.c
+++ b/unit_test/test_spdm_requester/challenge.c
@@ -214,7 +214,7 @@ libspdm_return_t libspdm_requester_challenge_test_receive_message(
                           m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -1385,7 +1385,7 @@ libspdm_return_t libspdm_requester_challenge_test_receive_message(
                          sizeof(m_libspdm_local_buffer) - m_libspdm_local_buffer_size,
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -1476,7 +1476,7 @@ libspdm_return_t libspdm_requester_challenge_test_receive_message(
                           m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -1557,7 +1557,7 @@ libspdm_return_t libspdm_requester_challenge_test_receive_message(
                           m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -1840,7 +1840,7 @@ libspdm_return_t libspdm_requester_challenge_test_receive_message(
                           m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -1925,7 +1925,7 @@ libspdm_return_t libspdm_requester_challenge_test_receive_message(
                           m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
diff --git a/unit_test/test_spdm_requester/chunk_get.c b/unit_test/test_spdm_requester/chunk_get.c
index 26c50f37f8f..b39282cbe94 100644
--- a/unit_test/test_spdm_requester/chunk_get.c
+++ b/unit_test/test_spdm_requester/chunk_get.c
@@ -202,7 +202,7 @@ void libspdm_requester_chunk_get_test_case3_build_challenge_response(
         (&m_libspdm_local_buffer[m_libspdm_local_buffer_size] - m_libspdm_local_buffer),
         spdm_response, (size_t) ptr - (size_t) spdm_response);
     m_libspdm_local_buffer_size += ((size_t) ptr - (size_t) spdm_response);
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                    m_libspdm_local_buffer_size));
     libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
     libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
diff --git a/unit_test/test_spdm_requester/encap_request.c b/unit_test/test_spdm_requester/encap_request.c
index e86d51f51f4..b4088778469 100644
--- a/unit_test/test_spdm_requester/encap_request.c
+++ b/unit_test/test_spdm_requester/encap_request.c
@@ -70,7 +70,7 @@ libspdm_return_t libspdm_requester_encap_request_test_send_message(void *spdm_co
                                                            &decode_message_size,
                                                            (void **)&spdm_deliver_encapsulated_response_request);
             if (LIBSPDM_STATUS_IS_ERROR(status)) {
-                LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %p\n",
+                LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_decode_message - %xu\n",
                                status));
             }
             spdm_response = (void*) (spdm_deliver_encapsulated_response_request + 1);
diff --git a/unit_test/test_spdm_requester/error_test/get_measurements_err.c b/unit_test/test_spdm_requester/error_test/get_measurements_err.c
index d00b1ce2f84..22d5f3b2fd6 100644
--- a/unit_test/test_spdm_requester/error_test/get_measurements_err.c
+++ b/unit_test/test_spdm_requester/error_test/get_measurements_err.c
@@ -371,7 +371,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_send_message(
         message_size = libspdm_test_get_measurement_request_size(
             spdm_context, (const uint8_t *)request + header_size,
             request_size - header_size);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Request (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Request (0x%zx):\n",
                        request_size));
         libspdm_dump_hex(request, request_size);
         libspdm_get_scratch_buffer (spdm_context, (void **)&app_message, &app_message_size);
@@ -496,7 +496,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -586,7 +586,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -744,7 +744,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                              spdm_response, (size_t)ptr - (size_t)spdm_response);
             m_libspdm_local_buffer_size +=
                 ((size_t)ptr - (size_t)spdm_response);
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                            m_libspdm_local_buffer_size));
             libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
             libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -1046,7 +1046,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -1187,7 +1187,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -1752,7 +1752,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -1852,7 +1852,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -1951,7 +1951,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -2048,7 +2048,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -2435,7 +2435,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -2596,7 +2596,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
diff --git a/unit_test/test_spdm_requester/error_test/key_exchange_err.c b/unit_test/test_spdm_requester/error_test/key_exchange_err.c
index efb7d1c4664..0c4a30e249f 100644
--- a/unit_test/test_spdm_requester/error_test/key_exchange_err.c
+++ b/unit_test/test_spdm_requester/error_test/key_exchange_err.c
@@ -461,7 +461,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -627,7 +627,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -862,7 +862,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                              spdm_response, (size_t)ptr - (size_t)spdm_response);
             m_libspdm_local_buffer_size +=
                 ((size_t)ptr - (size_t)spdm_response);
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                            m_libspdm_local_buffer_size));
             libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
             libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1118,7 +1118,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                              spdm_response, (size_t)ptr - (size_t)spdm_response);
             m_libspdm_local_buffer_size +=
                 ((size_t)ptr - (size_t)spdm_response);
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                            m_libspdm_local_buffer_size));
             libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
             libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1328,7 +1328,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1503,7 +1503,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1674,7 +1674,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1848,7 +1848,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2015,7 +2015,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2182,7 +2182,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2358,7 +2358,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2526,7 +2526,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2699,7 +2699,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2855,7 +2855,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -3022,7 +3022,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -3190,7 +3190,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -3358,7 +3358,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -3526,7 +3526,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -3695,7 +3695,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -3864,7 +3864,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -4033,7 +4033,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -4186,7 +4186,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                          sizeof(m_libspdm_local_buffer) - m_libspdm_local_buffer_size,
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -4351,7 +4351,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -4519,7 +4519,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
diff --git a/unit_test/test_spdm_requester/get_capabilities.c b/unit_test/test_spdm_requester/get_capabilities.c
index 79442f7ce67..67eaf53b21e 100644
--- a/unit_test/test_spdm_requester/get_capabilities.c
+++ b/unit_test/test_spdm_requester/get_capabilities.c
@@ -1352,7 +1352,7 @@ static void libspdm_test_requester_get_capabilities_case32(void **state)
                      spdm_context->transcript.message_a.buffer_size);
     assert_int_equal(spdm_context->transcript.message_a.buffer_size,
                      arbitrary_size + m_libspdm_local_buffer_size);
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer (0x%x):\n",
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer (0x%zx):\n",
                    m_libspdm_local_buffer_size));
     libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
     assert_memory_equal(spdm_context->transcript.message_a.buffer + arbitrary_size,
diff --git a/unit_test/test_spdm_requester/get_certificate.c b/unit_test/test_spdm_requester/get_certificate.c
index c5989c12449..eb5edc6e9b0 100644
--- a/unit_test/test_spdm_requester/get_certificate.c
+++ b/unit_test/test_spdm_requester/get_certificate.c
@@ -1118,7 +1118,7 @@ libspdm_return_t libspdm_requester_get_certificate_test_receive_message(
         /* load certificate*/
         hash_size = libspdm_get_hash_size(m_libspdm_use_hash_algo);
         root_cert_size = root_cert_size - sizeof(spdm_cert_chain_t) - hash_size;
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "root_cert_size %d \n", root_cert_size));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "root_cert_size %zu \n", root_cert_size));
         cert_buffer = (uint8_t *)m_libspdm_local_certificate_chain +
                       sizeof(spdm_cert_chain_t) + hash_size + root_cert_size;
         cert_buffer_size = m_libspdm_local_certificate_chain_size -
@@ -1237,7 +1237,7 @@ libspdm_return_t libspdm_requester_get_certificate_test_receive_message(
         /* load certificate*/
         hash_size = libspdm_get_hash_size(m_libspdm_use_hash_algo);
         root_cert_size = root_cert_size - sizeof(spdm_cert_chain_t) - hash_size;
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "root_cert_size %d \n", root_cert_size));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "root_cert_size %zu \n", root_cert_size));
         cert_buffer = (uint8_t *)m_libspdm_local_certificate_chain +
                       sizeof(spdm_cert_chain_t) + hash_size + root_cert_size;
         cert_buffer_size = m_libspdm_local_certificate_chain_size -
@@ -1860,7 +1860,7 @@ libspdm_return_t libspdm_requester_get_certificate_test_receive_message(
                               m_libspdm_local_buffer),
                              spdm_response, (size_t)ptr - (size_t)spdm_response);
             m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                            m_libspdm_local_buffer_size));
             libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
             libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -3851,7 +3851,7 @@ void libspdm_test_requester_get_certificate_case25(void **state)
         libspdm_zero_mem(cert_chain, sizeof(cert_chain));
         status = libspdm_get_certificate(spdm_context, NULL, slot_id, &cert_chain_size,
                                          cert_chain);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "libspdm_get_certificate - %p\n", status));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "libspdm_get_certificate - %xu\n", status));
         assert_int_equal(status, LIBSPDM_STATUS_SUCCESS);
     }
 
@@ -3863,7 +3863,7 @@ void libspdm_test_requester_get_certificate_case25(void **state)
             spdm_context, NULL, slot_id,
             SPDM_CHALLENGE_REQUEST_NO_MEASUREMENT_SUMMARY_HASH,
             measurement_hash, NULL);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "libspdm_challenge - %p\n", status));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "libspdm_challenge - %xu\n", status));
         assert_int_equal(status, LIBSPDM_STATUS_SUCCESS);
     }
 
diff --git a/unit_test/test_spdm_requester/get_measurements.c b/unit_test/test_spdm_requester/get_measurements.c
index a5085e0f8c0..7cf196c6626 100644
--- a/unit_test/test_spdm_requester/get_measurements.c
+++ b/unit_test/test_spdm_requester/get_measurements.c
@@ -390,7 +390,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_send_message(
         message_size = libspdm_test_get_measurement_request_size(
             spdm_context, (const uint8_t *)request + header_size,
             request_size - header_size);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Request (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Request (0x%zx):\n",
                        request_size));
         libspdm_dump_hex(request, request_size);
         libspdm_get_scratch_buffer (spdm_context, (void **)&app_message, &app_message_size);
@@ -545,7 +545,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -631,7 +631,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -789,7 +789,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                              spdm_response, (size_t)ptr - (size_t)spdm_response);
             m_libspdm_local_buffer_size +=
                 ((size_t)ptr - (size_t)spdm_response);
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                            m_libspdm_local_buffer_size));
             libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
             libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -963,7 +963,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                              spdm_response, (size_t)ptr - (size_t)spdm_response);
             m_libspdm_local_buffer_size +=
                 ((size_t)ptr - (size_t)spdm_response);
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                            m_libspdm_local_buffer_size));
             libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
             libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -1214,7 +1214,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -1355,7 +1355,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -1445,7 +1445,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -2014,7 +2014,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -2114,7 +2114,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -2213,7 +2213,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -2310,7 +2310,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -2697,7 +2697,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -2855,7 +2855,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -2973,7 +2973,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
@@ -3110,7 +3110,7 @@ static libspdm_return_t libspdm_requester_get_measurements_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_hash_all(m_libspdm_use_hash_algo, m_libspdm_local_buffer,
diff --git a/unit_test/test_spdm_requester/get_version.c b/unit_test/test_spdm_requester/get_version.c
index 505207f67e2..a0ca8cd485f 100644
--- a/unit_test/test_spdm_requester/get_version.c
+++ b/unit_test/test_spdm_requester/get_version.c
@@ -757,7 +757,7 @@ static void libspdm_test_requester_get_version_case16(void **state)
     assert_int_equal(status, LIBSPDM_STATUS_SUCCESS);
     assert_int_equal(spdm_context->transcript.message_a.buffer_size,
                      m_libspdm_local_buffer_size);
-    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer (0x%x):\n",
+    LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer (0x%zx):\n",
                    m_libspdm_local_buffer_size));
     libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
     assert_memory_equal(spdm_context->transcript.message_a.buffer,
diff --git a/unit_test/test_spdm_requester/key_exchange.c b/unit_test/test_spdm_requester/key_exchange.c
index f645c74210d..71007cd8036 100644
--- a/unit_test/test_spdm_requester/key_exchange.c
+++ b/unit_test/test_spdm_requester/key_exchange.c
@@ -479,7 +479,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -645,7 +645,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -880,7 +880,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                              spdm_response, (size_t)ptr - (size_t)spdm_response);
             m_libspdm_local_buffer_size +=
                 ((size_t)ptr - (size_t)spdm_response);
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                            m_libspdm_local_buffer_size));
             libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
             libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1136,7 +1136,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                              spdm_response, (size_t)ptr - (size_t)spdm_response);
             m_libspdm_local_buffer_size +=
                 ((size_t)ptr - (size_t)spdm_response);
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                            m_libspdm_local_buffer_size));
             libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
             libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1346,7 +1346,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1521,7 +1521,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1696,7 +1696,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1872,7 +1872,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2039,7 +2039,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2206,7 +2206,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2382,7 +2382,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2550,7 +2550,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2709,7 +2709,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2845,7 +2845,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -3012,7 +3012,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -3179,7 +3179,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -3347,7 +3347,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -3505,7 +3505,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -3664,7 +3664,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -3833,7 +3833,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -4002,7 +4002,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -4171,7 +4171,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -4324,7 +4324,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                          sizeof(m_libspdm_local_buffer) - m_libspdm_local_buffer_size,
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -4489,7 +4489,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -4648,7 +4648,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -4813,7 +4813,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -4980,7 +4980,7 @@ static libspdm_return_t libspdm_requester_key_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
diff --git a/unit_test/test_spdm_requester/key_update.c b/unit_test/test_spdm_requester/key_update.c
index 75a1a9d94a5..ccd6b3820a7 100644
--- a/unit_test/test_spdm_requester/key_update.c
+++ b/unit_test/test_spdm_requester/key_update.c
@@ -504,7 +504,7 @@ libspdm_return_t libspdm_requester_key_update_test_send_message(
     case 0x17: {
         static size_t sub_index = 0;
 
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "send message: %d\n", sub_index));
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "send message: %zu\n", sub_index));
 
         if(sub_index%2 == 0) {
             libspdm_return_t status;
diff --git a/unit_test/test_spdm_requester/psk_exchange.c b/unit_test/test_spdm_requester/psk_exchange.c
index 933f1934ea8..37502dc17cb 100644
--- a/unit_test/test_spdm_requester/psk_exchange.c
+++ b/unit_test/test_spdm_requester/psk_exchange.c
@@ -390,7 +390,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -510,7 +510,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -699,7 +699,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                              spdm_response, (size_t)ptr - (size_t)spdm_response);
             m_libspdm_local_buffer_size +=
                 ((size_t)ptr - (size_t)spdm_response);
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                            m_libspdm_local_buffer_size));
             libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
             libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -907,7 +907,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                              spdm_response, (size_t)ptr - (size_t)spdm_response);
             m_libspdm_local_buffer_size +=
                 ((size_t)ptr - (size_t)spdm_response);
-            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+            LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                            m_libspdm_local_buffer_size));
             libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
             libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1070,7 +1070,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1180,7 +1180,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                          sizeof(m_libspdm_local_buffer) - m_libspdm_local_buffer_size,
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1301,7 +1301,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1433,7 +1433,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1565,7 +1565,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1698,7 +1698,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1822,7 +1822,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -1946,7 +1946,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2079,7 +2079,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2201,7 +2201,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2323,7 +2323,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2445,7 +2445,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2567,7 +2567,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2692,7 +2692,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2812,7 +2812,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -2932,7 +2932,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
@@ -3053,7 +3053,7 @@ libspdm_return_t libspdm_requester_psk_exchange_test_receive_message(
                             m_libspdm_local_buffer),
                          spdm_response, (size_t)ptr - (size_t)spdm_response);
         m_libspdm_local_buffer_size += ((size_t)ptr - (size_t)spdm_response);
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "m_libspdm_local_buffer_size (0x%zx):\n",
                        m_libspdm_local_buffer_size));
         libspdm_dump_hex(m_libspdm_local_buffer, m_libspdm_local_buffer_size);
         libspdm_init_managed_buffer(&th_curr, sizeof(th_curr.buffer));
diff --git a/unit_test/test_spdm_requester/set_certificate.c b/unit_test/test_spdm_requester/set_certificate.c
index d8c4298a2fd..b1086cd7a50 100644
--- a/unit_test/test_spdm_requester/set_certificate.c
+++ b/unit_test/test_spdm_requester/set_certificate.c
@@ -43,7 +43,7 @@ libspdm_return_t libspdm_requester_set_certificate_test_send_message(
         if (session_info == NULL) {
             return LIBSPDM_STATUS_SEND_FAIL;
         }
-        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Request (0x%x):\n",
+        LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "Request (0x%zx):\n",
                        request_size));
         libspdm_dump_hex(request, request_size);