mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-07-28 00:21:48 +03:00
Replace MBEDTLS_CHAR_x with MBEDTLS_BYTE_x
The CHAR macros casted to an unsigned char which in this project is garunteed to be 8 bits - the same as uint8_t (which BYTE casts to) therefore, instances of CHAR have been swapped with BYTE and the number of macros have been cut down Signed-off-by: Joe Subbiani <joe.subbiani@arm.com>
This commit is contained in:
@ -4582,8 +4582,8 @@ static unsigned char ssl_serialized_session_header[] = {
|
||||
MBEDTLS_VERSION_MAJOR,
|
||||
MBEDTLS_VERSION_MINOR,
|
||||
MBEDTLS_VERSION_PATCH,
|
||||
MBEDTLS_CHAR_1( SSL_SERIALIZED_SESSION_CONFIG_BITFLAG ),
|
||||
MBEDTLS_CHAR_0( SSL_SERIALIZED_SESSION_CONFIG_BITFLAG ),
|
||||
MBEDTLS_BYTE_1( SSL_SERIALIZED_SESSION_CONFIG_BITFLAG ),
|
||||
MBEDTLS_BYTE_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++ = 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 );
|
||||
*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 );
|
||||
}
|
||||
#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++ = MBEDTLS_CHAR_1( session->ciphersuite );
|
||||
*p++ = MBEDTLS_CHAR_0( session->ciphersuite );
|
||||
*p++ = MBEDTLS_BYTE_1( session->ciphersuite );
|
||||
*p++ = MBEDTLS_BYTE_0( session->ciphersuite );
|
||||
|
||||
*p++ = MBEDTLS_CHAR_0( session->compression );
|
||||
*p++ = MBEDTLS_BYTE_0( session->compression );
|
||||
|
||||
*p++ = MBEDTLS_CHAR_0( session->id_len );
|
||||
*p++ = MBEDTLS_BYTE_0( session->id_len );
|
||||
memcpy( p, session->id, 32 );
|
||||
p += 32;
|
||||
|
||||
memcpy( p, session->master, 48 );
|
||||
p += 48;
|
||||
|
||||
*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 );
|
||||
*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 );
|
||||
}
|
||||
|
||||
/*
|
||||
@ -4719,9 +4719,9 @@ static size_t ssl_session_save_tls12( const mbedtls_ssl_session *session,
|
||||
|
||||
if( used <= buf_len )
|
||||
{
|
||||
*p++ = MBEDTLS_CHAR_2( cert_len );
|
||||
*p++ = MBEDTLS_CHAR_1( cert_len );
|
||||
*p++ = MBEDTLS_CHAR_0( cert_len );
|
||||
*p++ = MBEDTLS_BYTE_2( cert_len );
|
||||
*p++ = MBEDTLS_BYTE_1( cert_len );
|
||||
*p++ = MBEDTLS_BYTE_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++ = MBEDTLS_CHAR_2( session->ticket_len );
|
||||
*p++ = MBEDTLS_CHAR_1( session->ticket_len );
|
||||
*p++ = MBEDTLS_CHAR_0( session->ticket_len );
|
||||
*p++ = MBEDTLS_BYTE_2( session->ticket_len );
|
||||
*p++ = MBEDTLS_BYTE_1( session->ticket_len );
|
||||
*p++ = MBEDTLS_BYTE_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++ = 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 );
|
||||
*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 );
|
||||
}
|
||||
#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++ = MBEDTLS_CHAR_0( session->encrypt_then_mac );
|
||||
*p++ = MBEDTLS_BYTE_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,
|
||||
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 ),
|
||||
MBEDTLS_BYTE_1( SSL_SERIALIZED_SESSION_CONFIG_BITFLAG ),
|
||||
MBEDTLS_BYTE_0( SSL_SERIALIZED_SESSION_CONFIG_BITFLAG ),
|
||||
MBEDTLS_BYTE_2( SSL_SERIALIZED_CONTEXT_CONFIG_BITFLAG ),
|
||||
MBEDTLS_BYTE_1( SSL_SERIALIZED_CONTEXT_CONFIG_BITFLAG ),
|
||||
MBEDTLS_BYTE_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++ = MBEDTLS_CHAR_3( session_len );
|
||||
*p++ = MBEDTLS_CHAR_2( session_len );
|
||||
*p++ = MBEDTLS_CHAR_1( session_len );
|
||||
*p++ = MBEDTLS_CHAR_0( session_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 );
|
||||
|
||||
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++ = 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 );
|
||||
*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 );
|
||||
}
|
||||
|
||||
#if defined(MBEDTLS_SSL_DTLS_ANTI_REPLAY)
|
||||
used += 16;
|
||||
if( used <= buf_len )
|
||||
{
|
||||
*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++ = 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 );
|
||||
|
||||
*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 );
|
||||
*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 );
|
||||
}
|
||||
#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++ = MBEDTLS_CHAR_1( ssl->mtu );
|
||||
*p++ = MBEDTLS_CHAR_0( ssl->mtu );
|
||||
*p++ = MBEDTLS_BYTE_1( ssl->mtu );
|
||||
*p++ = MBEDTLS_BYTE_0( ssl->mtu );
|
||||
}
|
||||
#endif /* MBEDTLS_SSL_PROTO_DTLS */
|
||||
|
||||
|
Reference in New Issue
Block a user