diff options
| author | Gilles Peskine <Gilles.Peskine@arm.com> | 2022-03-19 11:03:32 +0100 |
|---|---|---|
| committer | Gilles Peskine <Gilles.Peskine@arm.com> | 2022-04-15 11:10:14 +0200 |
| commit | 7acb1980eea8f3d2e780a866004b1bc53d402ed2 (patch) | |
| tree | 041a5b0e5f3f9465a6631200aac4367286f18eb2 /tests/src | |
| parent | 6d187afd8de8bcb79e29898b5a2950ade7bd650e (diff) | |
| download | mbedtls-7acb1980eea8f3d2e780a866004b1bc53d402ed2.zip mbedtls-7acb1980eea8f3d2e780a866004b1bc53d402ed2.tar.gz mbedtls-7acb1980eea8f3d2e780a866004b1bc53d402ed2.tar.bz2 | |
Use PSA_AEAD_NONCE_LENGTH when exercising AEAD keys
Don't re-code the logic to determine a valid nonce length.
This fixes exercise_key() for PSA_ALG_CHACHA20_POLY1305, which was trying to
use a 16-byte nonce.
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/psa_exercise_key.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/tests/src/psa_exercise_key.c b/tests/src/psa_exercise_key.c index b612647..8a2207c 100644 --- a/tests/src/psa_exercise_key.c +++ b/tests/src/psa_exercise_key.c @@ -243,7 +243,9 @@ static int exercise_aead_key( mbedtls_svc_key_id_t key, psa_algorithm_t alg ) { unsigned char nonce[16] = {0}; - size_t nonce_length = sizeof( nonce ); + size_t nonce_length; + psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; + psa_key_type_t key_type; unsigned char plaintext[16] = "Hello, world..."; unsigned char ciphertext[48] = "(wabblewebblewibblewobblewubble)"; size_t ciphertext_length = sizeof( ciphertext ); @@ -255,19 +257,9 @@ static int exercise_aead_key( mbedtls_svc_key_id_t key, alg = PSA_ALG_AEAD_WITH_SHORTENED_TAG( alg, PSA_ALG_AEAD_GET_TAG_LENGTH( alg ) ); } - /* Default IV length for AES-GCM is 12 bytes */ - if( PSA_ALG_AEAD_WITH_SHORTENED_TAG( alg, 0 ) == - PSA_ALG_AEAD_WITH_SHORTENED_TAG( PSA_ALG_GCM, 0 ) ) - { - nonce_length = 12; - } - - /* IV length for CCM needs to be between 7 and 13 bytes */ - if( PSA_ALG_AEAD_WITH_SHORTENED_TAG( alg, 0 ) == - PSA_ALG_AEAD_WITH_SHORTENED_TAG( PSA_ALG_CCM, 0 ) ) - { - nonce_length = 12; - } + PSA_ASSERT( psa_get_key_attributes( key, &attributes ) ); + key_type = psa_get_key_type( &attributes ); + nonce_length = PSA_AEAD_NONCE_LENGTH( key_type, alg ); if( usage & PSA_KEY_USAGE_ENCRYPT ) { @@ -297,6 +289,7 @@ static int exercise_aead_key( mbedtls_svc_key_id_t key, return( 1 ); exit: + psa_reset_key_attributes( &attributes ); return( 0 ); } |