Converted .function file to c-like format and adapted generator code
diff --git a/tests/suites/test_suite_pkcs1_v21.function b/tests/suites/test_suite_pkcs1_v21.function
index 5722f5f..21ef421 100644
--- a/tests/suites/test_suite_pkcs1_v21.function
+++ b/tests/suites/test_suite_pkcs1_v21.function
@@ -1,4 +1,4 @@
-BEGIN_HEADER
+/* BEGIN_HEADER */
#include <polarssl/rsa.h>
#include <polarssl/md.h>
#include <polarssl/md2.h>
@@ -7,14 +7,18 @@
#include <polarssl/sha1.h>
#include <polarssl/sha256.h>
#include <polarssl/sha512.h>
-END_HEADER
+/* END_HEADER */
-BEGIN_DEPENDENCIES
-depends_on:POLARSSL_PKCS1_V21:POLARSSL_RSA_C:POLARSSL_BIGNUM_C:POLARSSL_SHA1_C:POLARSSL_GENPRIME
-END_DEPENDENCIES
+/* BEGIN_DEPENDENCIES
+ * depends_on:POLARSSL_PKCS1_V21:POLARSSL_RSA_C:POLARSSL_BIGNUM_C:POLARSSL_SHA1_C:POLARSSL_GENPRIME
+ * END_DEPENDENCIES
+ */
-BEGIN_CASE
-pkcs1_rsaes_oaep_encrypt:#mod:#radix_N:input_N:#radix_E:input_E:#hash:message_hex_string:seed:result_hex_str:#result
+/* BEGIN_CASE */
+void pkcs1_rsaes_oaep_encrypt( int mod, int radix_N, char *input_N, int radix_E,
+ char *input_E, int hash,
+ char *message_hex_string, char *seed,
+ char *result_hex_str, int result )
{
unsigned char message_str[1000];
unsigned char output[1000];
@@ -24,36 +28,40 @@
size_t msg_len;
rnd_buf_info info;
- info.length = unhexify( rnd_buf, {seed} );
+ info.length = unhexify( rnd_buf, seed );
info.buf = rnd_buf;
- rsa_init( &ctx, RSA_PKCS_V21, {hash} );
+ rsa_init( &ctx, RSA_PKCS_V21, hash );
memset( message_str, 0x00, 1000 );
memset( output, 0x00, 1000 );
memset( output_str, 0x00, 1000 );
- ctx.len = {mod} / 8 + ( ( {mod} % 8 ) ? 1 : 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 + ( ( mod % 8 ) ? 1 : 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( 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_buffer_rand, &info, RSA_PUBLIC, msg_len, message_str, output ) == {result} );
- if( {result} == 0 )
+ TEST_ASSERT( rsa_pkcs1_encrypt( &ctx, &rnd_buffer_rand, &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
-pkcs1_rsaes_oaep_decrypt:#mod:#radix_P:input_P:#radix_Q:input_Q:#radix_N:input_N:#radix_E:input_E:#hash:result_hex_str:seed:message_hex_string:#result
+/* BEGIN_CASE */
+void pkcs1_rsaes_oaep_decrypt( 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 hash, char *result_hex_str, char *seed,
+ char *message_hex_string, int result )
{
unsigned char message_str[1000];
unsigned char output[1000];
@@ -64,17 +72,17 @@
((void) seed);
mpi_init( &P1 ); mpi_init( &Q1 ); mpi_init( &H ); mpi_init( &G );
- rsa_init( &ctx, RSA_PKCS_V21, {hash} );
+ rsa_init( &ctx, RSA_PKCS_V21, hash );
memset( message_str, 0x00, 1000 );
memset( output, 0x00, 1000 );
memset( output_str, 0x00, 1000 );
- ctx.len = {mod} / 8 + ( ( {mod} % 8 ) ? 1 : 0 );
- 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 + ( ( mod % 8 ) ? 1 : 0 );
+ 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 );
@@ -87,23 +95,27 @@
TEST_ASSERT( rsa_check_privkey( &ctx ) == 0 );
- unhexify( message_str, {message_hex_string} );
+ unhexify( message_str, message_hex_string );
- TEST_ASSERT( rsa_pkcs1_decrypt( &ctx, RSA_PRIVATE, &output_len, message_str, output, 1000 ) == {result} );
- if( {result} == 0 )
+ TEST_ASSERT( rsa_pkcs1_decrypt( &ctx, RSA_PRIVATE, &output_len, message_str, output, 1000 ) == 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
-pkcs1_rsassa_pss_sign:#mod:#radix_P:input_P:#radix_Q:input_Q:#radix_N:input_N:#radix_E:input_E:#digest:#hash:message_hex_string:salt:result_hex_str:#result
+/* BEGIN_CASE */
+void pkcs1_rsassa_pss_sign( 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 digest, int hash,
+ char *message_hex_string, char *salt,
+ char *result_hex_str, int result )
{
unsigned char message_str[1000];
unsigned char hash_result[1000];
@@ -115,22 +127,22 @@
size_t msg_len;
rnd_buf_info info;
- info.length = unhexify( rnd_buf, {salt} );
+ info.length = unhexify( rnd_buf, salt );
info.buf = rnd_buf;
mpi_init( &P1 ); mpi_init( &Q1 ); mpi_init( &H ); mpi_init( &G );
- rsa_init( &ctx, RSA_PKCS_V21, {hash} );
+ rsa_init( &ctx, RSA_PKCS_V21, hash );
memset( message_str, 0x00, 1000 );
memset( hash_result, 0x00, 1000 );
memset( output, 0x00, 1000 );
memset( output_str, 0x00, 1000 );
- ctx.len = {mod} / 8 + ( ( {mod} % 8 ) ? 1 : 0 );
- 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 + ( ( mod % 8 ) ? 1 : 0 );
+ 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 );
@@ -143,26 +155,29 @@
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, &rnd_buffer_rand, &info, RSA_PRIVATE, {digest}, 0, hash_result, output ) == {result} );
- if( {result} == 0 )
+ TEST_ASSERT( rsa_pkcs1_sign( &ctx, &rnd_buffer_rand, &info, 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
-pkcs1_rsassa_pss_verify:#mod:#radix_N:input_N:#radix_E:input_E:#digest:#hash:message_hex_string:salt:result_hex_str:#result
+/* BEGIN_CASE */
+void pkcs1_rsassa_pss_verify( int mod, int radix_N, char *input_N, int radix_E,
+ char *input_E, int digest, int hash,
+ char *message_hex_string, char *salt,
+ char *result_hex_str, int result )
{
unsigned char message_str[1000];
unsigned char hash_result[1000];
@@ -171,25 +186,25 @@
size_t msg_len;
((void) salt);
- rsa_init( &ctx, RSA_PKCS_V21, {hash} );
+ rsa_init( &ctx, RSA_PKCS_V21, hash );
memset( message_str, 0x00, 1000 );
memset( hash_result, 0x00, 1000 );
memset( result_str, 0x00, 1000 );
- ctx.len = {mod} / 8 + ( ( {mod} % 8 ) ? 1 : 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 + ( ( mod % 8 ) ? 1 : 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( 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 */