From da9527473076a466fd950d50391caa645e0ab52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20H=C3=B6hn?= Date: Mon, 28 Apr 2025 19:40:52 +0200 Subject: [PATCH 1/4] ssl context fix for 4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paul Höhn --- programs/ssl/ssl_context_info.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/programs/ssl/ssl_context_info.c b/programs/ssl/ssl_context_info.c index 00238145d..4e844d4c0 100644 --- a/programs/ssl/ssl_context_info.c +++ b/programs/ssl/ssl_context_info.c @@ -547,21 +547,13 @@ static void print_deserialized_ssl_session(const uint8_t *ssl, uint32_t len, if (ciphersuite_info == NULL) { printf_err("Cannot find ciphersuite info\n"); } else { -#if defined(MBEDTLS_MD_C) - const mbedtls_md_info_t *md_info; -#endif printf("\tciphersuite : %s\n", mbedtls_ssl_ciphersuite_get_name(ciphersuite_info)); printf("\tcipher flags : 0x%02X\n", ciphersuite_info->MBEDTLS_PRIVATE(flags)); printf("\tcipher type : %d\n", ciphersuite_info->MBEDTLS_PRIVATE(cipher)); #if defined(MBEDTLS_MD_C) - md_info = mbedtls_md_info_from_type(ciphersuite_info->MBEDTLS_PRIVATE(mac)); - if (md_info == NULL) { - printf_err("Cannot find Message-Digest info\n"); - } else { - printf("\tMessage-Digest : %s\n", mbedtls_md_get_name(md_info)); - } + printf("\tMessage-Digest : %d\n", ciphersuite_info->MBEDTLS_PRIVATE(mac)); #endif /* MBEDTLS_MD_C */ } From 5a7a5305e8b16cbacf0036384c3fc49e68dedaa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20H=C3=B6hn?= Date: Tue, 29 Apr 2025 16:34:14 +0200 Subject: [PATCH 2/4] removed trailing whitespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paul Höhn --- programs/ssl/ssl_context_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/ssl/ssl_context_info.c b/programs/ssl/ssl_context_info.c index 4e844d4c0..11c358946 100644 --- a/programs/ssl/ssl_context_info.c +++ b/programs/ssl/ssl_context_info.c @@ -553,7 +553,7 @@ static void print_deserialized_ssl_session(const uint8_t *ssl, uint32_t len, printf("\tcipher type : %d\n", ciphersuite_info->MBEDTLS_PRIVATE(cipher)); #if defined(MBEDTLS_MD_C) - printf("\tMessage-Digest : %d\n", ciphersuite_info->MBEDTLS_PRIVATE(mac)); + printf("\tMessage-Digest : %d\n", ciphersuite_info->MBEDTLS_PRIVATE(mac)); #endif /* MBEDTLS_MD_C */ } From e38041673f1e8267b8a674041af92ea085f9ec62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20H=C3=B6hn?= Date: Tue, 29 Apr 2025 18:52:13 +0200 Subject: [PATCH 3/4] fixed the tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paul Höhn --- tests/context-info.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/context-info.sh b/tests/context-info.sh index 066bd3d58..997d69bba 100755 --- a/tests/context-info.sh +++ b/tests/context-info.sh @@ -205,7 +205,7 @@ run_test "Default configuration, server" \ -u "MBEDTLS_SSL_ALPN$" \ -u "ciphersuite.* TLS-ECDHE-RSA-WITH-CHACHA20-POLY1305-SHA256$" \ -u "cipher flags.* 0x00$" \ - -u "Message-Digest.* SHA256$" \ + -u "Message-Digest.* [0-9]\+$" \ -u "compression.* disabled$" \ -u "DTLS datagram packing.* enabled$" \ -n "Certificate" \ @@ -227,7 +227,7 @@ run_test "Default configuration, client" \ -u "MBEDTLS_SSL_ALPN$" \ -u "ciphersuite.* TLS-ECDHE-RSA-WITH-CHACHA20-POLY1305-SHA256$" \ -u "cipher flags.* 0x00$" \ - -u "Message-Digest.* SHA256$" \ + -u "Message-Digest.* [0-9]\+$" \ -u "compression.* disabled$" \ -u "DTLS datagram packing.* enabled$" \ -u "cert. version .* 3$" \ @@ -348,7 +348,7 @@ run_test "Older version (v2.19.1)" \ -u "minor.* 19$" \ -u "path.* 1$" \ -u "ciphersuite.* TLS-ECDHE-ECDSA-WITH-AES-128-CCM-8$" \ - -u "Message-Digest.* SHA256$" \ + -u "Message-Digest.* [0-9]\+$" \ -u "compression.* disabled$" \ -u "serial number.* 01:70:AF:40:B4:E6$" \ -u "issuer name.* CN=ca$" \ From 02c80e631f3ec44d1aa8a9cfc03cc1ddb9252a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20H=C3=B6hn?= Date: Tue, 29 Apr 2025 22:02:24 +0200 Subject: [PATCH 4/4] Fix test and formatting in ssl_context_info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paul Höhn --- programs/ssl/ssl_context_info.c | 4 ---- tests/context-info.sh | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/programs/ssl/ssl_context_info.c b/programs/ssl/ssl_context_info.c index 11c358946..7bcd50fe6 100644 --- a/programs/ssl/ssl_context_info.c +++ b/programs/ssl/ssl_context_info.c @@ -547,14 +547,10 @@ static void print_deserialized_ssl_session(const uint8_t *ssl, uint32_t len, if (ciphersuite_info == NULL) { printf_err("Cannot find ciphersuite info\n"); } else { - printf("\tciphersuite : %s\n", mbedtls_ssl_ciphersuite_get_name(ciphersuite_info)); printf("\tcipher flags : 0x%02X\n", ciphersuite_info->MBEDTLS_PRIVATE(flags)); printf("\tcipher type : %d\n", ciphersuite_info->MBEDTLS_PRIVATE(cipher)); - -#if defined(MBEDTLS_MD_C) printf("\tMessage-Digest : %d\n", ciphersuite_info->MBEDTLS_PRIVATE(mac)); -#endif /* MBEDTLS_MD_C */ } CHECK_SSL_END(1); diff --git a/tests/context-info.sh b/tests/context-info.sh index 997d69bba..4ad5e0c4f 100755 --- a/tests/context-info.sh +++ b/tests/context-info.sh @@ -205,7 +205,7 @@ run_test "Default configuration, server" \ -u "MBEDTLS_SSL_ALPN$" \ -u "ciphersuite.* TLS-ECDHE-RSA-WITH-CHACHA20-POLY1305-SHA256$" \ -u "cipher flags.* 0x00$" \ - -u "Message-Digest.* [0-9]\+$" \ + -u "Message-Digest.* 9$" \ -u "compression.* disabled$" \ -u "DTLS datagram packing.* enabled$" \ -n "Certificate" \ @@ -227,7 +227,7 @@ run_test "Default configuration, client" \ -u "MBEDTLS_SSL_ALPN$" \ -u "ciphersuite.* TLS-ECDHE-RSA-WITH-CHACHA20-POLY1305-SHA256$" \ -u "cipher flags.* 0x00$" \ - -u "Message-Digest.* [0-9]\+$" \ + -u "Message-Digest.* 9$" \ -u "compression.* disabled$" \ -u "DTLS datagram packing.* enabled$" \ -u "cert. version .* 3$" \ @@ -348,7 +348,7 @@ run_test "Older version (v2.19.1)" \ -u "minor.* 19$" \ -u "path.* 1$" \ -u "ciphersuite.* TLS-ECDHE-ECDSA-WITH-AES-128-CCM-8$" \ - -u "Message-Digest.* [0-9]\+$" \ + -u "Message-Digest.* 9$" \ -u "compression.* disabled$" \ -u "serial number.* 01:70:AF:40:B4:E6$" \ -u "issuer name.* CN=ca$" \