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

Add Character byte reading macros

Browse Source 
These cast to an unsigned char rather than a uint8_t
like with MBEDTLS_BYTE_x
These save alot of space and will improve maintence by
replacing the appropriate code with MBEDTLS_CHAR_x

Signed-off-by: Joe Subbiani <joe.subbiani@arm.com>
This commit is contained in:
Joe Subbiani
2021-07-08 14:59:52 +01:00
parent 6a50631497
commit cd84d76e9b
12 changed files with 328 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
library/ssl_tls.c
View File

@ -4582,8 +4582,8 @@ static unsigned char ssl_serialized_session_header[] = {
MBEDTLS_VERSION_MAJOR,
MBEDTLS_VERSION_MINOR,
MBEDTLS_VERSION_PATCH,
( SSL_SERIALIZED_SESSION_CONFIG_BITFLAG >> 8 ) & 0xFF,
( SSL_SERIALIZED_SESSION_CONFIG_BITFLAG >> 0 ) & 0xFF,
MBEDTLS_CHAR_1( SSL_SERIALIZED_SESSION_CONFIG_BITFLAG ),
MBEDTLS_CHAR_0( SSL_SERIALIZED_SESSION_CONFIG_BITFLAG ),
};
/*
@ -4664,14 +4664,14 @@ static size_t ssl_session_save_tls12( const mbedtls_ssl_session *session,
{
start = (uint64_t) session->start;
*p++ = (unsigned char)( ( start >> 56 ) & 0xFF );
*p++ = (unsigned char)( ( start >> 48 ) & 0xFF );
*p++ = (unsigned char)( ( start >> 40 ) & 0xFF );
*p++ = (unsigned char)( ( start >> 32 ) & 0xFF );
*p++ = (unsigned char)( ( start >> 24 ) & 0xFF );
*p++ = (unsigned char)( ( start >> 16 ) & 0xFF );
*p++ = (unsigned char)( ( start >> 8 ) & 0xFF );
*p++ = (unsigned char)( ( start ) & 0xFF );
*p++ = MBEDTLS_CHAR_7( start );
*p++ = MBEDTLS_CHAR_6( start );
*p++ = MBEDTLS_CHAR_5( start );
*p++ = MBEDTLS_CHAR_4( start );
*p++ = MBEDTLS_CHAR_3( start );
*p++ = MBEDTLS_CHAR_2( start );
*p++ = MBEDTLS_CHAR_1( start );
*p++ = MBEDTLS_CHAR_0( start );
}
#endif /* MBEDTLS_HAVE_TIME */
@ -4687,22 +4687,22 @@ static size_t ssl_session_save_tls12( const mbedtls_ssl_session *session,
if( used <= buf_len )
{
*p++ = (unsigned char)( ( session->ciphersuite >> 8 ) & 0xFF );
*p++ = (unsigned char)( ( session->ciphersuite ) & 0xFF );
*p++ = MBEDTLS_CHAR_1( session->ciphersuite );
*p++ = MBEDTLS_CHAR_0( session->ciphersuite );
*p++ = (unsigned char)( session->compression & 0xFF );
*p++ = MBEDTLS_CHAR_0( session->compression );
*p++ = (unsigned char)( session->id_len & 0xFF );
*p++ = MBEDTLS_CHAR_0( session->id_len );
memcpy( p, session->id, 32 );
p += 32;
memcpy( p, session->master, 48 );
p += 48;
*p++ = (unsigned char)( ( session->verify_result >> 24 ) & 0xFF );
*p++ = (unsigned char)( ( session->verify_result >> 16 ) & 0xFF );
*p++ = (unsigned char)( ( session->verify_result >> 8 ) & 0xFF );
*p++ = (unsigned char)( ( session->verify_result ) & 0xFF );
*p++ = MBEDTLS_CHAR_3( session->verify_result );
*p++ = MBEDTLS_CHAR_2( session->verify_result );
*p++ = MBEDTLS_CHAR_1( session->verify_result );
*p++ = MBEDTLS_CHAR_0( session->verify_result );
}
/*
@ -4719,9 +4719,9 @@ static size_t ssl_session_save_tls12( const mbedtls_ssl_session *session,
if( used <= buf_len )
{
*p++ = (unsigned char)( ( cert_len >> 16 ) & 0xFF );
*p++ = (unsigned char)( ( cert_len >> 8 ) & 0xFF );
*p++ = (unsigned char)( ( cert_len ) & 0xFF );
*p++ = MBEDTLS_CHAR_2( cert_len );
*p++ = MBEDTLS_CHAR_1( cert_len );
*p++ = MBEDTLS_CHAR_0( cert_len );
if( session->peer_cert != NULL )
{
@ -4762,9 +4762,9 @@ static size_t ssl_session_save_tls12( const mbedtls_ssl_session *session,
if( used <= buf_len )
{
*p++ = (unsigned char)( ( session->ticket_len >> 16 ) & 0xFF );
*p++ = (unsigned char)( ( session->ticket_len >> 8 ) & 0xFF );
*p++ = (unsigned char)( ( session->ticket_len ) & 0xFF );
*p++ = MBEDTLS_CHAR_2( session->ticket_len );
*p++ = MBEDTLS_CHAR_1( session->ticket_len );
*p++ = MBEDTLS_CHAR_0( session->ticket_len );
if( session->ticket != NULL )
{
@ -4772,10 +4772,10 @@ static size_t ssl_session_save_tls12( const mbedtls_ssl_session *session,
p += session->ticket_len;
}
*p++ = (unsigned char)( ( session->ticket_lifetime >> 24 ) & 0xFF );
*p++ = (unsigned char)( ( session->ticket_lifetime >> 16 ) & 0xFF );
*p++ = (unsigned char)( ( session->ticket_lifetime >> 8 ) & 0xFF );
*p++ = (unsigned char)( ( session->ticket_lifetime ) & 0xFF );
*p++ = MBEDTLS_CHAR_3( session->ticket_lifetime );
*p++ = MBEDTLS_CHAR_2( session->ticket_lifetime );
*p++ = MBEDTLS_CHAR_1( session->ticket_lifetime );
*p++ = MBEDTLS_CHAR_0( session->ticket_lifetime );
}
#endif /* MBEDTLS_SSL_SESSION_TICKETS && MBEDTLS_SSL_CLI_C */
@ -4793,7 +4793,7 @@ static size_t ssl_session_save_tls12( const mbedtls_ssl_session *session,
used += 1;
if( used <= buf_len )
*p++ = (unsigned char)( ( session->encrypt_then_mac ) & 0xFF );
*p++ = MBEDTLS_CHAR_0( session->encrypt_then_mac );
#endif
return( used );
@ -5568,11 +5568,11 @@ static unsigned char ssl_serialized_context_header[] = {
MBEDTLS_VERSION_MAJOR,
MBEDTLS_VERSION_MINOR,
MBEDTLS_VERSION_PATCH,
( SSL_SERIALIZED_SESSION_CONFIG_BITFLAG >> 8 ) & 0xFF,
( SSL_SERIALIZED_SESSION_CONFIG_BITFLAG >> 0 ) & 0xFF,
( SSL_SERIALIZED_CONTEXT_CONFIG_BITFLAG >> 16 ) & 0xFF,
( SSL_SERIALIZED_CONTEXT_CONFIG_BITFLAG >> 8 ) & 0xFF,
( SSL_SERIALIZED_CONTEXT_CONFIG_BITFLAG >> 0 ) & 0xFF,
MBEDTLS_CHAR_1( SSL_SERIALIZED_SESSION_CONFIG_BITFLAG ),
MBEDTLS_CHAR_0( SSL_SERIALIZED_SESSION_CONFIG_BITFLAG ),
MBEDTLS_CHAR_2( SSL_SERIALIZED_CONTEXT_CONFIG_BITFLAG ),
MBEDTLS_CHAR_1( SSL_SERIALIZED_CONTEXT_CONFIG_BITFLAG ),
MBEDTLS_CHAR_0( SSL_SERIALIZED_CONTEXT_CONFIG_BITFLAG ),
};
/*
@ -5713,10 +5713,10 @@ int mbedtls_ssl_context_save( mbedtls_ssl_context *ssl,
used += 4 + session_len;
if( used <= buf_len )
{
*p++ = (unsigned char)( ( session_len >> 24 ) & 0xFF );
*p++ = (unsigned char)( ( session_len >> 16 ) & 0xFF );
*p++ = (unsigned char)( ( session_len >> 8 ) & 0xFF );
*p++ = (unsigned char)( ( session_len ) & 0xFF );
*p++ = MBEDTLS_CHAR_3( session_len );
*p++ = MBEDTLS_CHAR_2( session_len );
*p++ = MBEDTLS_CHAR_1( session_len );
*p++ = MBEDTLS_CHAR_0( session_len );
ret = ssl_session_save( ssl->session, 1,
p, session_len, &session_len );
@ -5757,33 +5757,33 @@ int mbedtls_ssl_context_save( mbedtls_ssl_context *ssl,
used += 4;
if( used <= buf_len )
{
*p++ = (unsigned char)( ( ssl->badmac_seen >> 24 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->badmac_seen >> 16 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->badmac_seen >> 8 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->badmac_seen ) & 0xFF );
*p++ = MBEDTLS_CHAR_3( ssl->badmac_seen );
*p++ = MBEDTLS_CHAR_2( ssl->badmac_seen );
*p++ = MBEDTLS_CHAR_1( ssl->badmac_seen );
*p++ = MBEDTLS_CHAR_0( ssl->badmac_seen );
}
#if defined(MBEDTLS_SSL_DTLS_ANTI_REPLAY)
used += 16;
if( used <= buf_len )
{
*p++ = (unsigned char)( ( ssl->in_window_top >> 56 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window_top >> 48 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window_top >> 40 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window_top >> 32 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window_top >> 24 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window_top >> 16 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window_top >> 8 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window_top ) & 0xFF );
*p++ = MBEDTLS_CHAR_7( ssl->in_window_top );
*p++ = MBEDTLS_CHAR_6( ssl->in_window_top );
*p++ = MBEDTLS_CHAR_5( ssl->in_window_top );
*p++ = MBEDTLS_CHAR_4( ssl->in_window_top );
*p++ = MBEDTLS_CHAR_3( ssl->in_window_top );
*p++ = MBEDTLS_CHAR_2( ssl->in_window_top );
*p++ = MBEDTLS_CHAR_1( ssl->in_window_top );
*p++ = MBEDTLS_CHAR_0( ssl->in_window_top );
*p++ = (unsigned char)( ( ssl->in_window >> 56 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window >> 48 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window >> 40 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window >> 32 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window >> 24 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window >> 16 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window >> 8 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->in_window ) & 0xFF );
*p++ = MBEDTLS_CHAR_7( ssl->in_window );
*p++ = MBEDTLS_CHAR_6( ssl->in_window );
*p++ = MBEDTLS_CHAR_5( ssl->in_window );
*p++ = MBEDTLS_CHAR_4( ssl->in_window );
*p++ = MBEDTLS_CHAR_3( ssl->in_window );
*p++ = MBEDTLS_CHAR_2( ssl->in_window );
*p++ = MBEDTLS_CHAR_1( ssl->in_window );
*p++ = MBEDTLS_CHAR_0( ssl->in_window );
}
#endif /* MBEDTLS_SSL_DTLS_ANTI_REPLAY */
@ -5806,8 +5806,8 @@ int mbedtls_ssl_context_save( mbedtls_ssl_context *ssl,
used += 2;
if( used <= buf_len )
{
*p++ = (unsigned char)( ( ssl->mtu >> 8 ) & 0xFF );
*p++ = (unsigned char)( ( ssl->mtu ) & 0xFF );
*p++ = MBEDTLS_CHAR_1( ssl->mtu );
*p++ = MBEDTLS_CHAR_0( ssl->mtu );
}
#endif /* MBEDTLS_SSL_PROTO_DTLS */