Fix test functions and data after moving hexify/unhexify out
- Separate string and hex parameter as unhexify is moved out of the function. It's input should only be hex.
- Fix test mbedtls_ccm_encrypt_and_tag that grows input message buffer with tag
- Add missing expected length parameter in ECP TLS tests
- Add deleted TEST_ASSERT and mbedtls calls that got removed in script based code generation
diff --git a/tests/suites/test_suite_ecp.function b/tests/suites/test_suite_ecp.function
index dc6fac5..8c8dac0 100644
--- a/tests/suites/test_suite_ecp.function
+++ b/tests/suites/test_suite_ecp.function
@@ -241,7 +241,7 @@
TEST_ASSERT( mbedtls_mpi_read_string( &Y, 16, y ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &Z, 16, z ) == 0 );
-
+ TEST_ASSERT( mbedtls_ecp_point_read_binary( &grp, &P, buf, ilen ) == ret );
if( ret == 0 )
{
@@ -275,14 +275,14 @@
TEST_ASSERT( mbedtls_mpi_read_string( &Y, 16, y ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &Z, 16, z ) == 0 );
-
+ TEST_ASSERT( mbedtls_ecp_tls_read_point( &grp, &P, &vbuf, ilen ) == ret );
if( ret == 0 )
{
TEST_ASSERT( mbedtls_mpi_cmp_mpi( &P.X, &X ) == 0 );
TEST_ASSERT( mbedtls_mpi_cmp_mpi( &P.Y, &Y ) == 0 );
TEST_ASSERT( mbedtls_mpi_cmp_mpi( &P.Z, &Z ) == 0 );
- TEST_ASSERT( *vbuf == 0x00 );
+ TEST_ASSERT( vbuf - buf == ilen );
}
exit:
@@ -345,7 +345,7 @@
/* BEGIN_CASE */
void mbedtls_ecp_tls_read_group( uint8_t * buf, uint32_t len, int result,
- int bits )
+ int bits, int record_len )
{
mbedtls_ecp_group grp;
const unsigned char *vbuf = buf;
@@ -353,14 +353,13 @@
mbedtls_ecp_group_init( &grp );
-
ret = mbedtls_ecp_tls_read_group( &grp, &vbuf, len );
TEST_ASSERT( ret == result );
if( ret == 0)
{
TEST_ASSERT( mbedtls_mpi_bitlen( &grp.P ) == (size_t) bits );
- TEST_ASSERT( *vbuf == 0x00 );
+ TEST_ASSERT( vbuf - buf == record_len);
}
exit: