diff options
| author | Tom Cosgrove <tom.cosgrove@arm.com> | 2024-06-10 15:13:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-10 15:13:40 +0000 |
| commit | c9ab3677a28fb72d55e2bae692167b45643742a5 (patch) | |
| tree | 9f0d9826426a469e18c0ecd27b651b79b05d016f | |
| parent | d28534c5b03d4f9b6ab6f70725d1fa31f18467fc (diff) | |
| parent | 69770aaa7b69deb45ed45e91520b9efdd4dcdaa3 (diff) | |
| download | mbedtls-upstream-development.tar.gz | |
Merge pull request #9225 from gilles-peskine-arm/tls13-debug-print-uint32-fixupstream-development
Fix uint32_t printed as unsigned int
| -rw-r--r-- | library/ssl_tls13_generic.c | 8 | ||||
| -rw-r--r-- | library/ssl_tls13_server.c | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c index 3be6db78f..8ac6579e0 100644 --- a/library/ssl_tls13_generic.c +++ b/library/ssl_tls13_generic.c @@ -1484,9 +1484,11 @@ 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, " + "%lu + %" MBEDTLS_PRINTF_SIZET " > %lu", + (unsigned long) ssl->total_early_data_size, + early_data_len, + (unsigned long) 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 6fe8caeca..f5ef92032 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) |