From 7b5ba84624e57bfca0aaa8df63d0fee8b0ccb1a0 Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Thu, 25 Jul 2019 10:16:37 +0100 Subject: [PATCH] Remove integer parsing macro If this is introduced, it should be defined in a prominent place and put to use throughout the library, but this is left for another time. --- library/ssl_tls.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 33823380f..47b1538c2 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -4935,12 +4935,9 @@ static int ssl_parse_record_header( mbedtls_ssl_context const *ssl, * Parse record length. */ -#define READ_UINT16_BE( p ) \ - ( ( *( (unsigned char*)( p ) + 0 ) << 8 ) | \ - ( *( (unsigned char*)( p ) + 1 ) << 0 ) ) - rec->data_offset = rec_hdr_len_offset + rec_hdr_len_len; - rec->data_len = (size_t) READ_UINT16_BE( buf + rec_hdr_len_offset ); + rec->data_len = ( (size_t) buf[ rec_hdr_len_offset + 0 ] << 8 ) | + ( (size_t) buf[ rec_hdr_len_offset + 1 ] << 0 ); MBEDTLS_SSL_DEBUG_BUF( 4, "input record header", buf, rec->data_offset ); MBEDTLS_SSL_DEBUG_MSG( 3, ( "input record: msgtype = %d, "