commit dbd443dca61b5d47722615108b2465c7942bcee3
author Paul Bakker <p.j.bakker@polarssl.org> Fri Aug 16 13:38:47 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Fri Aug 16 13:51:37 2013 +0200
tree f17459cfcc3adf40ed49f66ce04921c7b474db6a
parent 1934318dce170587bada706089ad1016c7614f92

Adapted .function files and .data files to new test framework

Changes include:
 - Integers marked with '#' in the .function files.
 - Strings should have "" in .data files.
 - String comparison instead of preprocessor-like replace for e.g. '=='
 - Params and variables cannot have the same name in .function files

tests/suites/test_suite_des.function

diff --git a/tests/suites/test_suite_des.function b/tests/suites/test_suite_des.function
index be238d4..7e1a993 100644
--- a/tests/suites/test_suite_des.function
+++ b/tests/suites/test_suite_des.function
@@ -57,7 +57,7 @@
 END_CASE
 
 BEGIN_CASE
-des_encrypt_cbc:hex_key_string:hex_iv_string:hex_src_string:hex_dst_string:cbc_result
+des_encrypt_cbc:hex_key_string:hex_iv_string:hex_src_string:hex_dst_string:#cbc_result
 {
     unsigned char key_str[100];
     unsigned char iv_str[100];
@@ -89,7 +89,7 @@
 END_CASE
 
 BEGIN_CASE
-des_decrypt_cbc:hex_key_string:hex_iv_string:hex_src_string:hex_dst_string:cbc_result
+des_decrypt_cbc:hex_key_string:hex_iv_string:hex_src_string:hex_dst_string:#cbc_result
 {
     unsigned char key_str[100];
     unsigned char iv_str[100];
@@ -121,7 +121,7 @@
 END_CASE
 
 BEGIN_CASE
-des3_encrypt_ecb:key_count:hex_key_string:hex_src_string:hex_dst_string
+des3_encrypt_ecb:#key_count:hex_key_string:hex_src_string:hex_dst_string
 {
     unsigned char key_str[100];
     unsigned char src_str[100];
@@ -152,7 +152,7 @@
 END_CASE
 
 BEGIN_CASE
-des3_decrypt_ecb:key_count:hex_key_string:hex_src_string:hex_dst_string
+des3_decrypt_ecb:#key_count:hex_key_string:hex_src_string:hex_dst_string
 {
     unsigned char key_str[100];
     unsigned char src_str[100];
@@ -183,7 +183,7 @@
 END_CASE
 
 BEGIN_CASE
-des3_encrypt_cbc:key_count:hex_key_string:hex_iv_string:hex_src_string:hex_dst_string:cbc_result
+des3_encrypt_cbc:#key_count:hex_key_string:hex_iv_string:hex_src_string:hex_dst_string:#cbc_result
 {
     unsigned char key_str[100];
     unsigned char iv_str[100];
@@ -222,7 +222,7 @@
 END_CASE
 
 BEGIN_CASE
-des3_decrypt_cbc:key_count:hex_key_string:hex_iv_string:hex_src_string:hex_dst_string:cbc_result
+des3_decrypt_cbc:#key_count:hex_key_string:hex_iv_string:hex_src_string:hex_dst_string:#cbc_result
 {
     unsigned char key_str[100];
     unsigned char iv_str[100];