mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-31 10:20:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cipher_alg_without_iv: also test multipart decryption

Browse Source 
For multipart encrpytion, call psa_cipher_finish(). This is not actually
necessary for non-pathological implementations of ECB (the only currently
supported IV-less cipher algorithm) because it requires the input to be a
whole number of blocks and non-pathological implementations emit the output
block from update() as soon as an input block is available. But in principle
a driver could delay output and thus require a call to finish().

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2022-04-20 17:09:38 +02:00
parent 9e38f2c8fd
commit 286c314ae3
1 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
tests/suites/test_suite_psa_crypto.function
View File

@ -3312,10 +3312,9 @@ void cipher_alg_without_iv( int alg_arg, int key_type_arg, data_t *key_data,
psa_algorithm_t alg = alg_arg; psa_algorithm_t alg = alg_arg;
psa_cipher_operation_t operation = PSA_CIPHER_OPERATION_INIT; psa_cipher_operation_t operation = PSA_CIPHER_OPERATION_INIT;
uint8_t iv[1] = { 0x5a }; uint8_t iv[1] = { 0x5a };
size_t iv_length;
unsigned char *output = NULL; unsigned char *output = NULL;
size_t output_buffer_size = 0; size_t output_buffer_size = 0;
size_t output_length; size_t output_length, length;
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
PSA_ASSERT( psa_crypto_init( ) ); PSA_ASSERT( psa_crypto_init( ) );
@ -3353,13 +3352,49 @@ void cipher_alg_without_iv( int alg_arg, int key_type_arg, data_t *key_data,
/* generate_iv() is not allowed */ /* generate_iv() is not allowed */
PSA_ASSERT( psa_cipher_encrypt_setup( &operation, key, alg ) ); PSA_ASSERT( psa_cipher_encrypt_setup( &operation, key, alg ) );
TEST_EQUAL( psa_cipher_generate_iv( &operation, iv, sizeof( iv ), TEST_EQUAL( psa_cipher_generate_iv( &operation, iv, sizeof( iv ),
&iv_length ), &length ),
PSA_ERROR_BAD_STATE ); PSA_ERROR_BAD_STATE );
PSA_ASSERT( psa_cipher_decrypt_setup( &operation, key, alg ) ); PSA_ASSERT( psa_cipher_decrypt_setup( &operation, key, alg ) );
TEST_EQUAL( psa_cipher_generate_iv( &operation, iv, sizeof( iv ), TEST_EQUAL( psa_cipher_generate_iv( &operation, iv, sizeof( iv ),
&iv_length ), &length ),
PSA_ERROR_BAD_STATE ); PSA_ERROR_BAD_STATE );
/* Multipart encryption */
PSA_ASSERT( psa_cipher_encrypt_setup( &operation, key, alg ) );
output_length = 0;
length = ~0;
PSA_ASSERT( psa_cipher_update( &operation,
plaintext->x, plaintext->len,
output, output_buffer_size,
&length ) );
TEST_ASSERT( length <= output_buffer_size );
output_length += length;
PSA_ASSERT( psa_cipher_finish( &operation,
output + output_length,
output_buffer_size - output_length,
&length ) );
output_length += length;
ASSERT_COMPARE( ciphertext->x, ciphertext->len,
output, output_length );
/* Multipart encryption */
PSA_ASSERT( psa_cipher_decrypt_setup( &operation, key, alg ) );
output_length = 0;
length = ~0;
PSA_ASSERT( psa_cipher_update( &operation,
ciphertext->x, ciphertext->len,
output, output_buffer_size,
&length ) );
TEST_ASSERT( length <= output_buffer_size );
output_length += length;
PSA_ASSERT( psa_cipher_finish( &operation,
output + output_length,
output_buffer_size - output_length,
&length ) );
output_length += length;
ASSERT_COMPARE( plaintext->x, plaintext->len,
output, output_length );
/* One-shot encryption */ /* One-shot encryption */
output_length = ~0; output_length = ~0;
PSA_ASSERT( psa_cipher_encrypt( key, alg, plaintext->x, plaintext->len, PSA_ASSERT( psa_cipher_encrypt( key, alg, plaintext->x, plaintext->len,
@ -3376,17 +3411,6 @@ void cipher_alg_without_iv( int alg_arg, int key_type_arg, data_t *key_data,
ASSERT_COMPARE( plaintext->x, plaintext->len, ASSERT_COMPARE( plaintext->x, plaintext->len,
output, output_length ); output, output_length );
/* Encrypt, multi-part */
PSA_ASSERT( psa_cipher_abort( &operation ) );
PSA_ASSERT( psa_cipher_encrypt_setup( &operation, key, alg ) );
PSA_ASSERT( psa_cipher_update( &operation, input->x, input->len,
output, output_buffer_size,
&output_length) );
ASSERT_COMPARE( expected_output->x, expected_output->len,
output, output_length );
exit: exit:
PSA_ASSERT( psa_cipher_abort( &operation ) ); PSA_ASSERT( psa_cipher_abort( &operation ) );
mbedtls_free( output ); mbedtls_free( output );