Converted .function file to c-like format and adapted generator code
diff --git a/tests/suites/test_suite_ecp.function b/tests/suites/test_suite_ecp.function
index 3b2d70b..042077e 100644
--- a/tests/suites/test_suite_ecp.function
+++ b/tests/suites/test_suite_ecp.function
@@ -1,15 +1,17 @@
-BEGIN_HEADER
+/* BEGIN_HEADER */
#include <polarssl/ecp.h>
#define POLARSSL_ECP_PF_UNKNOWN -1
-END_HEADER
+/* END_HEADER */
-BEGIN_DEPENDENCIES
-depends_on:POLARSSL_ECP_C:POLARSSL_BIGNUM_C
-END_DEPENDENCIES
+/* BEGIN_DEPENDENCIES
+ * depends_on:POLARSSL_ECP_C:POLARSSL_BIGNUM_C
+ * 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
+/* BEGIN_CASE */
+void ecp_small_add( int a_zero, char *x_a, char *y_a, int b_zero, char *x_b,
+ char *y_b, int c_zero, int x_c, int y_c )
{
ecp_group grp;
ecp_point A, B, C;
@@ -20,43 +22,44 @@
TEST_ASSERT( ecp_group_read_string( &grp, 10,
"47", "4", "17", "42", "13" ) == 0 );
- if( {a_zero} )
+ if( a_zero )
ecp_set_zero( &A );
else
- TEST_ASSERT( ecp_point_read_string( &A, 10, {x_a}, {y_a} ) == 0 );
+ TEST_ASSERT( ecp_point_read_string( &A, 10, x_a, y_a ) == 0 );
- if( {b_zero} )
+ if( b_zero )
ecp_set_zero( &B );
else
- TEST_ASSERT( ecp_point_read_string( &B, 10, {x_b}, {y_b} ) == 0 );
+ TEST_ASSERT( ecp_point_read_string( &B, 10, x_b, y_b ) == 0 );
TEST_ASSERT( ecp_add( &grp, &C, &A, &B ) == 0 );
- if( {c_zero} )
+ if( c_zero )
TEST_ASSERT( mpi_cmp_int( &C.Z, 0 ) == 0 );
else
{
- TEST_ASSERT( mpi_cmp_int( &C.X, {x_c} ) == 0 );
- TEST_ASSERT( mpi_cmp_int( &C.Y, {y_c} ) == 0 );
+ TEST_ASSERT( mpi_cmp_int( &C.X, x_c ) == 0 );
+ TEST_ASSERT( mpi_cmp_int( &C.Y, y_c ) == 0 );
}
TEST_ASSERT( ecp_add( &grp, &C, &B, &A ) == 0 );
- if( {c_zero} )
+ if( c_zero )
TEST_ASSERT( mpi_cmp_int( &C.Z, 0 ) == 0 );
else
{
- TEST_ASSERT( mpi_cmp_int( &C.X, {x_c} ) == 0 );
- TEST_ASSERT( mpi_cmp_int( &C.Y, {y_c} ) == 0 );
+ TEST_ASSERT( mpi_cmp_int( &C.X, x_c ) == 0 );
+ TEST_ASSERT( mpi_cmp_int( &C.Y, y_c ) == 0 );
}
ecp_group_free( &grp );
ecp_point_free( &A ); ecp_point_free( &B ); ecp_point_free( &C );
}
-END_CASE
+/* 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
+/* BEGIN_CASE */
+void ecp_small_sub( int a_zero, char *x_a, char *y_a, int b_zero, char *x_b,
+ char *y_b, int c_zero, int x_c, int y_c )
{
ecp_group grp;
ecp_point A, B, C;
@@ -67,33 +70,33 @@
TEST_ASSERT( ecp_group_read_string( &grp, 10,
"47", "4", "17", "42", "13" ) == 0 );
- if( {a_zero} )
+ if( a_zero )
ecp_set_zero( &A );
else
- TEST_ASSERT( ecp_point_read_string( &A, 10, {x_a}, {y_a} ) == 0 );
+ TEST_ASSERT( ecp_point_read_string( &A, 10, x_a, y_a ) == 0 );
- if( {b_zero} )
+ if( b_zero )
ecp_set_zero( &B );
else
- TEST_ASSERT( ecp_point_read_string( &B, 10, {x_b}, {y_b} ) == 0 );
+ TEST_ASSERT( ecp_point_read_string( &B, 10, x_b, y_b ) == 0 );
TEST_ASSERT( ecp_sub( &grp, &C, &A, &B ) == 0 );
- if( {c_zero} )
+ if( c_zero )
TEST_ASSERT( mpi_cmp_int( &C.Z, 0 ) == 0 );
else
{
- TEST_ASSERT( mpi_cmp_int( &C.X, {x_c} ) == 0 );
- TEST_ASSERT( mpi_cmp_int( &C.Y, {y_c} ) == 0 );
+ TEST_ASSERT( mpi_cmp_int( &C.X, x_c ) == 0 );
+ TEST_ASSERT( mpi_cmp_int( &C.Y, y_c ) == 0 );
}
ecp_group_free( &grp );
ecp_point_free( &A ); ecp_point_free( &B ); ecp_point_free( &C );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-ecp_small_mul:#m_str:#r_zero:#x_r:#y_r:#ret
+/* BEGIN_CASE */
+void ecp_small_mul( int m_str, int r_zero, int x_r, int y_r, int ret )
{
ecp_group grp;
ecp_point R;
@@ -106,26 +109,26 @@
TEST_ASSERT( ecp_group_read_string( &grp, 10,
"47", "4", "17", "42", "13" ) == 0 );
- TEST_ASSERT( mpi_lset( &m, {m_str} ) == 0 );
+ TEST_ASSERT( mpi_lset( &m, m_str ) == 0 );
- TEST_ASSERT( ecp_mul( &grp, &R, &m, &grp.G ) == {ret} );
+ TEST_ASSERT( ecp_mul( &grp, &R, &m, &grp.G ) == ret );
- if( {r_zero} )
+ if( r_zero )
TEST_ASSERT( mpi_cmp_int( &R.Z, 0 ) == 0 );
else
{
- TEST_ASSERT( mpi_cmp_int( &R.X, {x_r} ) == 0 );
- TEST_ASSERT( mpi_cmp_int( &R.Y, {y_r} ) == 0 );
+ TEST_ASSERT( mpi_cmp_int( &R.X, x_r ) == 0 );
+ TEST_ASSERT( mpi_cmp_int( &R.Y, y_r ) == 0 );
}
ecp_group_free( &grp );
ecp_point_free( &R );
mpi_free( &m );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-ecp_small_check_pub:#x:#y:#z:#ret
+/* BEGIN_CASE */
+void ecp_small_check_pub( int x, int y, int z, int ret )
{
ecp_group grp;
ecp_point P;
@@ -136,19 +139,21 @@
TEST_ASSERT( ecp_group_read_string( &grp, 10,
"47", "4", "17", "42", "13" ) == 0 );
- TEST_ASSERT( mpi_lset( &P.X, {x} ) == 0 );
- TEST_ASSERT( mpi_lset( &P.Y, {y} ) == 0 );
- TEST_ASSERT( mpi_lset( &P.Z, {z} ) == 0 );
+ TEST_ASSERT( mpi_lset( &P.X, x ) == 0 );
+ TEST_ASSERT( mpi_lset( &P.Y, y ) == 0 );
+ TEST_ASSERT( mpi_lset( &P.Z, z ) == 0 );
- TEST_ASSERT( ecp_check_pubkey( &grp, &P ) == {ret} );
+ TEST_ASSERT( ecp_check_pubkey( &grp, &P ) == ret );
ecp_group_free( &grp );
ecp_point_free( &P );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-ecp_test_vect:#id:dA_str:xA_str:yA_str:dB_str:xB_str:yB_str:xZ_str:yZ_str
+/* BEGIN_CASE */
+void ecp_test_vect( int id, char *dA_str, char *xA_str, char *yA_str,
+ char *dB_str, char *xB_str, char *yB_str, char *xZ_str,
+ char *yZ_str )
{
ecp_group grp;
ecp_point R;
@@ -158,18 +163,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, {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_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( 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 );
@@ -193,10 +198,10 @@
mpi_free( &dA ); mpi_free( &xA ); mpi_free( &yA ); mpi_free( &dB );
mpi_free( &xB ); mpi_free( &yB ); mpi_free( &xZ ); mpi_free( &yZ );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-ecp_fast_mod:#id:N_str
+/* BEGIN_CASE */
+void ecp_fast_mod( int id, char *N_str )
{
ecp_group grp;
mpi N, R;
@@ -204,8 +209,8 @@
mpi_init( &N ); mpi_init( &R );
ecp_group_init( &grp );
- TEST_ASSERT( ecp_use_known_dp( &grp, {id} ) == 0 );
- TEST_ASSERT( mpi_read_string( &N, 16, {N_str} ) == 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
@@ -224,10 +229,11 @@
mpi_free( &N ); mpi_free( &R );
ecp_group_free( &grp );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-ecp_write_binary:#id:x:y:z:#format:out:#blen:#ret
+/* BEGIN_CASE */
+void ecp_write_binary( int id, char *x, char *y, char *z, int format,
+ char *out, int blen, int ret )
{
ecp_group grp;
ecp_point P;
@@ -239,27 +245,28 @@
ecp_group_init( &grp ); ecp_point_init( &P );
- TEST_ASSERT( ecp_use_known_dp( &grp, {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 );
+ 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 );
- TEST_ASSERT( ecp_point_write_binary( &grp, &P, {format},
- &olen, buf, {blen} ) == {ret} );
+ TEST_ASSERT( ecp_point_write_binary( &grp, &P, format,
+ &olen, buf, blen ) == ret );
- if( {ret} == 0 )
+ if( ret == 0 )
{
hexify( str, buf, olen );
- TEST_ASSERT( strcasecmp( (char *) str, {out} ) == 0 );
+ TEST_ASSERT( strcasecmp( (char *) str, out ) == 0 );
}
ecp_group_free( &grp ); ecp_point_free( &P );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-ecp_read_binary:#id:input:x:y:z:#ret
+/* BEGIN_CASE */
+void ecp_read_binary( int id, char *input, char *x, char *y, char *z,
+ int ret )
{
ecp_group grp;
ecp_point P;
@@ -272,17 +279,17 @@
ecp_group_init( &grp ); ecp_point_init( &P );
mpi_init( &X ); mpi_init( &Y ); mpi_init( &Z );
- TEST_ASSERT( ecp_use_known_dp( &grp, {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 );
- TEST_ASSERT( mpi_read_string( &Z, 16, {z} ) == 0 );
+ TEST_ASSERT( mpi_read_string( &X, 16, x ) == 0 );
+ TEST_ASSERT( mpi_read_string( &Y, 16, y ) == 0 );
+ TEST_ASSERT( mpi_read_string( &Z, 16, z ) == 0 );
- ilen = unhexify( buf, {input} );
+ ilen = unhexify( buf, input );
- TEST_ASSERT( ecp_point_read_binary( &grp, &P, buf, ilen ) == {ret} );
+ TEST_ASSERT( ecp_point_read_binary( &grp, &P, buf, ilen ) == ret );
- if( {ret} == 0 )
+ if( ret == 0 )
{
TEST_ASSERT( mpi_cmp_mpi( &P.X, &X ) == 0 );
TEST_ASSERT( mpi_cmp_mpi( &P.Y, &Y ) == 0 );
@@ -292,10 +299,11 @@
ecp_group_free( &grp ); ecp_point_free( &P );
mpi_free( &X ); mpi_free( &Y ); mpi_free( &Z );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-ecp_tls_read_point:#id:input:x:y:z:#ret
+/* BEGIN_CASE */
+void ecp_tls_read_point( int id, char *input, char *x, char *y, char *z,
+ int ret )
{
ecp_group grp;
ecp_point P;
@@ -309,17 +317,17 @@
ecp_group_init( &grp ); ecp_point_init( &P );
mpi_init( &X ); mpi_init( &Y ); mpi_init( &Z );
- TEST_ASSERT( ecp_use_known_dp( &grp, {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 );
- TEST_ASSERT( mpi_read_string( &Z, 16, {z} ) == 0 );
+ TEST_ASSERT( mpi_read_string( &X, 16, x ) == 0 );
+ TEST_ASSERT( mpi_read_string( &Y, 16, y ) == 0 );
+ TEST_ASSERT( mpi_read_string( &Z, 16, z ) == 0 );
- ilen = unhexify( buf, {input} );
+ ilen = unhexify( buf, input );
- TEST_ASSERT( ecp_tls_read_point( &grp, &P, &vbuf, ilen ) == {ret} );
+ TEST_ASSERT( ecp_tls_read_point( &grp, &P, &vbuf, ilen ) == ret );
- if( {ret} == 0 )
+ if( ret == 0 )
{
TEST_ASSERT( mpi_cmp_mpi( &P.X, &X ) == 0 );
TEST_ASSERT( mpi_cmp_mpi( &P.Y, &Y ) == 0 );
@@ -330,10 +338,10 @@
ecp_group_free( &grp ); ecp_point_free( &P );
mpi_free( &X ); mpi_free( &Y ); mpi_free( &Z );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-ecp_tls_write_read_point:#id
+/* BEGIN_CASE */
+void ecp_tls_write_read_point( int id )
{
ecp_group grp;
ecp_point pt;
@@ -344,7 +352,7 @@
ecp_group_init( &grp );
ecp_point_init( &pt );
- TEST_ASSERT( ecp_use_known_dp( &grp, {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,
@@ -381,10 +389,10 @@
ecp_group_free( &grp );
ecp_point_free( &pt );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-ecp_tls_read_group:record:#result:#bits
+/* BEGIN_CASE */
+void ecp_tls_read_group( char *record, int result, int bits )
{
ecp_group grp;
unsigned char buf[10];
@@ -394,23 +402,23 @@
ecp_group_init( &grp );
memset( buf, 0x00, sizeof( buf ) );
- len = unhexify( buf, {record} );
+ len = unhexify( buf, record );
ret = ecp_tls_read_group( &grp, &vbuf, len );
- TEST_ASSERT( ret == {result} );
+ TEST_ASSERT( ret == result );
if( ret == 0)
{
- TEST_ASSERT( mpi_msb( &grp.P ) == (size_t) {bits} );
+ TEST_ASSERT( mpi_msb( &grp.P ) == (size_t) bits );
TEST_ASSERT( *vbuf == 0x00 );
}
ecp_group_free( &grp );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-ecp_tls_write_read_group:#id
+/* BEGIN_CASE */
+void ecp_tls_write_read_group( int id )
{
ecp_group grp1, grp2;
unsigned char buf[10];
@@ -422,7 +430,7 @@
ecp_group_init( &grp2 );
memset( buf, 0x00, sizeof( buf ) );
- TEST_ASSERT( ecp_use_known_dp( &grp1, {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 );
@@ -436,10 +444,10 @@
ecp_group_free( &grp1 );
ecp_group_free( &grp2 );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-ecp_check_privkey:#id
+/* BEGIN_CASE */
+void ecp_check_privkey( int id )
{
ecp_group grp;
mpi d;
@@ -447,7 +455,7 @@
ecp_group_init( &grp );
mpi_init( &d );
- TEST_ASSERT( ecp_use_known_dp( &grp, {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 );
@@ -458,10 +466,10 @@
ecp_group_free( &grp );
mpi_free( &d );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-ecp_gen_keypair:#id
+/* BEGIN_CASE */
+void ecp_gen_keypair( int id )
{
ecp_group grp;
ecp_point Q;
@@ -473,7 +481,7 @@
mpi_init( &d );
memset( &rnd_info, 0x00, sizeof( rnd_pseudo_info ) );
- TEST_ASSERT( ecp_use_known_dp( &grp, {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 );
@@ -485,11 +493,11 @@
ecp_point_free( &Q );
mpi_free( &d );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-ecp_selftest:
+/* BEGIN_CASE */
+void ecp_selftest()
{
TEST_ASSERT( ecp_self_test( 0 ) == 0 );
}
-END_CASE
+/* END_CASE */