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>
diff --git a/library/asn1write.c b/library/asn1write.c
index 8555767..dc61854 100644
--- a/library/asn1write.c
+++ b/library/asn1write.c
@@ -60,8 +60,8 @@
if( *p - start < 3 )
return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
- *--(*p) = MBEDTLS_CHAR_0( len );
- *--(*p) = MBEDTLS_CHAR_1( len );
+ *--(*p) = MBEDTLS_BYTE_0( len );
+ *--(*p) = MBEDTLS_BYTE_1( len );
*--(*p) = 0x82;
return( 3 );
}
@@ -71,9 +71,9 @@
if( *p - start < 4 )
return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
- *--(*p) = MBEDTLS_CHAR_0( len );
- *--(*p) = MBEDTLS_CHAR_1( len );
- *--(*p) = MBEDTLS_CHAR_2( len );
+ *--(*p) = MBEDTLS_BYTE_0( len );
+ *--(*p) = MBEDTLS_BYTE_1( len );
+ *--(*p) = MBEDTLS_BYTE_2( len );
*--(*p) = 0x83;
return( 4 );
}
@@ -85,10 +85,10 @@
if( *p - start < 5 )
return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
- *--(*p) = MBEDTLS_CHAR_0( len );
- *--(*p) = MBEDTLS_CHAR_1( len );
- *--(*p) = MBEDTLS_CHAR_2( len );
- *--(*p) = MBEDTLS_CHAR_3( len );
+ *--(*p) = MBEDTLS_BYTE_0( len );
+ *--(*p) = MBEDTLS_BYTE_1( len );
+ *--(*p) = MBEDTLS_BYTE_2( len );
+ *--(*p) = MBEDTLS_BYTE_3( len );
*--(*p) = 0x84;
return( 5 );
}
diff --git a/library/ccm.c b/library/ccm.c
index 95d90dc..0188075 100644
--- a/library/ccm.c
+++ b/library/ccm.c
@@ -200,7 +200,7 @@
memcpy( b + 1, iv, iv_len );
for( i = 0, len_left = length; i < q; i++, len_left >>= 8 )
- b[15-i] = MBEDTLS_CHAR_0( len_left );
+ b[15-i] = MBEDTLS_BYTE_0( len_left );
if( len_left > 0 )
return( MBEDTLS_ERR_CCM_BAD_INPUT );
@@ -221,8 +221,8 @@
src = add;
memset( b, 0, 16 );
- b[0] = MBEDTLS_CHAR_1( add_len );
- b[1] = MBEDTLS_CHAR_0( add_len );
+ b[0] = MBEDTLS_BYTE_1( add_len );
+ b[1] = MBEDTLS_BYTE_0( add_len );
use_len = len_left < 16 - 2 ? len_left : 16 - 2;
memcpy( b + 2, src, use_len );
diff --git a/library/common.h b/library/common.h
index 28017f9..e0f8b99 100644
--- a/library/common.h
+++ b/library/common.h
@@ -25,6 +25,8 @@
#include "mbedtls/build_info.h"
+#include <stdint.h>
+
/** Helper to define a function as static except when building invasive tests.
*
* If a function is only used inside its own source file and should be
@@ -72,19 +74,14 @@
* Using MBEDTLS_BYTE_a will shift a*8 bits
* to retrieve the next byte of information
*/
-#define MBEDTLS_BYTE_0( x ) ( (uint8_t) ( ( x ) & 0xff ) )
+#define MBEDTLS_BYTE_0( x ) ( (uint8_t) ( ( x ) & 0xff ) )
#define MBEDTLS_BYTE_1( x ) ( (uint8_t) ( ( ( x ) >> 8 ) & 0xff ) )
#define MBEDTLS_BYTE_2( x ) ( (uint8_t) ( ( ( x ) >> 16 ) & 0xff ) )
#define MBEDTLS_BYTE_3( x ) ( (uint8_t) ( ( ( x ) >> 24 ) & 0xff ) )
-
-#define MBEDTLS_CHAR_0( x ) ( (unsigned char) ( ( x ) & 0xff ) )
-#define MBEDTLS_CHAR_1( x ) ( (unsigned char) ( ( ( x ) >> 8 ) & 0xff ) )
-#define MBEDTLS_CHAR_2( x ) ( (unsigned char) ( ( ( x ) >> 16 ) & 0xff ) )
-#define MBEDTLS_CHAR_3( x ) ( (unsigned char) ( ( ( x ) >> 24 ) & 0xff ) )
-#define MBEDTLS_CHAR_4( x ) ( (unsigned char) ( ( ( x ) >> 32 ) & 0xff ) )
-#define MBEDTLS_CHAR_5( x ) ( (unsigned char) ( ( ( x ) >> 40 ) & 0xff ) )
-#define MBEDTLS_CHAR_6( x ) ( (unsigned char) ( ( ( x ) >> 48 ) & 0xff ) )
-#define MBEDTLS_CHAR_7( x ) ( (unsigned char) ( ( ( x ) >> 56 ) & 0xff ) )
+#define MBEDTLS_BYTE_4( x ) ( (uint8_t) ( ( ( x ) >> 32 ) & 0xff ) )
+#define MBEDTLS_BYTE_5( x ) ( (uint8_t) ( ( ( x ) >> 40 ) & 0xff ) )
+#define MBEDTLS_BYTE_6( x ) ( (uint8_t) ( ( ( x ) >> 48 ) & 0xff ) )
+#define MBEDTLS_BYTE_7( x ) ( (uint8_t) ( ( ( x ) >> 56 ) & 0xff ) )
/**
* Get the unsigned 32 bits integer corresponding to four bytes in
diff --git a/library/ecjpake.c b/library/ecjpake.c
index 7305dfe..a599b1b 100644
--- a/library/ecjpake.c
+++ b/library/ecjpake.c
@@ -180,10 +180,10 @@
if( ret != 0 )
return( ret );
- (*p)[0] = MBEDTLS_CHAR_3( len );
- (*p)[1] = MBEDTLS_CHAR_2( len );
- (*p)[2] = MBEDTLS_CHAR_1( len );
- (*p)[3] = MBEDTLS_CHAR_0( len );
+ (*p)[0] = MBEDTLS_BYTE_3( len );
+ (*p)[1] = MBEDTLS_BYTE_2( len );
+ (*p)[2] = MBEDTLS_BYTE_1( len );
+ (*p)[3] = MBEDTLS_BYTE_0( len );
*p += 4 + len;
@@ -223,10 +223,10 @@
if( end - p < 4 )
return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
- *p++ = MBEDTLS_CHAR_3( id_len );
- *p++ = MBEDTLS_CHAR_2( id_len );
- *p++ = MBEDTLS_CHAR_1( id_len );
- *p++ = MBEDTLS_CHAR_0( id_len );
+ *p++ = MBEDTLS_BYTE_3( id_len );
+ *p++ = MBEDTLS_BYTE_2( id_len );
+ *p++ = MBEDTLS_BYTE_1( id_len );
+ *p++ = MBEDTLS_BYTE_0( id_len );
if( end < p || (size_t)( end - p ) < id_len )
return( MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL );
@@ -366,7 +366,7 @@
goto cleanup;
}
- *(*p)++ = MBEDTLS_CHAR_0( len );
+ *(*p)++ = MBEDTLS_BYTE_0( len );
MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( &h, *p, len ) ); /* r */
*p += len;
diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 7d65479..9e0db96 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -136,18 +136,18 @@
* } ServerNameList;
*
*/
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_SERVERNAME );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_SERVERNAME );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SERVERNAME );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SERVERNAME );
- *p++ = MBEDTLS_CHAR_1( hostname_len + 5);
- *p++ = MBEDTLS_CHAR_0( hostname_len + 5);
+ *p++ = MBEDTLS_BYTE_1( hostname_len + 5);
+ *p++ = MBEDTLS_BYTE_0( hostname_len + 5);
- *p++ = MBEDTLS_CHAR_1( hostname_len + 3 );
- *p++ = MBEDTLS_CHAR_0( hostname_len + 3 );
+ *p++ = MBEDTLS_BYTE_1( hostname_len + 3 );
+ *p++ = MBEDTLS_BYTE_0( hostname_len + 3 );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_SERVERNAME_HOSTNAME );
- *p++ = MBEDTLS_CHAR_1( hostname_len );
- *p++ = MBEDTLS_CHAR_0( hostname_len );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SERVERNAME_HOSTNAME );
+ *p++ = MBEDTLS_BYTE_1( hostname_len );
+ *p++ = MBEDTLS_BYTE_0( hostname_len );
memcpy( p, ssl->hostname, hostname_len );
@@ -181,12 +181,12 @@
/*
* Secure renegotiation
*/
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO );
*p++ = 0x00;
- *p++ = MBEDTLS_CHAR_0( ssl->verify_data_len + 1 );
- *p++ = MBEDTLS_CHAR_0( ssl->verify_data_len );
+ *p++ = MBEDTLS_BYTE_0( ssl->verify_data_len + 1 );
+ *p++ = MBEDTLS_BYTE_0( ssl->verify_data_len );
memcpy( p, ssl->own_verify_data, ssl->verify_data_len );
@@ -281,14 +281,14 @@
* SignatureAndHashAlgorithm
* supported_signature_algorithms<2..2^16-2>;
*/
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_SIG_ALG );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_SIG_ALG );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SIG_ALG );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SIG_ALG );
- *p++ = MBEDTLS_CHAR_1( sig_alg_len + 2 );
- *p++ = MBEDTLS_CHAR_0( sig_alg_len + 2 );
+ *p++ = MBEDTLS_BYTE_1( sig_alg_len + 2 );
+ *p++ = MBEDTLS_BYTE_0( sig_alg_len + 2 );
- *p++ = MBEDTLS_CHAR_1( sig_alg_len );
- *p++ = MBEDTLS_CHAR_0( sig_alg_len );
+ *p++ = MBEDTLS_BYTE_1( sig_alg_len );
+ *p++ = MBEDTLS_BYTE_0( sig_alg_len );
*olen = 6 + sig_alg_len;
@@ -356,14 +356,14 @@
elliptic_curve_list[elliptic_curve_len++] = info->tls_id & 0xFF;
}
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_SUPPORTED_ELLIPTIC_CURVES );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_SUPPORTED_ELLIPTIC_CURVES );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SUPPORTED_ELLIPTIC_CURVES );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SUPPORTED_ELLIPTIC_CURVES );
- *p++ = MBEDTLS_CHAR_1( elliptic_curve_len + 2 );
- *p++ = MBEDTLS_CHAR_0( elliptic_curve_len + 2 );
+ *p++ = MBEDTLS_BYTE_1( elliptic_curve_len + 2 );
+ *p++ = MBEDTLS_BYTE_0( elliptic_curve_len + 2 );
- *p++ = MBEDTLS_CHAR_1( elliptic_curve_len );
- *p++ = MBEDTLS_CHAR_0( elliptic_curve_len );
+ *p++ = MBEDTLS_BYTE_1( elliptic_curve_len );
+ *p++ = MBEDTLS_BYTE_0( elliptic_curve_len );
*olen = 6 + elliptic_curve_len;
@@ -384,8 +384,8 @@
( "client hello, adding supported_point_formats extension" ) );
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 6 );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS );
*p++ = 0x00;
*p++ = 2;
@@ -421,8 +421,8 @@
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 4 );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_ECJPAKE_KKPP );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_ECJPAKE_KKPP );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_ECJPAKE_KKPP );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_ECJPAKE_KKPP );
/*
* We may need to send ClientHello multiple times for Hello verification.
@@ -464,8 +464,8 @@
memcpy( p + 2, ssl->handshake->ecjpake_cache, kkpp_len );
}
- *p++ = MBEDTLS_CHAR_1( kkpp_len );
- *p++ = MBEDTLS_CHAR_0( kkpp_len );
+ *p++ = MBEDTLS_BYTE_1( kkpp_len );
+ *p++ = MBEDTLS_BYTE_0( kkpp_len );
*olen = kkpp_len + 4;
@@ -504,11 +504,11 @@
MBEDTLS_SSL_CHK_BUF_PTR( p, end, (unsigned)( ssl->own_cid_len + 5 ) );
/* Add extension ID + size */
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_CID );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_CID );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_CID );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_CID );
ext_len = (size_t) ssl->own_cid_len + 1;
- *p++ = MBEDTLS_CHAR_1( ext_len );
- *p++ = MBEDTLS_CHAR_0( ext_len );
+ *p++ = MBEDTLS_BYTE_1( ext_len );
+ *p++ = MBEDTLS_BYTE_0( ext_len );
*p++ = (uint8_t) ssl->own_cid_len;
memcpy( p, ssl->own_cid, ssl->own_cid_len );
@@ -537,8 +537,8 @@
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 5 );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH );
*p++ = 0x00;
*p++ = 1;
@@ -569,8 +569,8 @@
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 4 );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC );
*p++ = 0x00;
*p++ = 0x00;
@@ -599,8 +599,8 @@
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 4 );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET );
*p++ = 0x00;
*p++ = 0x00;
@@ -631,11 +631,11 @@
/* The addition is safe here since the ticket length is 16 bit. */
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 4 + tlen );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_SESSION_TICKET );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_SESSION_TICKET );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SESSION_TICKET );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SESSION_TICKET );
- *p++ = MBEDTLS_CHAR_1( tlen );
- *p++ = MBEDTLS_CHAR_0( tlen );
+ *p++ = MBEDTLS_BYTE_1( tlen );
+ *p++ = MBEDTLS_BYTE_0( tlen );
*olen = 4;
@@ -675,8 +675,8 @@
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 6 + alpnlen );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_ALPN );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_ALPN );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_ALPN );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_ALPN );
/*
* opaque ProtocolName<1..2^8-1>;
@@ -703,12 +703,12 @@
*olen = p - buf;
/* List length = olen - 2 (ext_type) - 2 (ext_len) - 2 (list_len) */
- buf[4] = MBEDTLS_CHAR_1( *olen - 6 );
- buf[5] = MBEDTLS_CHAR_0( *olen - 6 );
+ buf[4] = MBEDTLS_BYTE_1( *olen - 6 );
+ buf[5] = MBEDTLS_BYTE_0( *olen - 6 );
/* Extension length = olen - 2 (ext_type) - 2 (ext_len) */
- buf[2] = MBEDTLS_CHAR_1( *olen - 4 );
- buf[3] = MBEDTLS_CHAR_0( *olen - 4 );
+ buf[2] = MBEDTLS_BYTE_1( *olen - 4 );
+ buf[3] = MBEDTLS_BYTE_0( *olen - 4 );
return( 0 );
}
@@ -760,12 +760,12 @@
*/
MBEDTLS_SSL_CHK_BUF_PTR( p, end, ext_len + 4 );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_USE_SRTP );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_USE_SRTP );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_USE_SRTP );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_USE_SRTP );
- *p++ = MBEDTLS_CHAR_1( ext_len & 0xFF00 );
- *p++ = MBEDTLS_CHAR_0( ext_len );
+ *p++ = MBEDTLS_BYTE_1( ext_len & 0xFF00 );
+ *p++ = MBEDTLS_BYTE_0( ext_len );
/* protection profile length: 2*(ssl->conf->dtls_srtp_profile_list_len) */
/* micro-optimization:
@@ -776,7 +776,7 @@
* >> 8 ) & 0xFF );
*/
*p++ = 0;
- *p++ = MBEDTLS_CHAR_0( 2 * ssl->conf->dtls_srtp_profile_list_len );
+ *p++ = MBEDTLS_BYTE_0( 2 * ssl->conf->dtls_srtp_profile_list_len );
for( protection_profiles_index=0;
protection_profiles_index < ssl->conf->dtls_srtp_profile_list_len;
@@ -1323,8 +1323,8 @@
{
/* No need to check for space here, because the extension
* writing functions already took care of that. */
- *p++ = MBEDTLS_CHAR_1( ext_len );
- *p++ = MBEDTLS_CHAR_0( ext_len );
+ *p++ = MBEDTLS_BYTE_1( ext_len );
+ *p++ = MBEDTLS_BYTE_0( ext_len );
p += ext_len;
}
diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index e0c50bc..989c598 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -2481,8 +2481,8 @@
/* Write message_seq and update it, except for HelloRequest */
if( hs_type != MBEDTLS_SSL_HS_HELLO_REQUEST )
{
- ssl->out_msg[4] = MBEDTLS_CHAR_1( ssl->handshake->out_msg_seq );
- ssl->out_msg[5] = MBEDTLS_CHAR_0( ssl->handshake->out_msg_seq );
+ ssl->out_msg[4] = MBEDTLS_BYTE_1( ssl->handshake->out_msg_seq );
+ ssl->out_msg[5] = MBEDTLS_BYTE_0( ssl->handshake->out_msg_seq );
++( ssl->handshake->out_msg_seq );
}
else
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 253ab56..96b08ab 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1971,11 +1971,11 @@
* } ConnectionId;
*/
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_CID );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_CID );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_CID );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_CID );
ext_len = (size_t) ssl->own_cid_len + 1;
- *p++ = MBEDTLS_CHAR_1( ext_len );
- *p++ = MBEDTLS_CHAR_0( ext_len );
+ *p++ = MBEDTLS_BYTE_1( ext_len );
+ *p++ = MBEDTLS_BYTE_0( ext_len );
*p++ = (uint8_t) ssl->own_cid_len;
memcpy( p, ssl->own_cid, ssl->own_cid_len );
@@ -2016,8 +2016,8 @@
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, adding encrypt then mac extension" ) );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC );
*p++ = 0x00;
*p++ = 0x00;
@@ -2042,8 +2042,8 @@
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, adding extended master secret "
"extension" ) );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET );
*p++ = 0x00;
*p++ = 0x00;
@@ -2067,8 +2067,8 @@
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, adding session ticket extension" ) );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_SESSION_TICKET );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_SESSION_TICKET );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SESSION_TICKET );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SESSION_TICKET );
*p++ = 0x00;
*p++ = 0x00;
@@ -2091,8 +2091,8 @@
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, secure renegotiation extension" ) );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO );
#if defined(MBEDTLS_SSL_RENEGOTIATION)
if( ssl->renego_status != MBEDTLS_SSL_INITIAL_HANDSHAKE )
@@ -2132,8 +2132,8 @@
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, max_fragment_length extension" ) );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH );
*p++ = 0x00;
*p++ = 1;
@@ -2162,8 +2162,8 @@
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, supported_point_formats extension" ) );
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS );
*p++ = 0x00;
*p++ = 2;
@@ -2200,8 +2200,8 @@
return;
}
- *p++ = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_ECJPAKE_KKPP );
- *p++ = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_ECJPAKE_KKPP );
+ *p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_ECJPAKE_KKPP );
+ *p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_ECJPAKE_KKPP );
ret = mbedtls_ecjpake_write_round_one( &ssl->handshake->ecjpake_ctx,
p + 2, end - p - 2, &kkpp_len,
@@ -2212,8 +2212,8 @@
return;
}
- *p++ = MBEDTLS_CHAR_1( kkpp_len );
- *p++ = MBEDTLS_CHAR_0( kkpp_len );
+ *p++ = MBEDTLS_BYTE_1( kkpp_len );
+ *p++ = MBEDTLS_BYTE_0( kkpp_len );
*olen = kkpp_len + 4;
}
@@ -2238,18 +2238,18 @@
* 6 . 6 protocol name length
* 7 . 7+n protocol name
*/
- buf[0] = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_ALPN );
- buf[1] = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_ALPN );
+ buf[0] = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_ALPN );
+ buf[1] = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_ALPN );
*olen = 7 + strlen( ssl->alpn_chosen );
- buf[2] = MBEDTLS_CHAR_1( *olen - 4 );
- buf[3] = MBEDTLS_CHAR_0( *olen - 4 );
+ buf[2] = MBEDTLS_BYTE_1( *olen - 4 );
+ buf[3] = MBEDTLS_BYTE_0( *olen - 4 );
- buf[4] = MBEDTLS_CHAR_1( *olen - 6 );
- buf[5] = MBEDTLS_CHAR_0( *olen - 6 );
+ buf[4] = MBEDTLS_BYTE_1( *olen - 6 );
+ buf[5] = MBEDTLS_BYTE_0( *olen - 6 );
- buf[6] = MBEDTLS_CHAR_0( *olen - 7 );
+ buf[6] = MBEDTLS_BYTE_0( *olen - 7 );
memcpy( buf + 7, ssl->alpn_chosen, *olen - 7 );
}
@@ -2294,15 +2294,15 @@
}
/* extension */
- buf[0] = MBEDTLS_CHAR_1( MBEDTLS_TLS_EXT_USE_SRTP );
- buf[1] = MBEDTLS_CHAR_0( MBEDTLS_TLS_EXT_USE_SRTP );
+ buf[0] = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_USE_SRTP );
+ buf[1] = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_USE_SRTP );
/*
* total length 5 and mki value: only one profile(2 bytes)
* and length(2 bytes) and srtp_mki )
*/
ext_len = 5 + mki_len;
- buf[2] = MBEDTLS_CHAR_1( ext_len );
- buf[3] = MBEDTLS_CHAR_0( ext_len );
+ buf[2] = MBEDTLS_BYTE_1( ext_len );
+ buf[3] = MBEDTLS_BYTE_0( ext_len );
/* protection profile length: 2 */
buf[4] = 0x00;
@@ -2311,8 +2311,8 @@
ssl->dtls_srtp_info.chosen_dtls_srtp_profile );
if( profile_value != MBEDTLS_TLS_SRTP_UNSET )
{
- buf[6] = MBEDTLS_CHAR_1( profile_value );
- buf[7] = MBEDTLS_CHAR_0( profile_value );
+ buf[6] = MBEDTLS_BYTE_1( profile_value );
+ buf[7] = MBEDTLS_BYTE_0( profile_value );
}
else
{
@@ -2648,8 +2648,8 @@
if( ext_len > 0 )
{
- *p++ = MBEDTLS_CHAR_1( ext_len );
- *p++ = MBEDTLS_CHAR_0( ext_len );
+ *p++ = MBEDTLS_BYTE_1( ext_len );
+ *p++ = MBEDTLS_BYTE_0( ext_len );
p += ext_len;
}
@@ -3478,8 +3478,8 @@
MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
return( MBEDTLS_ERR_SSL_DECODE_ERROR );
}
- if( *p++ != MBEDTLS_CHAR_1( len ) ||
- *p++ != MBEDTLS_CHAR_0( len ) )
+ if( *p++ != MBEDTLS_BYTE_1( len ) ||
+ *p++ != MBEDTLS_BYTE_0( len ) )
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
return( MBEDTLS_ERR_SSL_DECODE_ERROR );
@@ -4223,13 +4223,13 @@
tlen = 0;
}
- ssl->out_msg[4] = MBEDTLS_CHAR_3( lifetime );
- ssl->out_msg[5] = MBEDTLS_CHAR_2( lifetime );
- ssl->out_msg[6] = MBEDTLS_CHAR_1( lifetime );
- ssl->out_msg[7] = MBEDTLS_CHAR_0( lifetime );
+ ssl->out_msg[4] = MBEDTLS_BYTE_3( lifetime );
+ ssl->out_msg[5] = MBEDTLS_BYTE_2( lifetime );
+ ssl->out_msg[6] = MBEDTLS_BYTE_1( lifetime );
+ ssl->out_msg[7] = MBEDTLS_BYTE_0( lifetime );
- ssl->out_msg[8] = MBEDTLS_CHAR_1( tlen );
- ssl->out_msg[9] = MBEDTLS_CHAR_0( tlen );
+ ssl->out_msg[8] = MBEDTLS_BYTE_1( tlen );
+ ssl->out_msg[9] = MBEDTLS_BYTE_0( tlen );
ssl->out_msglen = 10 + tlen;
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 0655dc5..381eb9e 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4582,8 +4582,8 @@
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 @@
{
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 */
diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c
index 9e629cb..7aec21d 100644
--- a/library/ssl_tls13_keys.c
+++ b/library/ssl_tls13_keys.c
@@ -113,17 +113,17 @@
#endif
*p++ = 0;
- *p++ = MBEDTLS_CHAR_0( desired_length );
+ *p++ = MBEDTLS_BYTE_0( desired_length );
/* Add label incl. prefix */
- *p++ = MBEDTLS_CHAR_0( total_label_len );
+ *p++ = MBEDTLS_BYTE_0( total_label_len );
memcpy( p, tls1_3_label_prefix, sizeof(tls1_3_label_prefix) );
p += sizeof(tls1_3_label_prefix);
memcpy( p, label, llen );
p += llen;
/* Add context value */
- *p++ = MBEDTLS_CHAR_0( clen );
+ *p++ = MBEDTLS_BYTE_0( clen );
if( clen != 0 )
memcpy( p, ctx, clen );