Combine hex parameters in a struct
diff --git a/tests/suites/test_suite_aes.function b/tests/suites/test_suite_aes.function
index ad65a1b..a0f1b13 100644
--- a/tests/suites/test_suite_aes.function
+++ b/tests/suites/test_suite_aes.function
@@ -8,9 +8,8 @@
*/
/* BEGIN_CASE */
-void aes_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 aes_encrypt_ecb( HexParam_t * key_str, HexParam_t * src_str,
+ HexParam_t * hex_dst_string, int setkey_result )
{
unsigned char output[100];
mbedtls_aes_context ctx;
@@ -19,12 +18,12 @@
mbedtls_aes_init( &ctx );
- TEST_ASSERT( mbedtls_aes_setkey_enc( &ctx, key_str, key_len * 8 ) == setkey_result );
+ TEST_ASSERT( mbedtls_aes_setkey_enc( &ctx, key_str->x, key_str->len * 8 ) == setkey_result );
if( setkey_result == 0 )
{
- TEST_ASSERT( mbedtls_aes_crypt_ecb( &ctx, MBEDTLS_AES_ENCRYPT, src_str, output ) == 0 );
+ TEST_ASSERT( mbedtls_aes_crypt_ecb( &ctx, MBEDTLS_AES_ENCRYPT, src_str->x, output ) == 0 );
- TEST_ASSERT( hexcmp( output, hex_dst_string, 16, hex_dst_string_len ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string->x, 16, hex_dst_string->len ) == 0 );
}
exit:
@@ -33,9 +32,8 @@
/* END_CASE */
/* BEGIN_CASE */
-void aes_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 aes_decrypt_ecb( HexParam_t * key_str, HexParam_t * src_str,
+ HexParam_t * hex_dst_string, int setkey_result )
{
unsigned char output[100];
mbedtls_aes_context ctx;
@@ -44,12 +42,12 @@
mbedtls_aes_init( &ctx );
- TEST_ASSERT( mbedtls_aes_setkey_dec( &ctx, key_str, key_len * 8 ) == setkey_result );
+ TEST_ASSERT( mbedtls_aes_setkey_dec( &ctx, key_str->x, key_str->len * 8 ) == setkey_result );
if( setkey_result == 0 )
{
- TEST_ASSERT( mbedtls_aes_crypt_ecb( &ctx, MBEDTLS_AES_DECRYPT, src_str, output ) == 0 );
+ TEST_ASSERT( mbedtls_aes_crypt_ecb( &ctx, MBEDTLS_AES_DECRYPT, src_str->x, output ) == 0 );
- TEST_ASSERT( hexcmp( output, hex_dst_string, 16, hex_dst_string_len ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string->x, 16, hex_dst_string->len ) == 0 );
}
exit:
@@ -58,10 +56,9 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CBC */
-void aes_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 aes_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_aes_context ctx;
@@ -70,12 +67,12 @@
mbedtls_aes_init( &ctx );
- mbedtls_aes_setkey_enc( &ctx, key_str, key_len * 8 );
- TEST_ASSERT( mbedtls_aes_crypt_cbc( &ctx, MBEDTLS_AES_ENCRYPT, data_len, iv_str, src_str, output ) == cbc_result );
+ mbedtls_aes_setkey_enc( &ctx, key_str->x, key_str->len * 8 );
+ TEST_ASSERT( mbedtls_aes_crypt_cbc( &ctx, MBEDTLS_AES_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:
@@ -84,10 +81,9 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CBC */
-void aes_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 aes_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_aes_context ctx;
@@ -96,12 +92,12 @@
mbedtls_aes_init( &ctx );
- mbedtls_aes_setkey_dec( &ctx, key_str, key_len * 8 );
- TEST_ASSERT( mbedtls_aes_crypt_cbc( &ctx, MBEDTLS_AES_DECRYPT, data_len, iv_str, src_str, output ) == cbc_result );
+ mbedtls_aes_setkey_dec( &ctx, key_str->x, key_str->len * 8 );
+ TEST_ASSERT( mbedtls_aes_crypt_cbc( &ctx, MBEDTLS_AES_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:
@@ -234,11 +230,8 @@
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CFB */
-void aes_encrypt_cfb128( uint8_t * key_str, uint32_t key_len,
- uint8_t * iv_str, uint32_t iv_str_len,
- uint8_t * src_str, uint32_t src_str_len,
- uint8_t * hex_dst_string, uint32_t hex_dst_string_len
- )
+void aes_encrypt_cfb128( HexParam_t * key_str, HexParam_t * iv_str,
+ HexParam_t * src_str, HexParam_t * hex_dst_string )
{
unsigned char output[100];
mbedtls_aes_context ctx;
@@ -248,10 +241,10 @@
mbedtls_aes_init( &ctx );
- mbedtls_aes_setkey_enc( &ctx, key_str, key_len * 8 );
- TEST_ASSERT( mbedtls_aes_crypt_cfb128( &ctx, MBEDTLS_AES_ENCRYPT, 16, &iv_offset, iv_str, src_str, output ) == 0 );
+ mbedtls_aes_setkey_enc( &ctx, key_str->x, key_str->len * 8 );
+ TEST_ASSERT( mbedtls_aes_crypt_cfb128( &ctx, MBEDTLS_AES_ENCRYPT, 16, &iv_offset, iv_str->x, src_str->x, output ) == 0 );
- TEST_ASSERT( hexcmp( output, hex_dst_string, 16, hex_dst_string_len ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string->x, 16, hex_dst_string->len ) == 0 );
exit:
mbedtls_aes_free( &ctx );
@@ -259,11 +252,8 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CFB */
-void aes_decrypt_cfb128( uint8_t * key_str, uint32_t key_len,
- uint8_t * iv_str, uint32_t iv_str_len,
- uint8_t * src_str, uint32_t src_str_len,
- uint8_t * hex_dst_string, uint32_t hex_dst_string_len
- )
+void aes_decrypt_cfb128( HexParam_t * key_str, HexParam_t * iv_str,
+ HexParam_t * src_str, HexParam_t * hex_dst_string )
{
unsigned char output[100];
mbedtls_aes_context ctx;
@@ -273,10 +263,10 @@
mbedtls_aes_init( &ctx );
- mbedtls_aes_setkey_enc( &ctx, key_str, key_len * 8 );
- TEST_ASSERT( mbedtls_aes_crypt_cfb128( &ctx, MBEDTLS_AES_DECRYPT, 16, &iv_offset, iv_str, src_str, output ) == 0 );
+ mbedtls_aes_setkey_enc( &ctx, key_str->x, key_str->len * 8 );
+ TEST_ASSERT( mbedtls_aes_crypt_cfb128( &ctx, MBEDTLS_AES_DECRYPT, 16, &iv_offset, iv_str->x, src_str->x, output ) == 0 );
- TEST_ASSERT( hexcmp( output, hex_dst_string, 16, hex_dst_string_len ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string->x, 16, hex_dst_string->len ) == 0 );
exit:
mbedtls_aes_free( &ctx );
@@ -284,10 +274,8 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CFB */
-void aes_encrypt_cfb8( 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 aes_encrypt_cfb8( HexParam_t * key_str, HexParam_t * iv_str,
+ HexParam_t * src_str, HexParam_t * hex_dst_string )
{
unsigned char output[100];
mbedtls_aes_context ctx;
@@ -296,10 +284,10 @@
mbedtls_aes_init( &ctx );
- mbedtls_aes_setkey_enc( &ctx, key_str, key_len * 8 );
- TEST_ASSERT( mbedtls_aes_crypt_cfb8( &ctx, MBEDTLS_AES_ENCRYPT, src_len, iv_str, src_str, output ) == 0 );
+ mbedtls_aes_setkey_enc( &ctx, key_str->x, key_str->len * 8 );
+ TEST_ASSERT( mbedtls_aes_crypt_cfb8( &ctx, MBEDTLS_AES_ENCRYPT, src_str->len, 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_aes_free( &ctx );
@@ -307,10 +295,8 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CFB */
-void aes_decrypt_cfb8( 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 aes_decrypt_cfb8( HexParam_t * key_str, HexParam_t * iv_str,
+ HexParam_t * src_str, HexParam_t * hex_dst_string )
{
unsigned char output[100];
mbedtls_aes_context ctx;
@@ -319,10 +305,10 @@
mbedtls_aes_init( &ctx );
- mbedtls_aes_setkey_enc( &ctx, key_str, key_len * 8 );
- TEST_ASSERT( mbedtls_aes_crypt_cfb8( &ctx, MBEDTLS_AES_DECRYPT, src_len, iv_str, src_str, output ) == 0 );
+ mbedtls_aes_setkey_enc( &ctx, key_str->x, key_str->len * 8 );
+ TEST_ASSERT( mbedtls_aes_crypt_cfb8( &ctx, MBEDTLS_AES_DECRYPT, src_str->len, 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_aes_free( &ctx );