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_ecdsa.function

diff --git a/tests/suites/test_suite_ecdsa.function b/tests/suites/test_suite_ecdsa.function
index 3cb1b9f..5e1ba64 100644
--- a/tests/suites/test_suite_ecdsa.function
+++ b/tests/suites/test_suite_ecdsa.function
@@ -1,13 +1,14 @@
-BEGIN_HEADER
+/* BEGIN_HEADER */
 #include <polarssl/ecdsa.h>
-END_HEADER
+/* END_HEADER */
 
-BEGIN_DEPENDENCIES
-depends_on:POLARSSL_ECDSA_C:POLARSSL_ECP_C:POLARSSL_BIGNUM_C
-END_DEPENDENCIES
+/* BEGIN_DEPENDENCIES
+ * depends_on:POLARSSL_ECDSA_C:POLARSSL_ECP_C:POLARSSL_BIGNUM_C
+ * END_DEPENDENCIES
+ */
 
-BEGIN_CASE
-ecdsa_prim_random:#id
+/* BEGIN_CASE */
+void ecdsa_prim_random( int id )
 {
     ecp_group grp;
     ecp_point Q;
@@ -23,7 +24,7 @@
 
     /* prepare material for signature */
     TEST_ASSERT( rnd_pseudo_rand( &rnd_info, buf, sizeof( buf ) ) == 0 );
-    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 );
 
@@ -35,10 +36,12 @@
     ecp_point_free( &Q );
     mpi_free( &d ); mpi_free( &r ); mpi_free( &s );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-ecdsa_prim_test_vectors:#id:d_str:xQ_str:yQ_str:k_str:hash_str:r_str:s_str
+/* BEGIN_CASE */
+void ecdsa_prim_test_vectors( int id, char *d_str, char *xQ_str, char *yQ_str,
+                              char *k_str, char *hash_str, char *r_str,
+                              char *s_str )
 {
     ecp_group grp;
     ecp_point Q;
@@ -52,15 +55,15 @@
     mpi_init( &r_check ); mpi_init( &s_check );
     memset( buf, 0, sizeof( buf ) );
 
-    TEST_ASSERT( ecp_use_known_dp( &grp, {id} ) == 0 );
-    TEST_ASSERT( ecp_point_read_string( &Q, 16, {xQ_str}, {yQ_str} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &d, 16, {d_str} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &r_check, 16, {r_str} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &s_check, 16, {s_str} ) == 0 );
-    len = unhexify(buf, {hash_str});
+    TEST_ASSERT( ecp_use_known_dp( &grp, id ) == 0 );
+    TEST_ASSERT( ecp_point_read_string( &Q, 16, xQ_str, yQ_str ) == 0 );
+    TEST_ASSERT( mpi_read_string( &d, 16, d_str ) == 0 );
+    TEST_ASSERT( mpi_read_string( &r_check, 16, r_str ) == 0 );
+    TEST_ASSERT( mpi_read_string( &s_check, 16, s_str ) == 0 );
+    len = unhexify(buf, hash_str);
 
     TEST_ASSERT( ecdsa_sign( &grp, &r, &s, &d, buf, len,
-                &not_rnd, {k_str} ) == 0 );
+                &not_rnd, k_str ) == 0 );
 
     TEST_ASSERT( mpi_cmp_mpi( &r, &r_check ) == 0 );
     TEST_ASSERT( mpi_cmp_mpi( &s, &s_check ) == 0 );
@@ -72,4 +75,4 @@
     mpi_free( &d ); mpi_free( &r ); mpi_free( &s );
     mpi_free( &r_check ); mpi_free( &s_check );
 }
-END_CASE
+/* END_CASE */