cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-14 01:25:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pass associated data split as check_multipart argument.

Browse Source 
Signed-off-by: Mateusz Starzyk <mateusz.starzyk@mobica.com>
This commit is contained in:
Mateusz Starzyk 2021-06-15 15:29:48 +02:00
parent 3d0bbeef0c
commit af4ecddd4f
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/suites/test_suite_gcm.function
View File

@ -11,12 +11,12 @@ static int check_multipart( mbedtls_gcm_context *ctx,
const data_t *input, const data_t *input,
const data_t *expected_output, const data_t *expected_output,
const data_t *tag, const data_t *tag,
size_t n1 ) size_t n1,
size_t n1_add)
{ {
int ok = 0; int ok = 0;
uint8_t *output = NULL; uint8_t *output = NULL;
size_t n2 = input->len - n1; size_t n2 = input->len - n1;
size_t n1_add = n1 < add->len ? add->len - n1 : add->len;
size_t n2_add = add->len - n1_add; size_t n2_add = add->len - n1_add;
size_t olen; size_t olen;
@ -105,6 +105,7 @@ void gcm_encrypt_and_tag( int cipher_id, data_t * key_str,
mbedtls_gcm_context ctx; mbedtls_gcm_context ctx;
size_t tag_len = tag_len_bits / 8; size_t tag_len = tag_len_bits / 8;
size_t n1; size_t n1;
size_t n1_add;
mbedtls_gcm_init( &ctx ); mbedtls_gcm_init( &ctx );
@ -123,13 +124,18 @@ void gcm_encrypt_and_tag( int cipher_id, data_t * key_str,
for( n1 = 0; n1 <= src_str->len; n1 += 1 ) for( n1 = 0; n1 <= src_str->len; n1 += 1 )
{ {
mbedtls_test_set_step( n1 ); mbedtls_test_set_step( n1 );
for( n1_add = 0; n1_add <= add_str->len; n1_add += 1 )
{
mbedtls_test_set_step( n1_add );
if( !check_multipart( &ctx, MBEDTLS_GCM_ENCRYPT, if( !check_multipart( &ctx, MBEDTLS_GCM_ENCRYPT,
iv_str, add_str, src_str, iv_str, add_str, src_str,
dst, tag, dst, tag,
n1 ) ) n1, n1_add ) )
goto exit; goto exit;
} }
} }
}
exit: exit:
mbedtls_gcm_free( &ctx ); mbedtls_gcm_free( &ctx );
@ -148,6 +154,7 @@ void gcm_decrypt_and_verify( int cipher_id, data_t * key_str,
int ret; int ret;
size_t tag_len = tag_len_bits / 8; size_t tag_len = tag_len_bits / 8;
size_t n1; size_t n1;
size_t n1_add;
mbedtls_gcm_init( &ctx ); mbedtls_gcm_init( &ctx );
@ -171,14 +178,18 @@ void gcm_decrypt_and_verify( int cipher_id, data_t * key_str,
for( n1 = 0; n1 <= src_str->len; n1 += 1 ) for( n1 = 0; n1 <= src_str->len; n1 += 1 )
{ {
mbedtls_test_set_step( n1 ); mbedtls_test_set_step( n1 );
for( n1_add = 0; n1_add <= add_str->len; n1_add += 1 )
{
mbedtls_test_set_step( n1_add );
if( !check_multipart( &ctx, MBEDTLS_GCM_DECRYPT, if( !check_multipart( &ctx, MBEDTLS_GCM_DECRYPT,
iv_str, add_str, src_str, iv_str, add_str, src_str,
pt_result, tag_str, pt_result, tag_str,
n1 ) ) n1, n1_add ) )
goto exit; goto exit;
} }
} }
} }
}
exit: exit:
mbedtls_gcm_free( &ctx ); mbedtls_gcm_free( &ctx );