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/ssl_cli.c b/library/ssl_cli.c
index aefcf22..9793e3c 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;
@@ -600,8 +600,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;
@@ -631,8 +631,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;
@@ -663,11 +663,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;
@@ -707,8 +707,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>;
@@ -735,12 +735,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 );
}
@@ -792,12 +792,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:
@@ -808,7 +808,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;
@@ -1417,8 +1417,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;
}