commit 33b43f1ec3c53ee44ed33d7cf47092261c06aa22
author Paul Bakker <p.j.bakker@polarssl.org> Tue Aug 20 11:48:36 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Aug 20 11:48:36 2013 +0200
tree 7c1c3f41bc8a1a2f02a6eb66e1a5328072830c05
parent 55a7e908f26755b4f6f1784da50b47b4c105afad

Converted .function file to c-like format and adapted generator code

tests/suites/test_suite_ecdh.function

diff --git a/tests/suites/test_suite_ecdh.function b/tests/suites/test_suite_ecdh.function
index 12a3b1d..6acf4df 100644
--- a/tests/suites/test_suite_ecdh.function
+++ b/tests/suites/test_suite_ecdh.function
@@ -1,13 +1,14 @@
-BEGIN_HEADER
+/* BEGIN_HEADER */
 #include <polarssl/ecdh.h>
-END_HEADER
+/* END_HEADER */
 
-BEGIN_DEPENDENCIES
-depends_on:POLARSSL_ECDH_C:POLARSSL_ECP_C:POLARSSL_BIGNUM_C
-END_DEPENDENCIES
+/* BEGIN_DEPENDENCIES
+ * depends_on:POLARSSL_ECDH_C:POLARSSL_ECP_C:POLARSSL_BIGNUM_C
+ * END_DEPENDENCIES
+ */
 
-BEGIN_CASE
-ecdh_primitive_random:#id
+/* BEGIN_CASE */
+void ecdh_primitive_random( int id )
 {
     ecp_group grp;
     ecp_point qA, qB;
@@ -20,7 +21,7 @@
     mpi_init( &zA ); mpi_init( &zB );
     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( ecdh_gen_public( &grp, &dA, &qA, &rnd_pseudo_rand, &rnd_info )
                  == 0 );
@@ -36,10 +37,12 @@
     mpi_free( &dA ); mpi_free( &dB );
     mpi_free( &zA ); mpi_free( &zB );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-ecdh_primitive_testvec:#id:dA_str:xA_str:yA_str:dB_str:xB_str:yB_str:z_str
+/* BEGIN_CASE */
+void ecdh_primitive_testvec( int id, char *dA_str, char *xA_str, char *yA_str,
+                             char *dB_str, char *xB_str, char *yB_str,
+                             char *z_str )
 {
     ecp_group grp;
     ecp_point qA, qB;
@@ -50,23 +53,23 @@
     mpi_init( &dA ); mpi_init( &dB );
     mpi_init( &zA ); mpi_init( &zB ); mpi_init( &check );
 
-    TEST_ASSERT( ecp_use_known_dp( &grp, {id} ) == 0 );
+    TEST_ASSERT( ecp_use_known_dp( &grp, id ) == 0 );
 
-    TEST_ASSERT( ecdh_gen_public( &grp, &dA, &qA, &not_rnd, {dA_str} ) == 0 );
+    TEST_ASSERT( ecdh_gen_public( &grp, &dA, &qA, &not_rnd, dA_str ) == 0 );
     TEST_ASSERT( ! ecp_is_zero( &qA ) );
-    TEST_ASSERT( mpi_read_string( &check, 16, {xA_str} ) == 0 );
+    TEST_ASSERT( mpi_read_string( &check, 16, xA_str ) == 0 );
     TEST_ASSERT( mpi_cmp_mpi( &qA.X, &check ) == 0 );
-    TEST_ASSERT( mpi_read_string( &check, 16, {yA_str} ) == 0 );
+    TEST_ASSERT( mpi_read_string( &check, 16, yA_str ) == 0 );
     TEST_ASSERT( mpi_cmp_mpi( &qA.Y, &check ) == 0 );
 
-    TEST_ASSERT( ecdh_gen_public( &grp, &dB, &qB, &not_rnd, {dB_str} ) == 0 );
+    TEST_ASSERT( ecdh_gen_public( &grp, &dB, &qB, &not_rnd, dB_str ) == 0 );
     TEST_ASSERT( ! ecp_is_zero( &qB ) );
-    TEST_ASSERT( mpi_read_string( &check, 16, {xB_str} ) == 0 );
+    TEST_ASSERT( mpi_read_string( &check, 16, xB_str ) == 0 );
     TEST_ASSERT( mpi_cmp_mpi( &qB.X, &check ) == 0 );
-    TEST_ASSERT( mpi_read_string( &check, 16, {yB_str} ) == 0 );
+    TEST_ASSERT( mpi_read_string( &check, 16, yB_str ) == 0 );
     TEST_ASSERT( mpi_cmp_mpi( &qB.Y, &check ) == 0 );
 
-    TEST_ASSERT( mpi_read_string( &check, 16, {z_str} ) == 0 );
+    TEST_ASSERT( mpi_read_string( &check, 16, z_str ) == 0 );
     TEST_ASSERT( ecdh_compute_shared( &grp, &zA, &qB, &dA ) == 0 );
     TEST_ASSERT( mpi_cmp_mpi( &zA, &check ) == 0 );
     TEST_ASSERT( ecdh_compute_shared( &grp, &zB, &qA, &dB ) == 0 );
@@ -77,10 +80,10 @@
     mpi_free( &dA ); mpi_free( &dB );
     mpi_free( &zA ); mpi_free( &zB ); mpi_free( &check );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-ecdh_exchange:#id
+/* BEGIN_CASE */
+void ecdh_exchange( int id )
 {
     ecdh_context srv, cli;
     unsigned char buf[1000];
@@ -92,7 +95,7 @@
     ecdh_init( &cli );
     memset( &rnd_info, 0x00, sizeof( rnd_pseudo_info ) );
 
-    TEST_ASSERT( ecp_use_known_dp( &srv.grp, {id} ) == 0 );
+    TEST_ASSERT( ecp_use_known_dp( &srv.grp, id ) == 0 );
 
     memset( buf, 0x00, sizeof( buf ) ); vbuf = buf;
     TEST_ASSERT( ecdh_make_params( &srv, &len, buf, 1000,
@@ -111,4 +114,4 @@
     ecdh_free( &srv );
     ecdh_free( &cli );
 }
-END_CASE
+/* END_CASE */