lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Tidy up ssl_*.c grouped MBEDTLS_BYTE_x macros

Browse Source 
exchange groups of the byte reading macros with MBEDTLS_PUT_UINTxyz
and then shift the pointer afterwards. Easier to read as you can
see how big the data is that you are putting in, and in the case of
UINT32 AND UINT64 it saves some vertical space.

Signed-off-by: Joe Subbiani <joe.subbiani@arm.com>
This commit is contained in:
Joe Subbiani
2021-08-20 11:44:44 +01:00
parent 9ab1866b0d
commit 1f6c3aeb63
3 changed files with 106 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
library/ssl_tls.c
View File

@ -4664,14 +4664,8 @@ static size_t ssl_session_save_tls12( const mbedtls_ssl_session *session,
{
start = (uint64_t) session->start;
*p++ = MBEDTLS_BYTE_7( start );
*p++ = MBEDTLS_BYTE_6( start );
*p++ = MBEDTLS_BYTE_5( start );
*p++ = MBEDTLS_BYTE_4( start );
*p++ = MBEDTLS_BYTE_3( start );
*p++ = MBEDTLS_BYTE_2( start );
*p++ = MBEDTLS_BYTE_1( start );
*p++ = MBEDTLS_BYTE_0( start );
MBEDTLS_PUT_UINT64_BE( start, p, 0 );
p += 8;
}
#endif /* MBEDTLS_HAVE_TIME */
@ -4687,8 +4681,8 @@ static size_t ssl_session_save_tls12( const mbedtls_ssl_session *session,
if( used <= buf_len )
{
*p++ = MBEDTLS_BYTE_1( session->ciphersuite );
*p++ = MBEDTLS_BYTE_0( session->ciphersuite );
MBEDTLS_PUT_UINT16_BE( session->ciphersuite, p, 0 );
p += 2;
*p++ = MBEDTLS_BYTE_0( session->compression );
@ -4699,10 +4693,8 @@ static size_t ssl_session_save_tls12( const mbedtls_ssl_session *session,
memcpy( p, session->master, 48 );
p += 48;
*p++ = MBEDTLS_BYTE_3( session->verify_result );
*p++ = MBEDTLS_BYTE_2( session->verify_result );
*p++ = MBEDTLS_BYTE_1( session->verify_result );
*p++ = MBEDTLS_BYTE_0( session->verify_result );
MBEDTLS_PUT_UINT32_BE( session->verify_result, p, 0 );
p += 4;
}
/*
@ -4772,10 +4764,8 @@ static size_t ssl_session_save_tls12( const mbedtls_ssl_session *session,
p += session->ticket_len;
}
*p++ = MBEDTLS_BYTE_3( session->ticket_lifetime );
*p++ = MBEDTLS_BYTE_2( session->ticket_lifetime );
*p++ = MBEDTLS_BYTE_1( session->ticket_lifetime );
*p++ = MBEDTLS_BYTE_0( session->ticket_lifetime );
MBEDTLS_PUT_UINT32_BE( session->ticket_lifetime, p, 0 );
p += 4;
}
#endif /* MBEDTLS_SSL_SESSION_TICKETS && MBEDTLS_SSL_CLI_C */
@ -5713,10 +5703,8 @@ int mbedtls_ssl_context_save( mbedtls_ssl_context *ssl,
used += 4 + session_len;
if( used <= buf_len )
{
*p++ = MBEDTLS_BYTE_3( session_len );
*p++ = MBEDTLS_BYTE_2( session_len );
*p++ = MBEDTLS_BYTE_1( session_len );
*p++ = MBEDTLS_BYTE_0( session_len );
MBEDTLS_PUT_UINT32_BE( session_len, p, 0 );
p += 4;
ret = ssl_session_save( ssl->session, 1,
p, session_len, &session_len );
@ -5757,33 +5745,19 @@ int mbedtls_ssl_context_save( mbedtls_ssl_context *ssl,
used += 4;
if( used <= buf_len )
{
*p++ = MBEDTLS_BYTE_3( ssl->badmac_seen );
*p++ = MBEDTLS_BYTE_2( ssl->badmac_seen );
*p++ = MBEDTLS_BYTE_1( ssl->badmac_seen );
*p++ = MBEDTLS_BYTE_0( ssl->badmac_seen );
MBEDTLS_PUT_UINT32_BE( ssl->badmac_seen, p, 0 );
p += 4;
}
#if defined(MBEDTLS_SSL_DTLS_ANTI_REPLAY)
used += 16;
if( used <= buf_len )
{
*p++ = MBEDTLS_BYTE_7( ssl->in_window_top );
*p++ = MBEDTLS_BYTE_6( ssl->in_window_top );
*p++ = MBEDTLS_BYTE_5( ssl->in_window_top );
*p++ = MBEDTLS_BYTE_4( ssl->in_window_top );
*p++ = MBEDTLS_BYTE_3( ssl->in_window_top );
*p++ = MBEDTLS_BYTE_2( ssl->in_window_top );
*p++ = MBEDTLS_BYTE_1( ssl->in_window_top );
*p++ = MBEDTLS_BYTE_0( ssl->in_window_top );
MBEDTLS_PUT_UINT64_BE( ssl->in_window_top, p, 0 );
p += 8;
*p++ = MBEDTLS_BYTE_7( ssl->in_window );
*p++ = MBEDTLS_BYTE_6( ssl->in_window );
*p++ = MBEDTLS_BYTE_5( ssl->in_window );
*p++ = MBEDTLS_BYTE_4( ssl->in_window );
*p++ = MBEDTLS_BYTE_3( ssl->in_window );
*p++ = MBEDTLS_BYTE_2( ssl->in_window );
*p++ = MBEDTLS_BYTE_1( ssl->in_window );
*p++ = MBEDTLS_BYTE_0( ssl->in_window );
MBEDTLS_PUT_UINT64_BE( ssl->in_window, p, 0 );
p += 8;
}
#endif /* MBEDTLS_SSL_DTLS_ANTI_REPLAY */
@ -5806,8 +5780,8 @@ int mbedtls_ssl_context_save( mbedtls_ssl_context *ssl,
used += 2;
if( used <= buf_len )
{
*p++ = MBEDTLS_BYTE_1( ssl->mtu );
*p++ = MBEDTLS_BYTE_0( ssl->mtu );
MBEDTLS_PUT_UINT16_BE( ssl->mtu, p, 0 );
p += 2;
}
#endif /* MBEDTLS_SSL_PROTO_DTLS */