yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

exercise_key: support modes where IV length is not 16

Browse source 
Support ECB, which has no IV. The code also now supports arbitrary IV
lengths based on the algorithm and key type.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2022-03-18 18:40:47 +01:00
parent c47d3a4286
commit bbf452c689
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/src/psa_exercise_key.c
View file

@ -166,18 +166,27 @@ static int exercise_cipher_key( mbedtls_svc_key_id_t key,
psa_cipher_operation_t operation = PSA_CIPHER_OPERATION_INIT; psa_cipher_operation_t operation = PSA_CIPHER_OPERATION_INIT;
unsigned char iv[16] = {0}; unsigned char iv[16] = {0};
size_t iv_length = sizeof( iv ); size_t iv_length = sizeof( iv );
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
psa_key_type_t key_type;
const unsigned char plaintext[16] = "Hello, world..."; const unsigned char plaintext[16] = "Hello, world...";
unsigned char ciphertext[32] = "(wabblewebblewibblewobblewubble)"; unsigned char ciphertext[32] = "(wabblewebblewibblewobblewubble)";
size_t ciphertext_length = sizeof( ciphertext ); size_t ciphertext_length = sizeof( ciphertext );
unsigned char decrypted[sizeof( ciphertext )]; unsigned char decrypted[sizeof( ciphertext )];
size_t part_length; size_t part_length;
PSA_ASSERT( psa_get_key_attributes( key, &attributes ) );
key_type = psa_get_key_type( &attributes );
iv_length = PSA_CIPHER_IV_LENGTH( key_type, alg );
if( usage & PSA_KEY_USAGE_ENCRYPT ) if( usage & PSA_KEY_USAGE_ENCRYPT )
{ {
PSA_ASSERT( psa_cipher_encrypt_setup( &operation, key, alg ) ); PSA_ASSERT( psa_cipher_encrypt_setup( &operation, key, alg ) );
if( PSA_CIPHER_IV_LENGTH( key_type, alg ) != 0 )
{
PSA_ASSERT( psa_cipher_generate_iv( &operation, PSA_ASSERT( psa_cipher_generate_iv( &operation,
iv, sizeof( iv ), iv, sizeof( iv ),
&iv_length ) ); &iv_length ) );
}
PSA_ASSERT( psa_cipher_update( &operation, PSA_ASSERT( psa_cipher_update( &operation,
plaintext, sizeof( plaintext ), plaintext, sizeof( plaintext ),
ciphertext, sizeof( ciphertext ), ciphertext, sizeof( ciphertext ),
@ -195,18 +204,14 @@ static int exercise_cipher_key( mbedtls_svc_key_id_t key,
int maybe_invalid_padding = 0; int maybe_invalid_padding = 0;
if( ! ( usage & PSA_KEY_USAGE_ENCRYPT ) ) if( ! ( usage & PSA_KEY_USAGE_ENCRYPT ) )
{ {
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
PSA_ASSERT( psa_get_key_attributes( key, &attributes ) );
/* This should be PSA_CIPHER_GET_IV_SIZE but the API doesn't
* have this macro yet. */
iv_length = PSA_BLOCK_CIPHER_BLOCK_LENGTH(
psa_get_key_type( &attributes ) );
maybe_invalid_padding = ! PSA_ALG_IS_STREAM_CIPHER( alg ); maybe_invalid_padding = ! PSA_ALG_IS_STREAM_CIPHER( alg );
psa_reset_key_attributes( &attributes );
} }
PSA_ASSERT( psa_cipher_decrypt_setup( &operation, key, alg ) ); PSA_ASSERT( psa_cipher_decrypt_setup( &operation, key, alg ) );
if( iv_length != 0 )
{
PSA_ASSERT( psa_cipher_set_iv( &operation, PSA_ASSERT( psa_cipher_set_iv( &operation,
iv, iv_length ) ); iv, iv_length ) );
}
PSA_ASSERT( psa_cipher_update( &operation, PSA_ASSERT( psa_cipher_update( &operation,
ciphertext, ciphertext_length, ciphertext, ciphertext_length,
decrypted, sizeof( decrypted ), decrypted, sizeof( decrypted ),
@ -229,6 +234,7 @@ static int exercise_cipher_key( mbedtls_svc_key_id_t key,
exit: exit:
psa_cipher_abort( &operation ); psa_cipher_abort( &operation );
psa_reset_key_attributes( &attributes );
return( 0 ); return( 0 );
} }