Intermediate hexify out change
diff --git a/tests/suites/test_suite_xtea.function b/tests/suites/test_suite_xtea.function
index cbc714a..7da890a 100644
--- a/tests/suites/test_suite_xtea.function
+++ b/tests/suites/test_suite_xtea.function
@@ -8,121 +8,83 @@
*/
/* BEGIN_CASE */
-void xtea_encrypt_ecb( char *hex_key_string, char *hex_src_string,
- char *hex_dst_string )
+void xtea_encrypt_ecb( uint8_t * key_str, uint32_t key_str_len,
+ uint8_t * src_str, uint32_t src_str_len,
+ uint8_t * hex_dst_string, uint32_t hex_dst_string_len )
{
- unsigned char key_str[100];
- unsigned char src_str[100];
- unsigned char dst_str[100];
unsigned char output[100];
mbedtls_xtea_context ctx;
- memset(key_str, 0x00, 100);
- memset(src_str, 0x00, 100);
- memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
- unhexify( key_str, hex_key_string );
- unhexify( src_str, hex_src_string );
mbedtls_xtea_setup( &ctx, key_str );
TEST_ASSERT( mbedtls_xtea_crypt_ecb( &ctx, MBEDTLS_XTEA_ENCRYPT, src_str, output ) == 0 );
- hexify( dst_str, output, 8 );
- TEST_ASSERT( strcmp( (char *) dst_str, hex_dst_string ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string, 8, hex_dst_string_len ) == 0 );
}
/* END_CASE */
/* BEGIN_CASE */
-void xtea_decrypt_ecb( char *hex_key_string, char *hex_src_string,
- char *hex_dst_string )
+void xtea_decrypt_ecb( uint8_t * key_str, uint32_t key_str_len,
+ uint8_t * src_str, uint32_t src_str_len,
+ uint8_t * hex_dst_string, uint32_t hex_dst_string_len )
{
- unsigned char key_str[100];
- unsigned char src_str[100];
- unsigned char dst_str[100];
unsigned char output[100];
mbedtls_xtea_context ctx;
- memset(key_str, 0x00, 100);
- memset(src_str, 0x00, 100);
- memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
- unhexify( key_str, hex_key_string );
- unhexify( src_str, hex_src_string );
mbedtls_xtea_setup( &ctx, key_str );
TEST_ASSERT( mbedtls_xtea_crypt_ecb( &ctx, MBEDTLS_XTEA_DECRYPT, src_str, output ) == 0 );
- hexify( dst_str, output, 8 );
- TEST_ASSERT( strcmp( (char *) dst_str, hex_dst_string ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string, 8, hex_dst_string_len ) == 0 );
}
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CBC */
-void xtea_encrypt_cbc( char *hex_key_string, char *hex_iv_string,
- char *hex_src_string, char *hex_dst_string )
+void xtea_encrypt_cbc( uint8_t * key_str, uint32_t key_str_len,
+ uint8_t * iv_str, uint32_t iv_str_len,
+ uint8_t * src_str, uint32_t len,
+ uint8_t * hex_dst_string, uint32_t hex_dst_string_len )
{
- unsigned char key_str[100];
- unsigned char src_str[100];
- unsigned char dst_str[100];
- unsigned char iv_str[100];
unsigned char output[100];
- size_t len;
mbedtls_xtea_context ctx;
- memset(key_str, 0x00, 100);
- memset(src_str, 0x00, 100);
- memset(dst_str, 0x00, 100);
- memset(iv_str, 0x00, 100);
memset(output, 0x00, 100);
- unhexify( key_str, hex_key_string );
- unhexify( iv_str, hex_iv_string );
- len = unhexify( src_str, hex_src_string );
mbedtls_xtea_setup( &ctx, key_str );
TEST_ASSERT( mbedtls_xtea_crypt_cbc( &ctx, MBEDTLS_XTEA_ENCRYPT, len, iv_str,
src_str, output ) == 0 );
- hexify( dst_str, output, len );
- TEST_ASSERT( strcmp( (char *) dst_str, hex_dst_string ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string, len, hex_dst_string_len ) == 0 );
}
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CBC */
-void xtea_decrypt_cbc( char *hex_key_string, char *hex_iv_string,
- char *hex_src_string, char *hex_dst_string )
+void xtea_decrypt_cbc( uint8_t * key_str, uint32_t key_str_len,
+ uint8_t * iv_str, uint32_t iv_str_len,
+ uint8_t * src_str, uint32_t len,
+ uint8_t * hex_dst_string, uint32_t hex_dst_string_len )
{
- unsigned char key_str[100];
- unsigned char src_str[100];
- unsigned char dst_str[100];
- unsigned char iv_str[100];
unsigned char output[100];
- size_t len;
mbedtls_xtea_context ctx;
- memset(key_str, 0x00, 100);
- memset(src_str, 0x00, 100);
- memset(dst_str, 0x00, 100);
- memset(iv_str, 0x00, 100);
memset(output, 0x00, 100);
- unhexify( key_str, hex_key_string );
- unhexify( iv_str, hex_iv_string );
- len = unhexify( src_str, hex_src_string );
mbedtls_xtea_setup( &ctx, key_str );
TEST_ASSERT( mbedtls_xtea_crypt_cbc( &ctx, MBEDTLS_XTEA_DECRYPT, len, iv_str,
src_str, output ) == 0 );
- hexify( dst_str, output, len );
- TEST_ASSERT( strcmp( (char *) dst_str, hex_dst_string ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string, len, hex_dst_string_len ) == 0 );
}
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_SELF_TEST */
-void xtea_selftest()
+void xtea_selftest( )
{
TEST_ASSERT( mbedtls_xtea_self_test( 1 ) == 0 );
}