Converted .function file to c-like format and adapted generator code
diff --git a/tests/suites/test_suite_blowfish.function b/tests/suites/test_suite_blowfish.function
index a7e6785..6bdcb65 100644
--- a/tests/suites/test_suite_blowfish.function
+++ b/tests/suites/test_suite_blowfish.function
@@ -1,13 +1,15 @@
-BEGIN_HEADER
+/* BEGIN_HEADER */
#include "polarssl/blowfish.h"
-END_HEADER
+/* END_HEADER */
-BEGIN_DEPENDENCIES
-depends_on:POLARSSL_BLOWFISH_C
-END_DEPENDENCIES
+/* BEGIN_DEPENDENCIES
+ * depends_on:POLARSSL_BLOWFISH_C
+ * END_DEPENDENCIES
+ */
-BEGIN_CASE
-blowfish_encrypt_ecb:hex_key_string:hex_src_string:hex_dst_string:#setkey_result
+/* BEGIN_CASE */
+void blowfish_encrypt_ecb( char *hex_key_string, char *hex_src_string,
+ char *hex_dst_string, int setkey_result )
{
unsigned char key_str[100];
unsigned char src_str[100];
@@ -21,22 +23,23 @@
memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
- key_len = unhexify( key_str, {hex_key_string} );
- unhexify( src_str, {hex_src_string} );
+ key_len = unhexify( key_str, hex_key_string );
+ unhexify( src_str, hex_src_string );
- TEST_ASSERT( blowfish_setkey( &ctx, key_str, key_len * 8 ) == {setkey_result} );
- if( {setkey_result} == 0 )
+ TEST_ASSERT( blowfish_setkey( &ctx, key_str, key_len * 8 ) == setkey_result );
+ if( setkey_result == 0 )
{
TEST_ASSERT( blowfish_crypt_ecb( &ctx, BLOWFISH_ENCRYPT, src_str, output ) == 0 );
hexify( dst_str, output, 8 );
- TEST_ASSERT( strcmp( (char *) dst_str, {hex_dst_string} ) == 0 );
+ TEST_ASSERT( strcmp( (char *) dst_str, hex_dst_string ) == 0 );
}
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-blowfish_decrypt_ecb:hex_key_string:hex_src_string:hex_dst_string:#setkey_result
+/* BEGIN_CASE */
+void blowfish_decrypt_ecb( char *hex_key_string, char *hex_src_string,
+ char *hex_dst_string, int setkey_result )
{
unsigned char key_str[100];
unsigned char src_str[100];
@@ -50,22 +53,24 @@
memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
- key_len = unhexify( key_str, {hex_key_string} );
- unhexify( src_str, {hex_src_string} );
+ key_len = unhexify( key_str, hex_key_string );
+ unhexify( src_str, hex_src_string );
- TEST_ASSERT( blowfish_setkey( &ctx, key_str, key_len * 8 ) == {setkey_result} );
- if( {setkey_result} == 0 )
+ TEST_ASSERT( blowfish_setkey( &ctx, key_str, key_len * 8 ) == setkey_result );
+ if( setkey_result == 0 )
{
TEST_ASSERT( blowfish_crypt_ecb( &ctx, BLOWFISH_DECRYPT, src_str, output ) == 0 );
hexify( dst_str, output, 8 );
- TEST_ASSERT( strcmp( (char *) dst_str, {hex_dst_string} ) == 0 );
+ TEST_ASSERT( strcmp( (char *) dst_str, hex_dst_string ) == 0 );
}
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-blowfish_encrypt_cbc:hex_key_string:hex_iv_string:hex_src_string:hex_dst_string:#cbc_result
+/* BEGIN_CASE */
+void blowfish_encrypt_cbc( char *hex_key_string, char *hex_iv_string,
+ char *hex_src_string, char *hex_dst_string,
+ int cbc_result )
{
unsigned char key_str[100];
unsigned char iv_str[100];
@@ -81,24 +86,26 @@
memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
- key_len = unhexify( key_str, {hex_key_string} );
- unhexify( iv_str, {hex_iv_string} );
- data_len = unhexify( src_str, {hex_src_string} );
+ key_len = unhexify( key_str, hex_key_string );
+ unhexify( iv_str, hex_iv_string );
+ data_len = unhexify( src_str, hex_src_string );
blowfish_setkey( &ctx, key_str, key_len * 8 );
- TEST_ASSERT( blowfish_crypt_cbc( &ctx, BLOWFISH_ENCRYPT, data_len , iv_str, src_str, output ) == {cbc_result} );
- if( {cbc_result} == 0 )
+ TEST_ASSERT( blowfish_crypt_cbc( &ctx, BLOWFISH_ENCRYPT, data_len , iv_str, src_str, output ) == cbc_result );
+ if( cbc_result == 0 )
{
hexify( dst_str, output, data_len );
- TEST_ASSERT( strcmp( (char *) dst_str, {hex_dst_string} ) == 0 );
+ TEST_ASSERT( strcmp( (char *) dst_str, hex_dst_string ) == 0 );
}
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-blowfish_decrypt_cbc:hex_key_string:hex_iv_string:hex_src_string:hex_dst_string:#cbc_result
+/* BEGIN_CASE */
+void blowfish_decrypt_cbc( char *hex_key_string, char *hex_iv_string,
+ char *hex_src_string, char *hex_dst_string,
+ int cbc_result )
{
unsigned char key_str[100];
unsigned char iv_str[100];
@@ -114,23 +121,24 @@
memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
- key_len = unhexify( key_str, {hex_key_string} );
- unhexify( iv_str, {hex_iv_string} );
- data_len = unhexify( src_str, {hex_src_string} );
+ key_len = unhexify( key_str, hex_key_string );
+ unhexify( iv_str, hex_iv_string );
+ data_len = unhexify( src_str, hex_src_string );
blowfish_setkey( &ctx, key_str, key_len * 8 );
- TEST_ASSERT( blowfish_crypt_cbc( &ctx, BLOWFISH_DECRYPT, data_len , iv_str, src_str, output ) == {cbc_result} );
- if( {cbc_result} == 0)
+ TEST_ASSERT( blowfish_crypt_cbc( &ctx, BLOWFISH_DECRYPT, data_len , iv_str, src_str, output ) == cbc_result );
+ if( cbc_result == 0)
{
hexify( dst_str, output, data_len );
- TEST_ASSERT( strcmp( (char *) dst_str, {hex_dst_string} ) == 0 );
+ TEST_ASSERT( strcmp( (char *) dst_str, hex_dst_string ) == 0 );
}
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-blowfish_encrypt_cfb64:hex_key_string:hex_iv_string:hex_src_string:hex_dst_string
+/* BEGIN_CASE */
+void blowfish_encrypt_cfb64( char *hex_key_string, char *hex_iv_string,
+ char *hex_src_string, char *hex_dst_string )
{
unsigned char key_str[100];
unsigned char iv_str[100];
@@ -147,20 +155,21 @@
memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
- key_len = unhexify( key_str, {hex_key_string} );
- unhexify( iv_str, {hex_iv_string} );
- src_len = unhexify( src_str, {hex_src_string} );
+ key_len = unhexify( key_str, hex_key_string );
+ unhexify( iv_str, hex_iv_string );
+ src_len = unhexify( src_str, hex_src_string );
blowfish_setkey( &ctx, key_str, key_len * 8 );
TEST_ASSERT( blowfish_crypt_cfb64( &ctx, BLOWFISH_ENCRYPT, src_len, &iv_offset, iv_str, src_str, output ) == 0 );
hexify( dst_str, output, src_len );
- TEST_ASSERT( strcmp( (char *) dst_str, {hex_dst_string} ) == 0 );
+ TEST_ASSERT( strcmp( (char *) dst_str, hex_dst_string ) == 0 );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-blowfish_decrypt_cfb64:hex_key_string:hex_iv_string:hex_src_string:hex_dst_string
+/* BEGIN_CASE */
+void blowfish_decrypt_cfb64( char *hex_key_string, char *hex_iv_string,
+ char *hex_src_string, char *hex_dst_string )
{
unsigned char key_str[100];
unsigned char iv_str[100];
@@ -177,20 +186,21 @@
memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
- key_len = unhexify( key_str, {hex_key_string} );
- unhexify( iv_str, {hex_iv_string} );
- src_len = unhexify( src_str, {hex_src_string} );
+ key_len = unhexify( key_str, hex_key_string );
+ unhexify( iv_str, hex_iv_string );
+ src_len = unhexify( src_str, hex_src_string );
blowfish_setkey( &ctx, key_str, key_len * 8 );
TEST_ASSERT( blowfish_crypt_cfb64( &ctx, BLOWFISH_DECRYPT, src_len, &iv_offset, iv_str, src_str, output ) == 0 );
hexify( dst_str, output, src_len );
- TEST_ASSERT( strcmp( (char *) dst_str, {hex_dst_string} ) == 0 );
+ TEST_ASSERT( strcmp( (char *) dst_str, hex_dst_string ) == 0 );
}
-END_CASE
+/* END_CASE */
-BEGIN_CASE
-blowfish_encrypt_ctr:hex_key_string:hex_iv_string:hex_src_string:hex_dst_string
+/* BEGIN_CASE */
+void blowfish_encrypt_ctr( char *hex_key_string, char *hex_iv_string,
+ char *hex_src_string, char *hex_dst_string )
{
unsigned char key_str[100];
unsigned char iv_str[100];
@@ -209,14 +219,14 @@
memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
- key_len = unhexify( key_str, {hex_key_string} );
- unhexify( iv_str, {hex_iv_string} );
- src_len = unhexify( src_str, {hex_src_string} );
+ key_len = unhexify( key_str, hex_key_string );
+ unhexify( iv_str, hex_iv_string );
+ src_len = unhexify( src_str, hex_src_string );
blowfish_setkey( &ctx, key_str, key_len * 8 );
TEST_ASSERT( blowfish_crypt_ctr( &ctx, src_len, &iv_offset, iv_str, stream_str, src_str, output ) == 0 );
hexify( dst_str, output, src_len );
- TEST_ASSERT( strcmp( (char *) dst_str, {hex_dst_string} ) == 0 );
+ TEST_ASSERT( strcmp( (char *) dst_str, hex_dst_string ) == 0 );
}
-END_CASE
+/* END_CASE */