ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-07-24 01:51:03 +08:00
Code Issues Releases Wiki Activity

Unify handshake fragment log messages

Browse Source 
There is no longer any different processing at this point, just
near-identical log messages.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2025-03-06 19:22:52 +01:00
parent b888cca5b6
commit 0a467ccd24
1 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
library/ssl_msg.c
View File

@ -3324,40 +3324,19 @@ int mbedtls_ssl_prepare_handshake_record(mbedtls_ssl_context *ssl)
const size_t hs_this_fragment_len = const size_t hs_this_fragment_len =
ssl->in_msglen > hs_remain ? hs_remain : ssl->in_msglen; ssl->in_msglen > hs_remain ? hs_remain : ssl->in_msglen;
if (ssl->badmac_seen_or_in_hsfraglen != 0) { MBEDTLS_SSL_DEBUG_MSG(3,
/* We already had a handshake fragment. Prepare to append ("%s handshake fragment: %" MBEDTLS_PRINTF_SIZET
* to the initial segment. */ ", %u..%u of %" MBEDTLS_PRINTF_SIZET,
MBEDTLS_SSL_DEBUG_MSG(3, (ssl->badmac_seen_or_in_hsfraglen != 0 ?
("subsequent handshake fragment: %" MBEDTLS_PRINTF_SIZET "subsequent" :
", %u..%u of %" MBEDTLS_PRINTF_SIZET, hs_this_fragment_len == ssl->in_hslen ?
ssl->in_msglen, "sole" :
ssl->badmac_seen_or_in_hsfraglen, "initial"),
ssl->badmac_seen_or_in_hsfraglen + ssl->in_msglen,
(unsigned) hs_this_fragment_len, ssl->badmac_seen_or_in_hsfraglen,
ssl->in_hslen)); ssl->badmac_seen_or_in_hsfraglen +
} else if (hs_this_fragment_len == ssl->in_hslen) { (unsigned) hs_this_fragment_len,
/* This is the sole fragment. */ ssl->in_hslen));
/* Emit a log message in the same format as when there are
* multiple fragments, for ease of matching. */
MBEDTLS_SSL_DEBUG_MSG(3,
("sole handshake fragment: %" MBEDTLS_PRINTF_SIZET
", %u..%u of %" MBEDTLS_PRINTF_SIZET,
ssl->in_msglen,
ssl->badmac_seen_or_in_hsfraglen,
ssl->badmac_seen_or_in_hsfraglen +
(unsigned) hs_this_fragment_len,
ssl->in_hslen));
} else {
/* This is the first fragment of many. */
MBEDTLS_SSL_DEBUG_MSG(3,
("initial handshake fragment: %" MBEDTLS_PRINTF_SIZET
", %u..%u of %" MBEDTLS_PRINTF_SIZET,
ssl->in_msglen,
ssl->badmac_seen_or_in_hsfraglen,
ssl->badmac_seen_or_in_hsfraglen +
(unsigned) hs_this_fragment_len,
ssl->in_hslen));
}
/* Move the received handshake fragment to have the whole message /* Move the received handshake fragment to have the whole message
* (at least the part received so far) in a single segment at a * (at least the part received so far) in a single segment at a