Combine hex parameters in a struct
diff --git a/tests/suites/test_suite_blowfish.function b/tests/suites/test_suite_blowfish.function
index 55ab619..d88eac4 100644
--- a/tests/suites/test_suite_blowfish.function
+++ b/tests/suites/test_suite_blowfish.function
@@ -8,10 +8,8 @@
*/
/* BEGIN_CASE */
-void blowfish_encrypt_ecb( uint8_t * key_str, uint32_t key_len,
- uint8_t * src_str, uint32_t src_str_len,
- uint8_t * hex_dst_string,
- uint32_t hex_dst_string_len, int setkey_result )
+void blowfish_encrypt_ecb( HexParam_t * key_str, HexParam_t * src_str,
+ HexParam_t * hex_dst_string, int setkey_result )
{
unsigned char output[100];
mbedtls_blowfish_context ctx;
@@ -20,12 +18,12 @@
mbedtls_blowfish_init( &ctx );
- TEST_ASSERT( mbedtls_blowfish_setkey( &ctx, key_str, key_len * 8 ) == setkey_result );
+ TEST_ASSERT( mbedtls_blowfish_setkey( &ctx, key_str->x, key_str->len * 8 ) == setkey_result );
if( setkey_result == 0 )
{
- TEST_ASSERT( mbedtls_blowfish_crypt_ecb( &ctx, MBEDTLS_BLOWFISH_ENCRYPT, src_str, output ) == 0 );
+ TEST_ASSERT( mbedtls_blowfish_crypt_ecb( &ctx, MBEDTLS_BLOWFISH_ENCRYPT, src_str->x, output ) == 0 );
- TEST_ASSERT( hexcmp( output, hex_dst_string, 8, hex_dst_string_len ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string->x, 8, hex_dst_string->len ) == 0 );
}
exit:
@@ -34,10 +32,8 @@
/* END_CASE */
/* BEGIN_CASE */
-void blowfish_decrypt_ecb( uint8_t * key_str, uint32_t key_len,
- uint8_t * src_str, uint32_t src_str_len,
- uint8_t * hex_dst_string,
- uint32_t hex_dst_string_len, int setkey_result )
+void blowfish_decrypt_ecb( HexParam_t * key_str, HexParam_t * src_str,
+ HexParam_t * hex_dst_string, int setkey_result )
{
unsigned char output[100];
mbedtls_blowfish_context ctx;
@@ -46,12 +42,12 @@
mbedtls_blowfish_init( &ctx );
- TEST_ASSERT( mbedtls_blowfish_setkey( &ctx, key_str, key_len * 8 ) == setkey_result );
+ TEST_ASSERT( mbedtls_blowfish_setkey( &ctx, key_str->x, key_str->len * 8 ) == setkey_result );
if( setkey_result == 0 )
{
- TEST_ASSERT( mbedtls_blowfish_crypt_ecb( &ctx, MBEDTLS_BLOWFISH_DECRYPT, src_str, output ) == 0 );
+ TEST_ASSERT( mbedtls_blowfish_crypt_ecb( &ctx, MBEDTLS_BLOWFISH_DECRYPT, src_str->x, output ) == 0 );
- TEST_ASSERT( hexcmp( output, hex_dst_string, 8, hex_dst_string_len ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string->x, 8, hex_dst_string->len ) == 0 );
}
exit:
@@ -60,11 +56,9 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CBC */
-void blowfish_encrypt_cbc( uint8_t * key_str, uint32_t key_len,
- uint8_t * iv_str, uint32_t iv_str_len,
- uint8_t * src_str, uint32_t data_len,
- uint8_t * hex_dst_string,
- uint32_t hex_dst_string_len, int cbc_result )
+void blowfish_encrypt_cbc( HexParam_t * key_str, HexParam_t * iv_str,
+ HexParam_t * src_str, HexParam_t * hex_dst_string,
+ int cbc_result )
{
unsigned char output[100];
mbedtls_blowfish_context ctx;
@@ -73,13 +67,13 @@
mbedtls_blowfish_init( &ctx );
- mbedtls_blowfish_setkey( &ctx, key_str, key_len * 8 );
+ mbedtls_blowfish_setkey( &ctx, key_str->x, key_str->len * 8 );
- TEST_ASSERT( mbedtls_blowfish_crypt_cbc( &ctx, MBEDTLS_BLOWFISH_ENCRYPT, data_len , iv_str, src_str, output ) == cbc_result );
+ TEST_ASSERT( mbedtls_blowfish_crypt_cbc( &ctx, MBEDTLS_BLOWFISH_ENCRYPT, src_str->len , iv_str->x, src_str->x, output ) == cbc_result );
if( cbc_result == 0 )
{
- TEST_ASSERT( hexcmp( output, hex_dst_string, data_len, hex_dst_string_len ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string->x, src_str->len, hex_dst_string->len ) == 0 );
}
exit:
@@ -88,11 +82,9 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CBC */
-void blowfish_decrypt_cbc( uint8_t * key_str, uint32_t key_len,
- uint8_t * iv_str, uint32_t iv_str_len,
- uint8_t * src_str, uint32_t data_len,
- uint8_t * hex_dst_string,
- uint32_t hex_dst_string_len, int cbc_result )
+void blowfish_decrypt_cbc( HexParam_t * key_str, HexParam_t * iv_str,
+ HexParam_t * src_str, HexParam_t * hex_dst_string,
+ int cbc_result )
{
unsigned char output[100];
mbedtls_blowfish_context ctx;
@@ -101,12 +93,12 @@
mbedtls_blowfish_init( &ctx );
- mbedtls_blowfish_setkey( &ctx, key_str, key_len * 8 );
- TEST_ASSERT( mbedtls_blowfish_crypt_cbc( &ctx, MBEDTLS_BLOWFISH_DECRYPT, data_len , iv_str, src_str, output ) == cbc_result );
+ mbedtls_blowfish_setkey( &ctx, key_str->x, key_str->len * 8 );
+ TEST_ASSERT( mbedtls_blowfish_crypt_cbc( &ctx, MBEDTLS_BLOWFISH_DECRYPT, src_str->len , iv_str->x, src_str->x, output ) == cbc_result );
if( cbc_result == 0)
{
- TEST_ASSERT( hexcmp( output, hex_dst_string, data_len, hex_dst_string_len ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string->x, src_str->len, hex_dst_string->len ) == 0 );
}
exit:
@@ -115,11 +107,9 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CFB */
-void blowfish_encrypt_cfb64( uint8_t * key_str, uint32_t key_len,
- uint8_t * iv_str, uint32_t iv_str_len,
- uint8_t * src_str, uint32_t src_len,
- uint8_t * hex_dst_string,
- uint32_t hex_dst_string_len )
+void blowfish_encrypt_cfb64( HexParam_t * key_str, HexParam_t * iv_str,
+ HexParam_t * src_str, HexParam_t * hex_dst_string
+ )
{
unsigned char output[100];
mbedtls_blowfish_context ctx;
@@ -129,10 +119,10 @@
mbedtls_blowfish_init( &ctx );
- mbedtls_blowfish_setkey( &ctx, key_str, key_len * 8 );
- TEST_ASSERT( mbedtls_blowfish_crypt_cfb64( &ctx, MBEDTLS_BLOWFISH_ENCRYPT, src_len, &iv_offset, iv_str, src_str, output ) == 0 );
+ mbedtls_blowfish_setkey( &ctx, key_str->x, key_str->len * 8 );
+ TEST_ASSERT( mbedtls_blowfish_crypt_cfb64( &ctx, MBEDTLS_BLOWFISH_ENCRYPT, src_str->len, &iv_offset, iv_str->x, src_str->x, output ) == 0 );
- TEST_ASSERT( hexcmp( output, hex_dst_string, src_len, hex_dst_string_len ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string->x, src_str->len, hex_dst_string->len ) == 0 );
exit:
mbedtls_blowfish_free( &ctx );
@@ -140,11 +130,9 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CFB */
-void blowfish_decrypt_cfb64( uint8_t * key_str, uint32_t key_len,
- uint8_t * iv_str, uint32_t iv_str_len,
- uint8_t * src_str, uint32_t src_len,
- uint8_t * hex_dst_string,
- uint32_t hex_dst_string_len )
+void blowfish_decrypt_cfb64( HexParam_t * key_str, HexParam_t * iv_str,
+ HexParam_t * src_str, HexParam_t * hex_dst_string
+ )
{
unsigned char output[100];
mbedtls_blowfish_context ctx;
@@ -154,10 +142,10 @@
mbedtls_blowfish_init( &ctx );
- mbedtls_blowfish_setkey( &ctx, key_str, key_len * 8 );
- TEST_ASSERT( mbedtls_blowfish_crypt_cfb64( &ctx, MBEDTLS_BLOWFISH_DECRYPT, src_len, &iv_offset, iv_str, src_str, output ) == 0 );
+ mbedtls_blowfish_setkey( &ctx, key_str->x, key_str->len * 8 );
+ TEST_ASSERT( mbedtls_blowfish_crypt_cfb64( &ctx, MBEDTLS_BLOWFISH_DECRYPT, src_str->len, &iv_offset, iv_str->x, src_str->x, output ) == 0 );
- TEST_ASSERT( hexcmp( output, hex_dst_string, src_len, hex_dst_string_len ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string->x, src_str->len, hex_dst_string->len ) == 0 );
exit:
mbedtls_blowfish_free( &ctx );
@@ -165,11 +153,8 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CTR */
-void blowfish_encrypt_ctr( uint8_t * key_str, uint32_t key_len,
- uint8_t * iv_str, uint32_t iv_str_len,
- uint8_t * src_str, uint32_t src_len,
- uint8_t * hex_dst_string,
- uint32_t hex_dst_string_len )
+void blowfish_encrypt_ctr( HexParam_t * key_str, HexParam_t * iv_str,
+ HexParam_t * src_str, HexParam_t * hex_dst_string )
{
unsigned char stream_str[100];
unsigned char output[100];
@@ -181,10 +166,10 @@
mbedtls_blowfish_init( &ctx );
- mbedtls_blowfish_setkey( &ctx, key_str, key_len * 8 );
- TEST_ASSERT( mbedtls_blowfish_crypt_ctr( &ctx, src_len, &iv_offset, iv_str, stream_str, src_str, output ) == 0 );
+ mbedtls_blowfish_setkey( &ctx, key_str->x, key_str->len * 8 );
+ TEST_ASSERT( mbedtls_blowfish_crypt_ctr( &ctx, src_str->len, &iv_offset, iv_str->x, stream_str, src_str->x, output ) == 0 );
- TEST_ASSERT( hexcmp( output, hex_dst_string, src_len, hex_dst_string_len ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string->x, src_str->len, hex_dst_string->len ) == 0 );
exit:
mbedtls_blowfish_free( &ctx );