ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-06-26 15:07:59 +08:00
Code Issues Releases Wiki Activity

Remove in_hshdr

Browse Source 
The first fragment of a fragmented handshake message always starts at the beginning of the buffer so there's no need to store it.

Signed-off-by: Deomid rojer Ryabkov <rojer@rojer.me>
This commit is contained in:
Deomid rojer Ryabkov 2025-02-13 13:41:51 +03:00
parent cf4e6a18e6
commit dd14c0a11e
3 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/mbedtls/ssl.h
View File

@ -1808,8 +1808,8 @@ struct mbedtls_ssl_context {
size_t MBEDTLS_PRIVATE(in_hslen); /*!< current handshake message length, size_t MBEDTLS_PRIVATE(in_hslen); /*!< current handshake message length,
including the handshake header */ including the handshake header */
unsigned char *MBEDTLS_PRIVATE(in_hshdr); /*!< original handshake header start */ size_t MBEDTLS_PRIVATE(in_hsfraglen); /*!< accumulated length of hs fragments
size_t MBEDTLS_PRIVATE(in_hsfraglen); /*!< accumulated hs fragments length */ (up to in_hslen) */
int MBEDTLS_PRIVATE(nb_zero); /*!< # of 0-length encrypted messages */ int MBEDTLS_PRIVATE(nb_zero); /*!< # of 0-length encrypted messages */
int MBEDTLS_PRIVATE(keep_current_message); /*!< drop or reuse current message int MBEDTLS_PRIVATE(keep_current_message); /*!< drop or reuse current message

20
library/ssl_msg.c
View File

@ -3229,7 +3229,6 @@ int mbedtls_ssl_prepare_handshake_record(mbedtls_ssl_context *ssl)
if (ssl->in_hslen == 0) { if (ssl->in_hslen == 0) {
ssl->in_hslen = mbedtls_ssl_hs_hdr_len(ssl) + ssl_get_hs_total_len(ssl); ssl->in_hslen = mbedtls_ssl_hs_hdr_len(ssl) + ssl_get_hs_total_len(ssl);
ssl->in_hsfraglen = 0; ssl->in_hsfraglen = 0;
ssl->in_hshdr = ssl->in_hdr;
} }
MBEDTLS_SSL_DEBUG_MSG(3, ("handshake message: msglen =" MBEDTLS_SSL_DEBUG_MSG(3, ("handshake message: msglen ="
@ -3296,10 +3295,7 @@ int mbedtls_ssl_prepare_handshake_record(mbedtls_ssl_context *ssl)
} }
} else } else
#endif /* MBEDTLS_SSL_PROTO_DTLS */ #endif /* MBEDTLS_SSL_PROTO_DTLS */
{ if (ssl->in_hsfraglen <= ssl->in_hslen) {
if (ssl->in_hsfraglen > ssl->in_hslen) {
return MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
}
int ret; int ret;
const size_t hs_remain = ssl->in_hslen - ssl->in_hsfraglen; const size_t hs_remain = ssl->in_hslen - ssl->in_hsfraglen;
MBEDTLS_SSL_DEBUG_MSG(3, MBEDTLS_SSL_DEBUG_MSG(3,
@ -3317,15 +3313,16 @@ int mbedtls_ssl_prepare_handshake_record(mbedtls_ssl_context *ssl)
mbedtls_ssl_update_in_pointers(ssl); mbedtls_ssl_update_in_pointers(ssl);
return MBEDTLS_ERR_SSL_CONTINUE_PROCESSING; return MBEDTLS_ERR_SSL_CONTINUE_PROCESSING;
} }
if (ssl->in_hshdr != ssl->in_hdr) { if (ssl->in_hsfraglen > 0) {
/* /*
* At ssl->in_hshdr we have a sequence of records that cover the next handshake * At in_first_hdr we have a sequence of records that cover the next handshake
* record, each with its own record header that we need to remove. * record, each with its own record header that we need to remove.
* Note that the reassembled record size may not equal the size of the message, * Note that the reassembled record size may not equal the size of the message,
* there maybe bytes from the next message following it. * there may be more messages after it, complete or partial.
*/ */
unsigned char *in_first_hdr = ssl->in_buf + MBEDTLS_SSL_SEQUENCE_NUMBER_LEN;
unsigned char *p = in_first_hdr, *q = NULL;
size_t merged_rec_len = 0; size_t merged_rec_len = 0;
unsigned char *p = ssl->in_hshdr, *q = NULL;
do { do {
mbedtls_record rec; mbedtls_record rec;
ret = ssl_parse_record_header(ssl, p, mbedtls_ssl_in_hdr_len(ssl), &rec); ret = ssl_parse_record_header(ssl, p, mbedtls_ssl_in_hdr_len(ssl), &rec);
@ -3341,16 +3338,17 @@ int mbedtls_ssl_prepare_handshake_record(mbedtls_ssl_context *ssl)
q = p; q = p;
} }
} while (merged_rec_len < ssl->in_hslen); } while (merged_rec_len < ssl->in_hslen);
ssl->in_hdr = ssl->in_hshdr; ssl->in_hdr = in_first_hdr;
mbedtls_ssl_update_in_pointers(ssl); mbedtls_ssl_update_in_pointers(ssl);
ssl->in_msglen = merged_rec_len; ssl->in_msglen = merged_rec_len;
/* Adjust message length. */ /* Adjust message length. */
MBEDTLS_PUT_UINT16_BE(merged_rec_len, ssl->in_len, 0); MBEDTLS_PUT_UINT16_BE(merged_rec_len, ssl->in_len, 0);
ssl->in_hsfraglen = 0; ssl->in_hsfraglen = 0;
ssl->in_hshdr = NULL;
MBEDTLS_SSL_DEBUG_BUF(4, "reassembled record", MBEDTLS_SSL_DEBUG_BUF(4, "reassembled record",
ssl->in_hdr, mbedtls_ssl_in_hdr_len(ssl) + merged_rec_len); ssl->in_hdr, mbedtls_ssl_in_hdr_len(ssl) + merged_rec_len);
} }
} else {
return MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
} }
return 0; return 0;

10
library/ssl_tls.c
View File

@ -345,15 +345,11 @@ static void handle_buffer_resizing(mbedtls_ssl_context *ssl, int downsizing,
int modified = 0; int modified = 0;
size_t written_in = 0, iv_offset_in = 0, len_offset_in = 0, hdr_in = 0; size_t written_in = 0, iv_offset_in = 0, len_offset_in = 0, hdr_in = 0;
size_t written_out = 0, iv_offset_out = 0, len_offset_out = 0; size_t written_out = 0, iv_offset_out = 0, len_offset_out = 0;
size_t hshdr_in = 0;
if (ssl->in_buf != NULL) { if (ssl->in_buf != NULL) {
written_in = ssl->in_msg - ssl->in_buf; written_in = ssl->in_msg - ssl->in_buf;
iv_offset_in = ssl->in_iv - ssl->in_buf; iv_offset_in = ssl->in_iv - ssl->in_buf;
len_offset_in = ssl->in_len - ssl->in_buf; len_offset_in = ssl->in_len - ssl->in_buf;
hdr_in = ssl->in_hdr - ssl->in_buf; hdr_in = ssl->in_hdr - ssl->in_buf;
if (ssl->in_hshdr != NULL) {
hshdr_in = ssl->in_hshdr - ssl->in_buf;
}
if (downsizing ? if (downsizing ?
ssl->in_buf_len > in_buf_new_len && ssl->in_left < in_buf_new_len : ssl->in_buf_len > in_buf_new_len && ssl->in_left < in_buf_new_len :
ssl->in_buf_len < in_buf_new_len) { ssl->in_buf_len < in_buf_new_len) {
@ -398,9 +394,6 @@ static void handle_buffer_resizing(mbedtls_ssl_context *ssl, int downsizing,
ssl->in_msg = ssl->in_buf + written_in; ssl->in_msg = ssl->in_buf + written_in;
ssl->in_len = ssl->in_buf + len_offset_in; ssl->in_len = ssl->in_buf + len_offset_in;
ssl->in_iv = ssl->in_buf + iv_offset_in; ssl->in_iv = ssl->in_buf + iv_offset_in;
if (ssl->in_hshdr != NULL) {
ssl->in_hshdr = ssl->in_buf + hshdr_in;
}
} }
} }
#endif /* MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH */ #endif /* MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH */
@ -1494,10 +1487,9 @@ void mbedtls_ssl_session_reset_msg_layer(mbedtls_ssl_context *ssl,
ssl->in_msgtype = 0; ssl->in_msgtype = 0;
ssl->in_msglen = 0; ssl->in_msglen = 0;
ssl->in_hslen = 0; ssl->in_hslen = 0;
ssl->in_hsfraglen = 0;
ssl->keep_current_message = 0; ssl->keep_current_message = 0;
ssl->transform_in = NULL; ssl->transform_in = NULL;
ssl->in_hshdr = NULL;
ssl->in_hsfraglen = 0;
#if defined(MBEDTLS_SSL_PROTO_DTLS) #if defined(MBEDTLS_SSL_PROTO_DTLS)
ssl->next_record_offset = 0; ssl->next_record_offset = 0;