Mbed-TLS/mbedtls-framework
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls-framework.git synced 2026-10-01 22:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

library: debug: fix print format in mbedtls_debug_print_buf_ext()

Browse Source 
%zu creates problem in MinGW testing. Use MBEDTLS_PRINTF_SIZET intead.

Signed-off-by: Valerio Setti <[email protected]>
This commit is contained in:
Valerio Setti
2026-01-08 10:32:57 +01:00
parent d040eb823e
commit 2af638a177
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mbedtls/debug.h
+2
View File
@@ -89,10 +89,12 @@
#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900) #if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900)
#include <inttypes.h> #include <inttypes.h>
#define MBEDTLS_PRINTF_SIZET PRIuPTR #define MBEDTLS_PRINTF_SIZET PRIuPTR
#define MBEDTLS_PRINTF_SIZET_HEX PRIxPTR
#define MBEDTLS_PRINTF_LONGLONG "I64d" #define MBEDTLS_PRINTF_LONGLONG "I64d"
#else \ #else \
/* defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900) */ /* defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900) */
#define MBEDTLS_PRINTF_SIZET "zu" #define MBEDTLS_PRINTF_SIZET "zu"
#define MBEDTLS_PRINTF_SIZET_HEX "zx"
#define MBEDTLS_PRINTF_LONGLONG "lld" #define MBEDTLS_PRINTF_LONGLONG "lld"
#endif \ #endif \
/* defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900) */ /* defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900) */
library/debug.c
+3 -2
View File
@@ -154,12 +154,13 @@ static void mbedtls_debug_print_buf_ext(const mbedtls_ssl_context *ssl, int leve
return; return;
} }
mbedtls_snprintf(str, sizeof(str), "dumping '%s' (%zu bytes)\n", text, len); mbedtls_snprintf(str, sizeof(str), "dumping '%s' (%" MBEDTLS_PRINTF_SIZET " bytes)\n",
text, len);
debug_send_line(ssl, level, file, line, str); debug_send_line(ssl, level, file, line, str);
while (len > 0) { while (len > 0) {
memset(str, 0, sizeof(str)); memset(str, 0, sizeof(str));
idx = mbedtls_snprintf(str, sizeof(str), "%04zx: ", curr_offset); idx = mbedtls_snprintf(str, sizeof(str), "%04" MBEDTLS_PRINTF_SIZET_HEX ": ", curr_offset);
chunk_len = (len >= 16) ? 16 : len; chunk_len = (len >= 16) ? 16 : len;
mbedtls_debug_print_buf_one_line(str + idx, sizeof(str) - idx, mbedtls_debug_print_buf_one_line(str + idx, sizeof(str) - idx,
&buf[curr_offset], chunk_len, &buf[curr_offset], chunk_len,