Adapted .function files and .data files to new test framework
Changes include:
- Integers marked with '#' in the .function files.
- Strings should have "" in .data files.
- String comparison instead of preprocessor-like replace for e.g. '=='
- Params and variables cannot have the same name in .function files
diff --git a/tests/suites/test_suite_ecp.function b/tests/suites/test_suite_ecp.function
index 543175f..3b2d70b 100644
--- a/tests/suites/test_suite_ecp.function
+++ b/tests/suites/test_suite_ecp.function
@@ -1,5 +1,7 @@
BEGIN_HEADER
#include <polarssl/ecp.h>
+
+#define POLARSSL_ECP_PF_UNKNOWN -1
END_HEADER
BEGIN_DEPENDENCIES
@@ -7,7 +9,7 @@
END_DEPENDENCIES
BEGIN_CASE
-ecp_small_add:a_zero:x_a:y_a:b_zero:x_b:y_b:c_zero:x_c:y_c
+ecp_small_add:#a_zero:x_a:y_a:#b_zero:x_b:y_b:#c_zero:#x_c:#y_c
{
ecp_group grp;
ecp_point A, B, C;
@@ -54,7 +56,7 @@
END_CASE
BEGIN_CASE
-ecp_small_sub:a_zero:x_a:y_a:b_zero:x_b:y_b:c_zero:x_c:y_c
+ecp_small_sub:#a_zero:x_a:y_a:#b_zero:x_b:y_b:#c_zero:#x_c:#y_c
{
ecp_group grp;
ecp_point A, B, C;
@@ -91,7 +93,7 @@
END_CASE
BEGIN_CASE
-ecp_small_mul:m:r_zero:x_r:y_r:ret
+ecp_small_mul:#m_str:#r_zero:#x_r:#y_r:#ret
{
ecp_group grp;
ecp_point R;
@@ -104,7 +106,7 @@
TEST_ASSERT( ecp_group_read_string( &grp, 10,
"47", "4", "17", "42", "13" ) == 0 );
- TEST_ASSERT( mpi_lset( &m, {m} ) == 0 );
+ TEST_ASSERT( mpi_lset( &m, {m_str} ) == 0 );
TEST_ASSERT( ecp_mul( &grp, &R, &m, &grp.G ) == {ret} );
@@ -123,7 +125,7 @@
END_CASE
BEGIN_CASE
-ecp_small_check_pub:x:y:z:ret
+ecp_small_check_pub:#x:#y:#z:#ret
{
ecp_group grp;
ecp_point P;
@@ -146,7 +148,7 @@
END_CASE
BEGIN_CASE
-ecp_test_vect:id:dA:xA:yA:dB:xB:yB:xZ:yZ
+ecp_test_vect:#id:dA_str:xA_str:yA_str:dB_str:xB_str:yB_str:xZ_str:yZ_str
{
ecp_group grp;
ecp_point R;
@@ -156,18 +158,18 @@
mpi_init( &dA ); mpi_init( &xA ); mpi_init( &yA ); mpi_init( &dB );
mpi_init( &xB ); mpi_init( &yB ); mpi_init( &xZ ); mpi_init( &yZ );
- TEST_ASSERT( ecp_use_known_dp( &grp, POLARSSL_ECP_DP_{id} ) == 0 );
+ TEST_ASSERT( ecp_use_known_dp( &grp, {id} ) == 0 );
TEST_ASSERT( ecp_check_pubkey( &grp, &grp.G ) == 0 );
- TEST_ASSERT( mpi_read_string( &dA, 16, {dA} ) == 0 );
- TEST_ASSERT( mpi_read_string( &xA, 16, {xA} ) == 0 );
- TEST_ASSERT( mpi_read_string( &yA, 16, {yA} ) == 0 );
- TEST_ASSERT( mpi_read_string( &dB, 16, {dB} ) == 0 );
- TEST_ASSERT( mpi_read_string( &xB, 16, {xB} ) == 0 );
- TEST_ASSERT( mpi_read_string( &yB, 16, {yB} ) == 0 );
- TEST_ASSERT( mpi_read_string( &xZ, 16, {xZ} ) == 0 );
- TEST_ASSERT( mpi_read_string( &yZ, 16, {yZ} ) == 0 );
+ TEST_ASSERT( mpi_read_string( &dA, 16, {dA_str} ) == 0 );
+ TEST_ASSERT( mpi_read_string( &xA, 16, {xA_str} ) == 0 );
+ TEST_ASSERT( mpi_read_string( &yA, 16, {yA_str} ) == 0 );
+ TEST_ASSERT( mpi_read_string( &dB, 16, {dB_str} ) == 0 );
+ TEST_ASSERT( mpi_read_string( &xB, 16, {xB_str} ) == 0 );
+ TEST_ASSERT( mpi_read_string( &yB, 16, {yB_str} ) == 0 );
+ TEST_ASSERT( mpi_read_string( &xZ, 16, {xZ_str} ) == 0 );
+ TEST_ASSERT( mpi_read_string( &yZ, 16, {yZ_str} ) == 0 );
TEST_ASSERT( ecp_mul( &grp, &R, &dA, &grp.G ) == 0 );
TEST_ASSERT( mpi_cmp_mpi( &R.X, &xA ) == 0 );
@@ -194,7 +196,7 @@
END_CASE
BEGIN_CASE
-ecp_fast_mod:id:N
+ecp_fast_mod:#id:N_str
{
ecp_group grp;
mpi N, R;
@@ -202,8 +204,8 @@
mpi_init( &N ); mpi_init( &R );
ecp_group_init( &grp );
- TEST_ASSERT( ecp_use_known_dp( &grp, POLARSSL_ECP_DP_{id} ) == 0 );
- TEST_ASSERT( mpi_read_string( &N, 16, {N} ) == 0 );
+ TEST_ASSERT( ecp_use_known_dp( &grp, {id} ) == 0 );
+ TEST_ASSERT( mpi_read_string( &N, 16, {N_str} ) == 0 );
/*
* Store correct result before we touch N
@@ -225,7 +227,7 @@
END_CASE
BEGIN_CASE
-ecp_write_binary:id:x:y:z:format:out:blen:ret
+ecp_write_binary:#id:x:y:z:#format:out:#blen:#ret
{
ecp_group grp;
ecp_point P;
@@ -237,14 +239,13 @@
ecp_group_init( &grp ); ecp_point_init( &P );
- TEST_ASSERT( ecp_use_known_dp( &grp, POLARSSL_ECP_DP_{id} ) == 0 );
+ TEST_ASSERT( ecp_use_known_dp( &grp, {id} ) == 0 );
TEST_ASSERT( mpi_read_string( &P.X, 16, {x} ) == 0 );
TEST_ASSERT( mpi_read_string( &P.Y, 16, {y} ) == 0 );
TEST_ASSERT( mpi_read_string( &P.Z, 16, {z} ) == 0 );
-#define POLARSSL_ECP_PF_UNKNOWN -1
- TEST_ASSERT( ecp_point_write_binary( &grp, &P, POLARSSL_ECP_PF_{format},
+ TEST_ASSERT( ecp_point_write_binary( &grp, &P, {format},
&olen, buf, {blen} ) == {ret} );
if( {ret} == 0 )
@@ -258,7 +259,7 @@
END_CASE
BEGIN_CASE
-ecp_read_binary:id:input:x:y:z:ret
+ecp_read_binary:#id:input:x:y:z:#ret
{
ecp_group grp;
ecp_point P;
@@ -271,7 +272,7 @@
ecp_group_init( &grp ); ecp_point_init( &P );
mpi_init( &X ); mpi_init( &Y ); mpi_init( &Z );
- TEST_ASSERT( ecp_use_known_dp( &grp, POLARSSL_ECP_DP_{id} ) == 0 );
+ TEST_ASSERT( ecp_use_known_dp( &grp, {id} ) == 0 );
TEST_ASSERT( mpi_read_string( &X, 16, {x} ) == 0 );
TEST_ASSERT( mpi_read_string( &Y, 16, {y} ) == 0 );
@@ -294,7 +295,7 @@
END_CASE
BEGIN_CASE
-ecp_tls_read_point:id:input:x:y:z:ret
+ecp_tls_read_point:#id:input:x:y:z:#ret
{
ecp_group grp;
ecp_point P;
@@ -308,7 +309,7 @@
ecp_group_init( &grp ); ecp_point_init( &P );
mpi_init( &X ); mpi_init( &Y ); mpi_init( &Z );
- TEST_ASSERT( ecp_use_known_dp( &grp, POLARSSL_ECP_DP_{id} ) == 0 );
+ TEST_ASSERT( ecp_use_known_dp( &grp, {id} ) == 0 );
TEST_ASSERT( mpi_read_string( &X, 16, {x} ) == 0 );
TEST_ASSERT( mpi_read_string( &Y, 16, {y} ) == 0 );
@@ -332,7 +333,7 @@
END_CASE
BEGIN_CASE
-ecp_tls_write_read_point:id
+ecp_tls_write_read_point:#id
{
ecp_group grp;
ecp_point pt;
@@ -343,7 +344,7 @@
ecp_group_init( &grp );
ecp_point_init( &pt );
- TEST_ASSERT( ecp_use_known_dp( &grp, POLARSSL_ECP_DP_{id} ) == 0 );
+ TEST_ASSERT( ecp_use_known_dp( &grp, {id} ) == 0 );
memset( buf, 0x00, sizeof( buf ) ); vbuf = buf;
TEST_ASSERT( ecp_tls_write_point( &grp, &grp.G,
@@ -383,7 +384,7 @@
END_CASE
BEGIN_CASE
-ecp_tls_read_group:record:ret:bits
+ecp_tls_read_group:record:#result:#bits
{
ecp_group grp;
unsigned char buf[10];
@@ -397,10 +398,10 @@
ret = ecp_tls_read_group( &grp, &vbuf, len );
- TEST_ASSERT( ret == {ret} );
+ TEST_ASSERT( ret == {result} );
if( ret == 0)
{
- TEST_ASSERT( mpi_msb( &grp.P ) == {bits} );
+ TEST_ASSERT( mpi_msb( &grp.P ) == (size_t) {bits} );
TEST_ASSERT( *vbuf == 0x00 );
}
@@ -409,7 +410,7 @@
END_CASE
BEGIN_CASE
-ecp_tls_write_read_group:id
+ecp_tls_write_read_group:#id
{
ecp_group grp1, grp2;
unsigned char buf[10];
@@ -421,7 +422,7 @@
ecp_group_init( &grp2 );
memset( buf, 0x00, sizeof( buf ) );
- TEST_ASSERT( ecp_use_known_dp( &grp1, POLARSSL_ECP_DP_{id} ) == 0 );
+ TEST_ASSERT( ecp_use_known_dp( &grp1, {id} ) == 0 );
TEST_ASSERT( ecp_tls_write_group( &grp1, &len, buf, 10 ) == 0 );
TEST_ASSERT( ( ret = ecp_tls_read_group( &grp2, &vbuf, len ) ) == 0 );
@@ -438,7 +439,7 @@
END_CASE
BEGIN_CASE
-ecp_check_privkey:id
+ecp_check_privkey:#id
{
ecp_group grp;
mpi d;
@@ -446,7 +447,7 @@
ecp_group_init( &grp );
mpi_init( &d );
- TEST_ASSERT( ecp_use_known_dp( &grp, POLARSSL_ECP_DP_{id} ) == 0 );
+ TEST_ASSERT( ecp_use_known_dp( &grp, {id} ) == 0 );
TEST_ASSERT( mpi_lset( &d, 0 ) == 0 );
TEST_ASSERT( ecp_check_privkey( &grp, &d ) == POLARSSL_ERR_ECP_GENERIC );
@@ -460,7 +461,7 @@
END_CASE
BEGIN_CASE
-ecp_gen_keypair:id
+ecp_gen_keypair:#id
{
ecp_group grp;
ecp_point Q;
@@ -472,7 +473,7 @@
mpi_init( &d );
memset( &rnd_info, 0x00, sizeof( rnd_pseudo_info ) );
- TEST_ASSERT( ecp_use_known_dp( &grp, POLARSSL_ECP_DP_{id} ) == 0 );
+ TEST_ASSERT( ecp_use_known_dp( &grp, {id} ) == 0 );
TEST_ASSERT( ecp_gen_keypair( &grp, &d, &Q, &rnd_pseudo_rand, &rnd_info )
== 0 );