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

Use PSA_ALG_ macros to inspect AEAD base algorithm

Browse source 
Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
This commit is contained in:
Steven Cooreman 2021-01-25 10:26:49 +01:00 committed by Ronald Cron
parent 2f09913aeb
commit 50f1f5e119
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/suites/test_suite_psa_crypto.function
View file

@ -485,8 +485,11 @@ static int exercise_aead_key( mbedtls_svc_key_id_t key,
size_t plaintext_length = sizeof( ciphertext ); size_t plaintext_length = sizeof( ciphertext );
/* Default IV length for AES-GCM is 12 bytes */ /* Default IV length for AES-GCM is 12 bytes */
if( (alg & ~PSA_ALG_AEAD_TAG_LENGTH_MASK) == PSA_ALG_GCM ) if( PSA_ALG_AEAD_WITH_TAG_LENGTH( alg, 0 ) ==
PSA_ALG_AEAD_WITH_TAG_LENGTH( PSA_ALG_GCM, 0 ) )
{
nonce_length = 12; nonce_length = 12;
}
if( usage & PSA_KEY_USAGE_ENCRYPT ) if( usage & PSA_KEY_USAGE_ENCRYPT )
{ {
@ -4104,7 +4107,8 @@ void aead_encrypt( int key_type_arg, data_t *key_data,
#if defined(MBEDTLS_GCM_ALT) || \ #if defined(MBEDTLS_GCM_ALT) || \
defined(MBEDTLS_PSA_ACCEL_ALG_GCM) defined(MBEDTLS_PSA_ACCEL_ALG_GCM)
if( status == PSA_ERROR_NOT_SUPPORTED && if( status == PSA_ERROR_NOT_SUPPORTED &&
(alg & ~PSA_ALG_AEAD_TAG_LENGTH_MASK) == PSA_ALG_GCM && ( PSA_ALG_AEAD_WITH_TAG_LENGTH( alg, 0 ) ==
PSA_ALG_AEAD_WITH_TAG_LENGTH( PSA_ALG_GCM, 0 ) ) &&
nonce->len != 12 ) nonce->len != 12 )
{ {
test_skip( "AES-GCM with non-12-byte IV is not supported", __LINE__, __FILE__ ); test_skip( "AES-GCM with non-12-byte IV is not supported", __LINE__, __FILE__ );
@ -4182,7 +4186,8 @@ void aead_decrypt( int key_type_arg, data_t *key_data,
#if defined(MBEDTLS_GCM_ALT) || \ #if defined(MBEDTLS_GCM_ALT) || \
defined(MBEDTLS_PSA_ACCEL_ALG_GCM) defined(MBEDTLS_PSA_ACCEL_ALG_GCM)
if( status == PSA_ERROR_NOT_SUPPORTED && if( status == PSA_ERROR_NOT_SUPPORTED &&
(alg & ~PSA_ALG_AEAD_TAG_LENGTH_MASK) == PSA_ALG_GCM && ( PSA_ALG_AEAD_WITH_TAG_LENGTH( alg, 0 ) ==
PSA_ALG_AEAD_WITH_TAG_LENGTH( PSA_ALG_GCM, 0 ) ) &&
nonce->len != 12 ) nonce->len != 12 )
{ {
test_skip( "AES-GCM with non-12-byte IV is not supported", __LINE__, __FILE__ ); test_skip( "AES-GCM with non-12-byte IV is not supported", __LINE__, __FILE__ );