Intermediate hexify out change
diff --git a/tests/suites/test_suite_camellia.function b/tests/suites/test_suite_camellia.function
index 9df6482..96d25a2 100644
--- a/tests/suites/test_suite_camellia.function
+++ b/tests/suites/test_suite_camellia.function
@@ -8,32 +8,24 @@
*/
/* BEGIN_CASE */
-void camellia_encrypt_ecb( char *hex_key_string, char *hex_src_string,
- char *hex_dst_string, int setkey_result )
+void camellia_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 )
{
- unsigned char key_str[100];
- unsigned char src_str[100];
- unsigned char dst_str[100];
unsigned char output[100];
mbedtls_camellia_context ctx;
- int key_len;
- memset(key_str, 0x00, 100);
- memset(src_str, 0x00, 100);
- memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
mbedtls_camellia_init( &ctx );
- key_len = unhexify( key_str, hex_key_string );
- unhexify( src_str, hex_src_string );
TEST_ASSERT( mbedtls_camellia_setkey_enc( &ctx, key_str, key_len * 8 ) == setkey_result );
if( setkey_result == 0 )
{
TEST_ASSERT( mbedtls_camellia_crypt_ecb( &ctx, MBEDTLS_CAMELLIA_ENCRYPT, src_str, output ) == 0 );
- hexify( dst_str, output, 16 );
- TEST_ASSERT( strcasecmp( (char *) dst_str, hex_dst_string ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string, 16, hex_dst_string_len ) == 0 );
}
exit:
@@ -42,32 +34,24 @@
/* END_CASE */
/* BEGIN_CASE */
-void camellia_decrypt_ecb( char *hex_key_string, char *hex_src_string,
- char *hex_dst_string, int setkey_result )
+void camellia_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 )
{
- unsigned char key_str[100];
- unsigned char src_str[100];
- unsigned char dst_str[100];
unsigned char output[100];
mbedtls_camellia_context ctx;
- int key_len;
- memset(key_str, 0x00, 100);
- memset(src_str, 0x00, 100);
- memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
mbedtls_camellia_init( &ctx );
- key_len = unhexify( key_str, hex_key_string );
- unhexify( src_str, hex_src_string );
TEST_ASSERT( mbedtls_camellia_setkey_dec( &ctx, key_str, key_len * 8 ) == setkey_result );
if( setkey_result == 0 )
{
TEST_ASSERT( mbedtls_camellia_crypt_ecb( &ctx, MBEDTLS_CAMELLIA_DECRYPT, src_str, output ) == 0 );
- hexify( dst_str, output, 16 );
- TEST_ASSERT( strcasecmp( (char *) dst_str, hex_dst_string ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string, 16, hex_dst_string_len ) == 0 );
}
exit:
@@ -76,36 +60,25 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CBC */
-void camellia_encrypt_cbc( char *hex_key_string, char *hex_iv_string,
- char *hex_src_string, char *hex_dst_string,
- int cbc_result )
+void camellia_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 )
{
- unsigned char key_str[100];
- unsigned char iv_str[100];
- unsigned char src_str[100];
- unsigned char dst_str[100];
unsigned char output[100];
mbedtls_camellia_context ctx;
- int key_len, data_len;
- memset(key_str, 0x00, 100);
- memset(iv_str, 0x00, 100);
- memset(src_str, 0x00, 100);
- memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
mbedtls_camellia_init( &ctx );
- key_len = unhexify( key_str, hex_key_string );
- unhexify( iv_str, hex_iv_string );
- data_len = unhexify( src_str, hex_src_string );
mbedtls_camellia_setkey_enc( &ctx, key_str, key_len * 8 );
TEST_ASSERT( mbedtls_camellia_crypt_cbc( &ctx, MBEDTLS_CAMELLIA_ENCRYPT, data_len, iv_str, src_str, output) == cbc_result );
if( cbc_result == 0 )
{
- hexify( dst_str, output, data_len );
- TEST_ASSERT( strcasecmp( (char *) dst_str, hex_dst_string ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string, data_len, hex_dst_string_len ) == 0 );
}
exit:
@@ -114,36 +87,25 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CBC */
-void camellia_decrypt_cbc( char *hex_key_string, char *hex_iv_string,
- char *hex_src_string, char *hex_dst_string,
- int cbc_result )
+void camellia_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 )
{
- unsigned char key_str[100];
- unsigned char iv_str[100];
- unsigned char src_str[100];
- unsigned char dst_str[100];
unsigned char output[100];
mbedtls_camellia_context ctx;
- int key_len, data_len;
- memset(key_str, 0x00, 100);
- memset(iv_str, 0x00, 100);
- memset(src_str, 0x00, 100);
- memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
mbedtls_camellia_init( &ctx );
- key_len = unhexify( key_str, hex_key_string );
- unhexify( iv_str, hex_iv_string );
- data_len = unhexify( src_str, hex_src_string );
mbedtls_camellia_setkey_dec( &ctx, key_str, key_len * 8 );
TEST_ASSERT( mbedtls_camellia_crypt_cbc( &ctx, MBEDTLS_CAMELLIA_DECRYPT, data_len, iv_str, src_str, output ) == cbc_result );
if( cbc_result == 0 )
{
- hexify( dst_str, output, data_len );
- TEST_ASSERT( strcasecmp( (char *) dst_str, hex_dst_string ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string, data_len, hex_dst_string_len ) == 0 );
}
exit:
@@ -152,34 +114,24 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CFB */
-void camellia_encrypt_cfb128( char *hex_key_string, char *hex_iv_string,
- char *hex_src_string, char *hex_dst_string )
+void camellia_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 )
{
- unsigned char key_str[100];
- unsigned char iv_str[100];
- unsigned char src_str[100];
- unsigned char dst_str[100];
unsigned char output[100];
mbedtls_camellia_context ctx;
size_t iv_offset = 0;
- int key_len;
- memset(key_str, 0x00, 100);
- memset(iv_str, 0x00, 100);
- memset(src_str, 0x00, 100);
- memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
mbedtls_camellia_init( &ctx );
- key_len = unhexify( key_str, hex_key_string );
- unhexify( iv_str, hex_iv_string );
- unhexify( src_str, hex_src_string );
mbedtls_camellia_setkey_enc( &ctx, key_str, key_len * 8 );
TEST_ASSERT( mbedtls_camellia_crypt_cfb128( &ctx, MBEDTLS_CAMELLIA_ENCRYPT, 16, &iv_offset, iv_str, src_str, output ) == 0 );
- hexify( dst_str, output, 16 );
- TEST_ASSERT( strcasecmp( (char *) dst_str, hex_dst_string ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string, 16, hex_dst_string_len ) == 0 );
exit:
mbedtls_camellia_free( &ctx );
@@ -187,34 +139,24 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CFB */
-void camellia_decrypt_cfb128( char *hex_key_string, char *hex_iv_string,
- char *hex_src_string, char *hex_dst_string )
+void camellia_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 )
{
- unsigned char key_str[100];
- unsigned char iv_str[100];
- unsigned char src_str[100];
- unsigned char dst_str[100];
unsigned char output[100];
mbedtls_camellia_context ctx;
size_t iv_offset = 0;
- int key_len;
- memset(key_str, 0x00, 100);
- memset(iv_str, 0x00, 100);
- memset(src_str, 0x00, 100);
- memset(dst_str, 0x00, 100);
memset(output, 0x00, 100);
mbedtls_camellia_init( &ctx );
- key_len = unhexify( key_str, hex_key_string );
- unhexify( iv_str, hex_iv_string );
- unhexify( src_str, hex_src_string );
mbedtls_camellia_setkey_enc( &ctx, key_str, key_len * 8 );
TEST_ASSERT( mbedtls_camellia_crypt_cfb128( &ctx, MBEDTLS_CAMELLIA_DECRYPT, 16, &iv_offset, iv_str, src_str, output ) == 0 );
- hexify( dst_str, output, 16 );
- TEST_ASSERT( strcasecmp( (char *) dst_str, hex_dst_string ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string, 16, hex_dst_string_len ) == 0 );
exit:
mbedtls_camellia_free( &ctx );
@@ -222,7 +164,7 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_SELF_TEST */
-void camellia_selftest()
+void camellia_selftest( )
{
TEST_ASSERT( mbedtls_camellia_self_test( 1 ) == 0 );
}