Intermediate hexify out change
diff --git a/tests/suites/test_suite_gcm.function b/tests/suites/test_suite_gcm.function
index 3d0830e..782a896 100644
--- a/tests/suites/test_suite_gcm.function
+++ b/tests/suites/test_suite_gcm.function
@@ -51,49 +51,33 @@
/* END_CASE */
/* BEGIN_CASE */
-void gcm_encrypt_and_tag( int cipher_id,
- char *hex_key_string, char *hex_src_string,
- char *hex_iv_string, char *hex_add_string,
- char *hex_dst_string, int tag_len_bits,
- char *hex_tag_string, int init_result )
+void gcm_encrypt_and_tag( int cipher_id, uint8_t * key_str, uint32_t key_len,
+ uint8_t * src_str, uint32_t pt_len,
+ uint8_t * iv_str, uint32_t iv_len,
+ uint8_t * add_str, uint32_t add_len,
+ uint8_t * hex_dst_string,
+ uint32_t hex_dst_string_len, int tag_len_bits,
+ uint8_t * hex_tag_string,
+ uint32_t hex_tag_string_len, int init_result )
{
- unsigned char key_str[128];
- unsigned char src_str[128];
- unsigned char dst_str[257];
- unsigned char iv_str[128];
- unsigned char add_str[128];
- unsigned char tag_str[128];
unsigned char output[128];
unsigned char tag_output[16];
mbedtls_gcm_context ctx;
- unsigned int key_len;
- size_t pt_len, iv_len, add_len, tag_len = tag_len_bits / 8;
+ size_t tag_len = tag_len_bits / 8;
mbedtls_gcm_init( &ctx );
- memset(key_str, 0x00, 128);
- memset(src_str, 0x00, 128);
- memset(dst_str, 0x00, 257);
- memset(iv_str, 0x00, 128);
- memset(add_str, 0x00, 128);
- memset(tag_str, 0x00, 128);
memset(output, 0x00, 128);
memset(tag_output, 0x00, 16);
- key_len = unhexify( key_str, hex_key_string );
- pt_len = unhexify( src_str, hex_src_string );
- iv_len = unhexify( iv_str, hex_iv_string );
- add_len = unhexify( add_str, hex_add_string );
TEST_ASSERT( mbedtls_gcm_setkey( &ctx, cipher_id, key_str, key_len * 8 ) == init_result );
if( init_result == 0 )
{
TEST_ASSERT( mbedtls_gcm_crypt_and_tag( &ctx, MBEDTLS_GCM_ENCRYPT, pt_len, iv_str, iv_len, add_str, add_len, src_str, output, tag_len, tag_output ) == 0 );
- hexify( dst_str, output, pt_len );
- hexify( tag_str, tag_output, tag_len );
- TEST_ASSERT( strcmp( (char *) dst_str, hex_dst_string ) == 0 );
- TEST_ASSERT( strcmp( (char *) tag_str, hex_tag_string ) == 0 );
+ TEST_ASSERT( hexcmp( output, hex_dst_string, pt_len, hex_dst_string_len ) == 0 );
+ TEST_ASSERT( hexcmp( tag_output, hex_tag_string, tag_len, hex_tag_string_len ) == 0 );
}
exit:
@@ -102,39 +86,24 @@
/* END_CASE */
/* BEGIN_CASE */
-void gcm_decrypt_and_verify( int cipher_id,
- char *hex_key_string, char *hex_src_string,
- char *hex_iv_string, char *hex_add_string,
- int tag_len_bits, char *hex_tag_string,
- char *pt_result, int init_result )
+void gcm_decrypt_and_verify( int cipher_id, uint8_t * key_str,
+ uint32_t key_len, uint8_t * src_str,
+ uint32_t pt_len, uint8_t * iv_str,
+ uint32_t iv_len, uint8_t * add_str,
+ uint32_t add_len, int tag_len_bits,
+ uint8_t * tag_str, uint32_t tag_str_len,
+ uint8_t * pt_result, uint32_t pt_result_len,
+ int init_result )
{
- unsigned char key_str[128];
- unsigned char src_str[128];
- unsigned char dst_str[257];
- unsigned char iv_str[128];
- unsigned char add_str[128];
- unsigned char tag_str[128];
unsigned char output[128];
mbedtls_gcm_context ctx;
- unsigned int key_len;
- size_t pt_len, iv_len, add_len, tag_len = tag_len_bits / 8;
int ret;
+ size_t tag_len = tag_len_bits / 8;
mbedtls_gcm_init( &ctx );
- memset(key_str, 0x00, 128);
- memset(src_str, 0x00, 128);
- memset(dst_str, 0x00, 257);
- memset(iv_str, 0x00, 128);
- memset(add_str, 0x00, 128);
- memset(tag_str, 0x00, 128);
memset(output, 0x00, 128);
- key_len = unhexify( key_str, hex_key_string );
- pt_len = unhexify( src_str, hex_src_string );
- iv_len = unhexify( iv_str, hex_iv_string );
- add_len = unhexify( add_str, hex_add_string );
- unhexify( tag_str, hex_tag_string );
TEST_ASSERT( mbedtls_gcm_setkey( &ctx, cipher_id, key_str, key_len * 8 ) == init_result );
if( init_result == 0 )
@@ -148,9 +117,8 @@
else
{
TEST_ASSERT( ret == 0 );
- hexify( dst_str, output, pt_len );
- TEST_ASSERT( strcmp( (char *) dst_str, pt_result ) == 0 );
+ TEST_ASSERT( hexcmp( output, pt_result, pt_len, pt_result_len ) == 0 );
}
}
@@ -160,7 +128,7 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_SELF_TEST */
-void gcm_selftest()
+void gcm_selftest( )
{
TEST_ASSERT( mbedtls_gcm_self_test( 1 ) == 0 );
}