From a9d4ef0998a0b77108b906bbbec1d9ac65679b53 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 3 Jun 2024 22:16:23 +0200 Subject: [PATCH 1/2] Fix uint32_t printed as unsigned int This is ok in practice since we don't support 16-bit platforms, but it makes `arm-none-eabi-gcc-10 -mthumb -Wformat` complain. Signed-off-by: Gilles Peskine --- library/ssl_tls13_generic.c | 9 ++++++--- library/ssl_tls13_server.c | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c index 3be6db78fc..529cbb9932 100644 --- a/library/ssl_tls13_generic.c +++ b/library/ssl_tls13_generic.c @@ -1484,9 +1484,12 @@ int mbedtls_ssl_tls13_check_early_data_len(mbedtls_ssl_context *ssl, ssl->total_early_data_size)) { MBEDTLS_SSL_DEBUG_MSG( - 2, ("EarlyData: Too much early data received, %u + %" MBEDTLS_PRINTF_SIZET " > %u", - ssl->total_early_data_size, early_data_len, - ssl->session_negotiate->max_early_data_size)); + 2, ("EarlyData: Too much early data received, " + "%" MBEDTLS_PRINTF_SIZET " + %" MBEDTLS_PRINTF_SIZET + " > %" MBEDTLS_PRINTF_SIZET, + (size_t) ssl->total_early_data_size, + early_data_len, + (size_t) ssl->session_negotiate->max_early_data_size)); MBEDTLS_SSL_PEND_FATAL_ALERT( MBEDTLS_SSL_ALERT_MSG_UNEXPECTED_MESSAGE, diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c index 6fe8caeca4..f5ef92032b 100644 --- a/library/ssl_tls13_server.c +++ b/library/ssl_tls13_server.c @@ -92,8 +92,9 @@ static void ssl_tls13_select_ciphersuite( return; } - MBEDTLS_SSL_DEBUG_MSG(2, ("No matched ciphersuite, psk_ciphersuite_id=%x, psk_hash_alg=%x", - (unsigned) psk_ciphersuite_id, psk_hash_alg)); + MBEDTLS_SSL_DEBUG_MSG(2, ("No matched ciphersuite, psk_ciphersuite_id=%x, psk_hash_alg=%lx", + (unsigned) psk_ciphersuite_id, + (unsigned long) psk_hash_alg)); } #if defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_SOME_PSK_ENABLED) From 69770aaa7b69deb45ed45e91520b9efdd4dcdaa3 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Tue, 4 Jun 2024 08:45:58 +0200 Subject: [PATCH 2/2] Use unsigned long rather than size_t for format string readability Signed-off-by: Gilles Peskine --- library/ssl_tls13_generic.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c index 529cbb9932..8ac6579e05 100644 --- a/library/ssl_tls13_generic.c +++ b/library/ssl_tls13_generic.c @@ -1485,11 +1485,10 @@ int mbedtls_ssl_tls13_check_early_data_len(mbedtls_ssl_context *ssl, MBEDTLS_SSL_DEBUG_MSG( 2, ("EarlyData: Too much early data received, " - "%" MBEDTLS_PRINTF_SIZET " + %" MBEDTLS_PRINTF_SIZET - " > %" MBEDTLS_PRINTF_SIZET, - (size_t) ssl->total_early_data_size, + "%lu + %" MBEDTLS_PRINTF_SIZET " > %lu", + (unsigned long) ssl->total_early_data_size, early_data_len, - (size_t) ssl->session_negotiate->max_early_data_size)); + (unsigned long) ssl->session_negotiate->max_early_data_size)); MBEDTLS_SSL_PEND_FATAL_ALERT( MBEDTLS_SSL_ALERT_MSG_UNEXPECTED_MESSAGE,