cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-23 04:26:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10157 from diopoex/development

Browse Source 
Remove use of mbedtls_md_get_name() from ssl_context_info.c
This commit is contained in:
Gilles Peskine 2025-04-30 07:00:01 +00:00 committed by GitHub
commit 5f6c6334f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
programs/ssl/ssl_context_info.c
View File

@ -547,22 +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 {
#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));
}
#endif /* MBEDTLS_MD_C */
printf("\tMessage-Digest : %d\n", ciphersuite_info->MBEDTLS_PRIVATE(mac));
}
CHECK_SSL_END(1);

6
tests/context-info.sh
View File

@ -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.* 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.* 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.* 9$" \
-u "compression.* disabled$" \
-u "serial number.* 01:70:AF:40:B4:E6$" \
-u "issuer name.* CN=ca$" \