Add Character byte reading macros
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>
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 976a87c..2c3e506 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -5278,8 +5278,8 @@
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 ),
};
/*
@@ -5360,14 +5360,14 @@
{
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 */
@@ -5383,22 +5383,22 @@
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 );
}
/*
@@ -5415,9 +5415,9 @@
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 )
{
@@ -5458,9 +5458,9 @@
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 )
{
@@ -5468,10 +5468,10 @@
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 */
@@ -5496,7 +5496,7 @@
used += 1;
if( used <= buf_len )
- *p++ = (unsigned char)( ( session->encrypt_then_mac ) & 0xFF );
+ *p++ = MBEDTLS_CHAR_0( session->encrypt_then_mac );
#endif
/* Done */
@@ -6149,11 +6149,11 @@
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 ),
};
/*
@@ -6294,10 +6294,10 @@
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 );
@@ -6339,10 +6339,10 @@
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 );
}
#endif /* MBEDTLS_SSL_DTLS_BADMAC_LIMIT */
@@ -6350,23 +6350,23 @@
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 */
@@ -6389,8 +6389,8 @@
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 */