Converted .function file to c-like format and adapted generator code
diff --git a/tests/suites/test_suite_rsa.function b/tests/suites/test_suite_rsa.function
index 30eff8f..af26264 100644
--- a/tests/suites/test_suite_rsa.function
+++ b/tests/suites/test_suite_rsa.function
@@ -1,4 +1,4 @@
-BEGIN_HEADER
+/* BEGIN_HEADER */
 #include <polarssl/rsa.h>
 #include <polarssl/md2.h>
 #include <polarssl/md4.h>
@@ -8,14 +8,18 @@
 #include <polarssl/sha512.h>
 #include <polarssl/entropy.h>
 #include <polarssl/ctr_drbg.h>
-END_HEADER
+/* END_HEADER */
 
-BEGIN_DEPENDENCIES
-depends_on:POLARSSL_RSA_C:POLARSSL_BIGNUM_C:POLARSSL_GENPRIME
-END_DEPENDENCIES
+/* BEGIN_DEPENDENCIES
+ * depends_on:POLARSSL_RSA_C:POLARSSL_BIGNUM_C:POLARSSL_GENPRIME
+ * END_DEPENDENCIES
+ */
 
-BEGIN_CASE
-rsa_pkcs1_sign:message_hex_string:#padding_mode:#digest:#mod:#radix_P:input_P:#radix_Q:input_Q:#radix_N:input_N:#radix_E:input_E:result_hex_str:#result
+/* BEGIN_CASE */
+void rsa_pkcs1_sign( char *message_hex_string, int padding_mode, int digest,
+                     int mod, int radix_P, char *input_P, int radix_Q,
+                     char *input_Q, int radix_N, char *input_N, int radix_E,
+                     char *input_E, char *result_hex_str, int result )
 {
     unsigned char message_str[1000];
     unsigned char hash_result[1000];
@@ -26,18 +30,18 @@
     int msg_len;
 
     mpi_init( &P1 ); mpi_init( &Q1 ); mpi_init( &H ); mpi_init( &G );
-    rsa_init( &ctx, {padding_mode}, 0 );
+    rsa_init( &ctx, padding_mode, 0 );
 
     memset( message_str, 0x00, 1000 );
     memset( hash_result, 0x00, 1000 );
     memset( output, 0x00, 1000 );
     memset( output_str, 0x00, 1000 );
 
-    ctx.len = {mod} / 8;
-    TEST_ASSERT( mpi_read_string( &ctx.P, {radix_P}, {input_P} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.Q, {radix_Q}, {input_Q} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.N, {radix_N}, {input_N} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.E, {radix_E}, {input_E} ) == 0 );
+    ctx.len = mod / 8;
+    TEST_ASSERT( mpi_read_string( &ctx.P, radix_P, input_P ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.Q, radix_Q, input_Q ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.N, radix_N, input_N ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.E, radix_E, input_E ) == 0 );
 
     TEST_ASSERT( mpi_sub_int( &P1, &ctx.P, 1 ) == 0 );
     TEST_ASSERT( mpi_sub_int( &Q1, &ctx.Q, 1 ) == 0 );
@@ -50,26 +54,28 @@
 
     TEST_ASSERT( rsa_check_privkey( &ctx ) == 0 );
 
-    msg_len = unhexify( message_str, {message_hex_string} );
+    msg_len = unhexify( message_str, message_hex_string );
 
-    if( md_info_from_type( {digest} ) != NULL )
-        TEST_ASSERT( md( md_info_from_type( {digest} ), message_str, msg_len, hash_result ) == 0 );
+    if( md_info_from_type( digest ) != NULL )
+        TEST_ASSERT( md( md_info_from_type( digest ), message_str, msg_len, hash_result ) == 0 );
 
-    TEST_ASSERT( rsa_pkcs1_sign( &ctx, NULL, NULL, RSA_PRIVATE, {digest}, 0, hash_result, output ) == {result} );
-    if( {result} == 0 )
+    TEST_ASSERT( rsa_pkcs1_sign( &ctx, NULL, NULL, RSA_PRIVATE, digest, 0, hash_result, output ) == result );
+    if( result == 0 )
     {
         hexify( output_str, output, ctx.len );
 
-        TEST_ASSERT( strcasecmp( (char *) output_str, {result_hex_str} ) == 0 );
+        TEST_ASSERT( strcasecmp( (char *) output_str, result_hex_str ) == 0 );
     }
 
     mpi_free( &P1 ); mpi_free( &Q1 ); mpi_free( &H ); mpi_free( &G );
     rsa_free( &ctx );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-rsa_pkcs1_verify:message_hex_string:#padding_mode:#digest:#mod:#radix_N:input_N:#radix_E:input_E:result_hex_str:#result
+/* BEGIN_CASE */
+void rsa_pkcs1_verify( char *message_hex_string, int padding_mode, int digest,
+                       int mod, int radix_N, char *input_N, int radix_E,
+                       char *input_E, char *result_hex_str, int result )
 {
     unsigned char message_str[1000];
     unsigned char hash_result[1000];
@@ -77,32 +83,36 @@
     rsa_context ctx;
     int msg_len;
 
-    rsa_init( &ctx, {padding_mode}, 0 );
+    rsa_init( &ctx, padding_mode, 0 );
     memset( message_str, 0x00, 1000 );
     memset( hash_result, 0x00, 1000 );
     memset( result_str, 0x00, 1000 );
 
-    ctx.len = {mod} / 8;
-    TEST_ASSERT( mpi_read_string( &ctx.N, {radix_N}, {input_N} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.E, {radix_E}, {input_E} ) == 0 );
+    ctx.len = mod / 8;
+    TEST_ASSERT( mpi_read_string( &ctx.N, radix_N, input_N ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.E, radix_E, input_E ) == 0 );
 
     TEST_ASSERT( rsa_check_pubkey( &ctx ) == 0 );
 
-    msg_len = unhexify( message_str, {message_hex_string} );
-    unhexify( result_str, {result_hex_str} );
+    msg_len = unhexify( message_str, message_hex_string );
+    unhexify( result_str, result_hex_str );
 
-    if( md_info_from_type( {digest} ) != NULL )
-        TEST_ASSERT( md( md_info_from_type( {digest} ), message_str, msg_len, hash_result ) == 0 );
+    if( md_info_from_type( digest ) != NULL )
+        TEST_ASSERT( md( md_info_from_type( digest ), message_str, msg_len, hash_result ) == 0 );
 
-    TEST_ASSERT( rsa_pkcs1_verify( &ctx, RSA_PUBLIC, {digest}, 0, hash_result, result_str ) == {result} );
+    TEST_ASSERT( rsa_pkcs1_verify( &ctx, RSA_PUBLIC, digest, 0, hash_result, result_str ) == result );
 
     rsa_free( &ctx );
 }
-END_CASE
+/* END_CASE */
 
 
-BEGIN_CASE
-rsa_pkcs1_sign_raw:message_hex_string:hash_result_string:#padding_mode:#mod:#radix_P:input_P:#radix_Q:input_Q:#radix_N:input_N:#radix_E:input_E:result_hex_str
+/* BEGIN_CASE */
+void rsa_pkcs1_sign_raw( char *message_hex_string, char *hash_result_string,
+                         int padding_mode, int mod, int radix_P, char *input_P,
+                         int radix_Q, char *input_Q, int radix_N,
+                         char *input_N, int radix_E, char *input_E,
+                         char *result_hex_str )
 {
     unsigned char message_str[1000];
     unsigned char hash_result[1000];
@@ -113,18 +123,18 @@
     int hash_len;
 
     mpi_init( &P1 ); mpi_init( &Q1 ); mpi_init( &H ); mpi_init( &G );
-    rsa_init( &ctx, {padding_mode}, 0 );
+    rsa_init( &ctx, padding_mode, 0 );
 
     memset( message_str, 0x00, 1000 );
     memset( hash_result, 0x00, 1000 );
     memset( output, 0x00, 1000 );
     memset( output_str, 0x00, 1000 );
 
-    ctx.len = {mod} / 8;
-    TEST_ASSERT( mpi_read_string( &ctx.P, {radix_P}, {input_P} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.Q, {radix_Q}, {input_Q} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.N, {radix_N}, {input_N} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.E, {radix_E}, {input_E} ) == 0 );
+    ctx.len = mod / 8;
+    TEST_ASSERT( mpi_read_string( &ctx.P, radix_P, input_P ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.Q, radix_Q, input_Q ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.N, radix_N, input_N ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.E, radix_E, input_E ) == 0 );
 
     TEST_ASSERT( mpi_sub_int( &P1, &ctx.P, 1 ) == 0 );
     TEST_ASSERT( mpi_sub_int( &Q1, &ctx.Q, 1 ) == 0 );
@@ -137,22 +147,25 @@
 
     TEST_ASSERT( rsa_check_privkey( &ctx ) == 0 );
 
-    unhexify( message_str, {message_hex_string} );
-    hash_len = unhexify( hash_result, {hash_result_string} );
+    unhexify( message_str, message_hex_string );
+    hash_len = unhexify( hash_result, hash_result_string );
 
     TEST_ASSERT( rsa_pkcs1_sign( &ctx, NULL, NULL, RSA_PRIVATE, POLARSSL_MD_NONE, hash_len, hash_result, output ) == 0 );
 
     hexify( output_str, output, ctx.len );
 
-    TEST_ASSERT( strcasecmp( (char *) output_str, {result_hex_str} ) == 0 );
+    TEST_ASSERT( strcasecmp( (char *) output_str, result_hex_str ) == 0 );
 
     mpi_free( &P1 ); mpi_free( &Q1 ); mpi_free( &H ); mpi_free( &G );
     rsa_free( &ctx );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-rsa_pkcs1_verify_raw:message_hex_string:hash_result_string:#padding_mode:#mod:#radix_N:input_N:#radix_E:input_E:result_hex_str:#correct
+/* BEGIN_CASE */
+void rsa_pkcs1_verify_raw( char *message_hex_string, char *hash_result_string,
+                           int padding_mode, int mod, int radix_N,
+                           char *input_N, int radix_E, char *input_E,
+                           char *result_hex_str, int correct )
 {
     unsigned char message_str[1000];
     unsigned char hash_result[1000];
@@ -160,29 +173,31 @@
     rsa_context ctx;
     size_t hash_len;
 
-    rsa_init( &ctx, {padding_mode}, 0 );
+    rsa_init( &ctx, padding_mode, 0 );
     memset( message_str, 0x00, 1000 );
     memset( hash_result, 0x00, 1000 );
     memset( result_str, 0x00, 1000 );
 
-    ctx.len = {mod} / 8;
-    TEST_ASSERT( mpi_read_string( &ctx.N, {radix_N}, {input_N} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.E, {radix_E}, {input_E} ) == 0 );
+    ctx.len = mod / 8;
+    TEST_ASSERT( mpi_read_string( &ctx.N, radix_N, input_N ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.E, radix_E, input_E ) == 0 );
 
     TEST_ASSERT( rsa_check_pubkey( &ctx ) == 0 );
 
-    unhexify( message_str, {message_hex_string} );
-    hash_len = unhexify( hash_result, {hash_result_string} );
-    unhexify( result_str, {result_hex_str} );
+    unhexify( message_str, message_hex_string );
+    hash_len = unhexify( hash_result, hash_result_string );
+    unhexify( result_str, result_hex_str );
 
-    TEST_ASSERT( rsa_pkcs1_verify( &ctx, RSA_PUBLIC, POLARSSL_MD_NONE, hash_len, hash_result, result_str ) == {correct} );
+    TEST_ASSERT( rsa_pkcs1_verify( &ctx, RSA_PUBLIC, POLARSSL_MD_NONE, hash_len, hash_result, result_str ) == correct );
 
     rsa_free( &ctx );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-rsa_pkcs1_encrypt:message_hex_string:#padding_mode:#mod:#radix_N:input_N:#radix_E:input_E:result_hex_str:#result
+/* BEGIN_CASE */
+void rsa_pkcs1_encrypt( char *message_hex_string, int padding_mode, int mod,
+                        int radix_N, char *input_N, int radix_E, char *input_E,
+                        char *result_hex_str, int result )
 {
     unsigned char message_str[1000];
     unsigned char output[1000];
@@ -193,33 +208,36 @@
 
     memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
 
-    rsa_init( &ctx, {padding_mode}, 0 );
+    rsa_init( &ctx, padding_mode, 0 );
     memset( message_str, 0x00, 1000 );
     memset( output, 0x00, 1000 );
     memset( output_str, 0x00, 1000 );
 
-    ctx.len = {mod} / 8;
-    TEST_ASSERT( mpi_read_string( &ctx.N, {radix_N}, {input_N} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.E, {radix_E}, {input_E} ) == 0 );
+    ctx.len = mod / 8;
+    TEST_ASSERT( mpi_read_string( &ctx.N, radix_N, input_N ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.E, radix_E, input_E ) == 0 );
 
     TEST_ASSERT( rsa_check_pubkey( &ctx ) == 0 );
 
-    msg_len = unhexify( message_str, {message_hex_string} );
+    msg_len = unhexify( message_str, message_hex_string );
 
-    TEST_ASSERT( rsa_pkcs1_encrypt( &ctx, &rnd_pseudo_rand, &rnd_info, RSA_PUBLIC, msg_len, message_str, output ) == {result} );
-    if( {result} == 0 )
+    TEST_ASSERT( rsa_pkcs1_encrypt( &ctx, &rnd_pseudo_rand, &rnd_info, RSA_PUBLIC, msg_len, message_str, output ) == result );
+    if( result == 0 )
     {
         hexify( output_str, output, ctx.len );
 
-        TEST_ASSERT( strcasecmp( (char *) output_str, {result_hex_str} ) == 0 );
+        TEST_ASSERT( strcasecmp( (char *) output_str, result_hex_str ) == 0 );
     }
 
     rsa_free( &ctx );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-rsa_pkcs1_encrypt_bad_rng:message_hex_string:#padding_mode:#mod:#radix_N:input_N:#radix_E:input_E:result_hex_str:#result
+/* BEGIN_CASE */
+void rsa_pkcs1_encrypt_bad_rng( char *message_hex_string, int padding_mode,
+                                int mod, int radix_N, char *input_N,
+                                int radix_E, char *input_E,
+                                char *result_hex_str, int result )
 {
     unsigned char message_str[1000];
     unsigned char output[1000];
@@ -227,33 +245,36 @@
     rsa_context ctx;
     size_t msg_len;
 
-    rsa_init( &ctx, {padding_mode}, 0 );
+    rsa_init( &ctx, padding_mode, 0 );
     memset( message_str, 0x00, 1000 );
     memset( output, 0x00, 1000 );
     memset( output_str, 0x00, 1000 );
 
-    ctx.len = {mod} / 8;
-    TEST_ASSERT( mpi_read_string( &ctx.N, {radix_N}, {input_N} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.E, {radix_E}, {input_E} ) == 0 );
+    ctx.len = mod / 8;
+    TEST_ASSERT( mpi_read_string( &ctx.N, radix_N, input_N ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.E, radix_E, input_E ) == 0 );
 
     TEST_ASSERT( rsa_check_pubkey( &ctx ) == 0 );
 
-    msg_len = unhexify( message_str, {message_hex_string} );
+    msg_len = unhexify( message_str, message_hex_string );
 
-    TEST_ASSERT( rsa_pkcs1_encrypt( &ctx, &rnd_zero_rand, NULL, RSA_PUBLIC, msg_len, message_str, output ) == {result} );
-    if( {result} == 0 )
+    TEST_ASSERT( rsa_pkcs1_encrypt( &ctx, &rnd_zero_rand, NULL, RSA_PUBLIC, msg_len, message_str, output ) == result );
+    if( result == 0 )
     {
         hexify( output_str, output, ctx.len );
 
-        TEST_ASSERT( strcasecmp( (char *) output_str, {result_hex_str} ) == 0 );
+        TEST_ASSERT( strcasecmp( (char *) output_str, result_hex_str ) == 0 );
     }
 
     rsa_free( &ctx );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-rsa_pkcs1_decrypt:message_hex_string:#padding_mode:#mod:#radix_P:input_P:#radix_Q:input_Q:#radix_N:input_N:#radix_E:input_E:#max_output:result_hex_str:#result
+/* BEGIN_CASE */
+void rsa_pkcs1_decrypt( char *message_hex_string, int padding_mode, int mod,
+                        int radix_P, char *input_P, int radix_Q, char *input_Q,
+                        int radix_N, char *input_N, int radix_E, char *input_E,
+                        int max_output, char *result_hex_str, int result )
 {
     unsigned char message_str[1000];
     unsigned char output[1000];
@@ -263,17 +284,17 @@
     size_t output_len;
 
     mpi_init( &P1 ); mpi_init( &Q1 ); mpi_init( &H ); mpi_init( &G );
-    rsa_init( &ctx, {padding_mode}, 0 );
+    rsa_init( &ctx, padding_mode, 0 );
 
     memset( message_str, 0x00, 1000 );
     memset( output, 0x00, 1000 );
     memset( output_str, 0x00, 1000 );
 
-    ctx.len = {mod} / 8;
-    TEST_ASSERT( mpi_read_string( &ctx.P, {radix_P}, {input_P} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.Q, {radix_Q}, {input_Q} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.N, {radix_N}, {input_N} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.E, {radix_E}, {input_E} ) == 0 );
+    ctx.len = mod / 8;
+    TEST_ASSERT( mpi_read_string( &ctx.P, radix_P, input_P ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.Q, radix_Q, input_Q ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.N, radix_N, input_N ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.E, radix_E, input_E ) == 0 );
 
     TEST_ASSERT( mpi_sub_int( &P1, &ctx.P, 1 ) == 0 );
     TEST_ASSERT( mpi_sub_int( &Q1, &ctx.Q, 1 ) == 0 );
@@ -286,24 +307,25 @@
 
     TEST_ASSERT( rsa_check_privkey( &ctx ) == 0 );
 
-    unhexify( message_str, {message_hex_string} );
+    unhexify( message_str, message_hex_string );
     output_len = 0;
 
-    TEST_ASSERT( rsa_pkcs1_decrypt( &ctx, RSA_PRIVATE, &output_len, message_str, output, {max_output} ) == {result} );
-    if( {result} == 0 )
+    TEST_ASSERT( rsa_pkcs1_decrypt( &ctx, RSA_PRIVATE, &output_len, message_str, output, max_output ) == result );
+    if( result == 0 )
     {
         hexify( output_str, output, ctx.len );
 
-        TEST_ASSERT( strncasecmp( (char *) output_str, {result_hex_str}, strlen( {result_hex_str} ) ) == 0 );
+        TEST_ASSERT( strncasecmp( (char *) output_str, result_hex_str, strlen( result_hex_str ) ) == 0 );
     }
 
     mpi_free( &P1 ); mpi_free( &Q1 ); mpi_free( &H ); mpi_free( &G );
     rsa_free( &ctx );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-rsa_public:message_hex_string:#mod:#radix_N:input_N:#radix_E:input_E:result_hex_str:#result
+/* BEGIN_CASE */
+void rsa_public( char *message_hex_string, int mod, int radix_N, char *input_N,
+                 int radix_E, char *input_E, char *result_hex_str, int result )
 {
     unsigned char message_str[1000];
     unsigned char output[1000];
@@ -315,28 +337,30 @@
     memset( output, 0x00, 1000 );
     memset( output_str, 0x00, 1000 );
 
-    ctx.len = {mod} / 8;
-    TEST_ASSERT( mpi_read_string( &ctx.N, {radix_N}, {input_N} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.E, {radix_E}, {input_E} ) == 0 );
+    ctx.len = mod / 8;
+    TEST_ASSERT( mpi_read_string( &ctx.N, radix_N, input_N ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.E, radix_E, input_E ) == 0 );
 
     TEST_ASSERT( rsa_check_pubkey( &ctx ) == 0 );
 
-    unhexify( message_str, {message_hex_string} );
+    unhexify( message_str, message_hex_string );
 
-    TEST_ASSERT( rsa_public( &ctx, message_str, output ) == {result} );
-    if( {result} == 0 )
+    TEST_ASSERT( rsa_public( &ctx, message_str, output ) == result );
+    if( result == 0 )
     {
         hexify( output_str, output, ctx.len );
 
-        TEST_ASSERT( strcasecmp( (char *) output_str, {result_hex_str} ) == 0 );
+        TEST_ASSERT( strcasecmp( (char *) output_str, result_hex_str ) == 0 );
     }
 
     rsa_free( &ctx );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-rsa_private:message_hex_string:#mod:#radix_P:input_P:#radix_Q:input_Q:#radix_N:input_N:#radix_E:input_E:result_hex_str:#result
+/* BEGIN_CASE */
+void rsa_private( char *message_hex_string, int mod, int radix_P, char *input_P,
+                  int radix_Q, char *input_Q, int radix_N, char *input_N,
+                  int radix_E, char *input_E, char *result_hex_str, int result )
 {
     unsigned char message_str[1000];
     unsigned char output[1000];
@@ -351,11 +375,11 @@
     memset( output, 0x00, 1000 );
     memset( output_str, 0x00, 1000 );
 
-    ctx.len = {mod} / 8;
-    TEST_ASSERT( mpi_read_string( &ctx.P, {radix_P}, {input_P} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.Q, {radix_Q}, {input_Q} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.N, {radix_N}, {input_N} ) == 0 );
-    TEST_ASSERT( mpi_read_string( &ctx.E, {radix_E}, {input_E} ) == 0 );
+    ctx.len = mod / 8;
+    TEST_ASSERT( mpi_read_string( &ctx.P, radix_P, input_P ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.Q, radix_Q, input_Q ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.N, radix_N, input_N ) == 0 );
+    TEST_ASSERT( mpi_read_string( &ctx.E, radix_E, input_E ) == 0 );
 
     TEST_ASSERT( mpi_sub_int( &P1, &ctx.P, 1 ) == 0 );
     TEST_ASSERT( mpi_sub_int( &Q1, &ctx.Q, 1 ) == 0 );
@@ -368,102 +392,108 @@
 
     TEST_ASSERT( rsa_check_privkey( &ctx ) == 0 );
 
-    unhexify( message_str, {message_hex_string} );
+    unhexify( message_str, message_hex_string );
 
-    TEST_ASSERT( rsa_private( &ctx, message_str, output ) == {result} );
-    if( {result} == 0 )
+    TEST_ASSERT( rsa_private( &ctx, message_str, output ) == result );
+    if( result == 0 )
     {
         hexify( output_str, output, ctx.len );
 
-        TEST_ASSERT( strcasecmp( (char *) output_str, {result_hex_str} ) == 0 );
+        TEST_ASSERT( strcasecmp( (char *) output_str, result_hex_str ) == 0 );
     }
 
     mpi_free( &P1 ); mpi_free( &Q1 ); mpi_free( &H ); mpi_free( &G );
     rsa_free( &ctx );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-rsa_check_privkey_null:
+/* BEGIN_CASE */
+void rsa_check_privkey_null()
 {
     rsa_context ctx;
     memset( &ctx, 0x00, sizeof( rsa_context ) );
 
     TEST_ASSERT( rsa_check_privkey( &ctx ) == POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-rsa_check_pubkey:#radix_N:input_N:#radix_E:input_E:#result
+/* BEGIN_CASE */
+void rsa_check_pubkey( int radix_N, char *input_N, int radix_E, char *input_E,
+                       int result )
 {
     rsa_context ctx;
 
     rsa_init( &ctx, RSA_PKCS_V15, 0 );
 
-    if( strlen( {input_N} ) )
+    if( strlen( input_N ) )
     {
-        TEST_ASSERT( mpi_read_string( &ctx.N, {radix_N}, {input_N} ) == 0 );
+        TEST_ASSERT( mpi_read_string( &ctx.N, radix_N, input_N ) == 0 );
     }
-    if( strlen( {input_E} ) )
+    if( strlen( input_E ) )
     {
-        TEST_ASSERT( mpi_read_string( &ctx.E, {radix_E}, {input_E} ) == 0 );
+        TEST_ASSERT( mpi_read_string( &ctx.E, radix_E, input_E ) == 0 );
     }
 
-    TEST_ASSERT( rsa_check_pubkey( &ctx ) == {result} );
+    TEST_ASSERT( rsa_check_pubkey( &ctx ) == result );
 
     rsa_free( &ctx );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-rsa_check_privkey:#mod:#radix_P:input_P:#radix_Q:input_Q:#radix_N:input_N:#radix_E:input_E:#radix_D:input_D:#radix_DP:input_DP:#radix_DQ:input_DQ:#radix_QP:input_QP:#result
+/* BEGIN_CASE */
+void rsa_check_privkey( int mod, int radix_P, char *input_P, int radix_Q,
+                        char *input_Q, int radix_N, char *input_N,
+                        int radix_E, char *input_E, int radix_D, char *input_D,
+                        int radix_DP, char *input_DP, int radix_DQ,
+                        char *input_DQ, int radix_QP, char *input_QP,
+                        int result )
 {
     rsa_context ctx;
 
     rsa_init( &ctx, RSA_PKCS_V15, 0 );
 
-    ctx.len = {mod} / 8;
-    if( strlen( {input_P} ) )
+    ctx.len = mod / 8;
+    if( strlen( input_P ) )
     {
-        TEST_ASSERT( mpi_read_string( &ctx.P, {radix_P}, {input_P} ) == 0 );
+        TEST_ASSERT( mpi_read_string( &ctx.P, radix_P, input_P ) == 0 );
     }
-    if( strlen( {input_Q} ) )
+    if( strlen( input_Q ) )
     {
-        TEST_ASSERT( mpi_read_string( &ctx.Q, {radix_Q}, {input_Q} ) == 0 );
+        TEST_ASSERT( mpi_read_string( &ctx.Q, radix_Q, input_Q ) == 0 );
     }
-    if( strlen( {input_N} ) )
+    if( strlen( input_N ) )
     {
-        TEST_ASSERT( mpi_read_string( &ctx.N, {radix_N}, {input_N} ) == 0 );
+        TEST_ASSERT( mpi_read_string( &ctx.N, radix_N, input_N ) == 0 );
     }
-    if( strlen( {input_E} ) )
+    if( strlen( input_E ) )
     {
-        TEST_ASSERT( mpi_read_string( &ctx.E, {radix_E}, {input_E} ) == 0 );
+        TEST_ASSERT( mpi_read_string( &ctx.E, radix_E, input_E ) == 0 );
     }
-    if( strlen( {input_D} ) )
+    if( strlen( input_D ) )
     {
-        TEST_ASSERT( mpi_read_string( &ctx.D, {radix_D}, {input_D} ) == 0 );
+        TEST_ASSERT( mpi_read_string( &ctx.D, radix_D, input_D ) == 0 );
     }
-    if( strlen( {input_DP} ) )
+    if( strlen( input_DP ) )
     {
-        TEST_ASSERT( mpi_read_string( &ctx.DP, {radix_DP}, {input_DP} ) == 0 );
+        TEST_ASSERT( mpi_read_string( &ctx.DP, radix_DP, input_DP ) == 0 );
     }
-    if( strlen( {input_DQ} ) )
+    if( strlen( input_DQ ) )
     {
-        TEST_ASSERT( mpi_read_string( &ctx.DQ, {radix_DQ}, {input_DQ} ) == 0 );
+        TEST_ASSERT( mpi_read_string( &ctx.DQ, radix_DQ, input_DQ ) == 0 );
     }
-    if( strlen( {input_QP} ) )
+    if( strlen( input_QP ) )
     {
-        TEST_ASSERT( mpi_read_string( &ctx.QP, {radix_QP}, {input_QP} ) == 0 );
+        TEST_ASSERT( mpi_read_string( &ctx.QP, radix_QP, input_QP ) == 0 );
     }
 
-    TEST_ASSERT( rsa_check_privkey( &ctx ) == {result} );
+    TEST_ASSERT( rsa_check_privkey( &ctx ) == result );
 
     rsa_free( &ctx );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-rsa_gen_key:#nrbits:#exponent:#result
+/* BEGIN_CASE */
+void rsa_gen_key( int nrbits, int exponent, int result)
 {
     rsa_context ctx;
     entropy_context entropy;
@@ -476,19 +506,19 @@
 
     rsa_init( &ctx, 0, 0 );
 
-    TEST_ASSERT( rsa_gen_key( &ctx, ctr_drbg_random, &ctr_drbg, {nrbits}, {exponent} ) == {result} );
-    if( {result} == 0 )
+    TEST_ASSERT( rsa_gen_key( &ctx, ctr_drbg_random, &ctr_drbg, nrbits, exponent ) == result );
+    if( result == 0 )
     {
         TEST_ASSERT( rsa_check_privkey( &ctx ) == 0 );
     }
 
     rsa_free( &ctx );
 }
-END_CASE
+/* END_CASE */
 
-BEGIN_CASE
-rsa_selftest:
+/* BEGIN_CASE */
+void rsa_selftest()
 {
     TEST_ASSERT( rsa_self_test( 0 ) == 0 );
 }
-END_CASE
+/* END_CASE */