mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-16 08:42:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'psa/pr/82' into feature-psa

Browse Source
This commit is contained in:
Gilles Peskine 2018-06-28 11:26:42 +02:00 committed by itayzafrir
commit 122b265067
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/suites/test_suite_psa_crypto.function
View File

@ -108,9 +108,9 @@ static int exercise_cipher_key( psa_key_slot_t key,
if( usage & PSA_KEY_USAGE_DECRYPT ) if( usage & PSA_KEY_USAGE_DECRYPT )
{ {
psa_status_t status; psa_status_t status;
psa_key_type_t type = PSA_KEY_TYPE_NONE;
if( ! ( usage & PSA_KEY_USAGE_ENCRYPT ) ) if( ! ( usage & PSA_KEY_USAGE_ENCRYPT ) )
{ {
psa_key_type_t type;
size_t bits; size_t bits;
TEST_ASSERT( psa_get_key_information( key, &type, &bits ) ); TEST_ASSERT( psa_get_key_information( key, &type, &bits ) );
iv_length = PSA_BLOCK_CIPHER_BLOCK_SIZE( type ); iv_length = PSA_BLOCK_CIPHER_BLOCK_SIZE( type );
@ -129,8 +129,8 @@ static int exercise_cipher_key( psa_key_slot_t key,
/* For a stream cipher, all inputs are valid. For a block cipher, /* For a stream cipher, all inputs are valid. For a block cipher,
* if the input is some aribtrary data rather than an actual * if the input is some aribtrary data rather than an actual
ciphertext, a padding error is likely. */ ciphertext, a padding error is likely. */
if( ( usage & PSA_KEY_USAGE_DECRYPT ) || if( ( usage & PSA_KEY_USAGE_ENCRYPT ) ||
PSA_BLOCK_CIPHER_BLOCK_SIZE( alg ) == 1 ) PSA_BLOCK_CIPHER_BLOCK_SIZE( type ) == 1 )
TEST_ASSERT( status == PSA_SUCCESS ); TEST_ASSERT( status == PSA_SUCCESS );
else else
TEST_ASSERT( status == PSA_SUCCESS || TEST_ASSERT( status == PSA_SUCCESS ||