commit 122b265067dc00585ecbb49c923d48ff1eafecf0
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Jun 28 11:26:42 2018 +0200
committer itayzafrir <itay.zafrir@arm.com> Wed Sep 12 16:24:50 2018 +0300
tree 1a6c948637f185df3698b49bdb0b40aa5a039499
parent 1f6643b20e4dc2e083123408d6330d2b216bf45d
parent 65fa0b84339ac07ec93db350a11437b46752c188

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

tests/suites/test_suite_psa_crypto.function

diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index 0d056db..6bcc65f 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -108,9 +108,9 @@
     if( usage & PSA_KEY_USAGE_DECRYPT )
     {
         psa_status_t status;
+        psa_key_type_t type = PSA_KEY_TYPE_NONE;
         if( ! ( usage & PSA_KEY_USAGE_ENCRYPT ) )
         {
-            psa_key_type_t type;
             size_t bits;
             TEST_ASSERT( psa_get_key_information( key, &type, &bits ) );
             iv_length = PSA_BLOCK_CIPHER_BLOCK_SIZE( type );
@@ -129,8 +129,8 @@
         /* For a stream cipher, all inputs are valid. For a block cipher,
          * if the input is some aribtrary data rather than an actual
          ciphertext, a padding error is likely.  */
-        if( ( usage & PSA_KEY_USAGE_DECRYPT ) ||
-            PSA_BLOCK_CIPHER_BLOCK_SIZE( alg ) == 1 )
+        if( ( usage & PSA_KEY_USAGE_ENCRYPT ) ||
+            PSA_BLOCK_CIPHER_BLOCK_SIZE( type ) == 1 )
             TEST_ASSERT( status == PSA_SUCCESS );
         else
             TEST_ASSERT( status == PSA_SUCCESS ||