commit c045dc14b0ef38b5fc9dee5f62d39a005a539622
author Joe Subbiani <joe.subbiani@arm.com> Wed Jul 14 12:31:31 2021 +0100
committer Joe Subbiani <joe.subbiani@arm.com> Tue Aug 03 14:08:06 2021 +0100
tree 71e6ae3623587bcd901116ee7bb8065344cc2a01
parent 5b96e67ea1401a1df7a4e8cada1adcf93d908323

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>

library/ecjpake.c

diff --git a/library/ecjpake.c b/library/ecjpake.c
index 98c025b..a058337 100644
--- a/library/ecjpake.c
+++ b/library/ecjpake.c
@@ -166,10 +166,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;
 
@@ -209,10 +209,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 );
@@ -352,7 +352,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;