From efebad0d67c63d3b734f898a5624b52be8fbf9e4 Mon Sep 17 00:00:00 2001 From: Paul Elliott Date: Wed, 15 Feb 2023 16:56:45 +0000 Subject: [PATCH] Run extra complete in failure tests regardless. We do not need to expect to fail, running another complete in either sign or verify after successful completion should also return BAD_STATE. Signed-off-by: Paul Elliott --- tests/suites/test_suite_psa_crypto.function | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function index 66f932b7e1..2f5b50db90 100644 --- a/tests/suites/test_suite_psa_crypto.function +++ b/tests/suites/test_suite_psa_crypto.function @@ -6702,13 +6702,12 @@ void sign_hash_fail_interruptible(int key_type_arg, data_t *key_data, TEST_EQUAL(actual_status, expected_complete_status); - if (expected_complete_status != PSA_SUCCESS) { - actual_status = psa_sign_hash_complete(&operation, signature, - signature_size, - &signature_length); + /* Check that another complete returns BAD_STATE. */ + actual_status = psa_sign_hash_complete(&operation, signature, + signature_size, + &signature_length); - TEST_EQUAL(actual_status, PSA_ERROR_BAD_STATE); - } + TEST_EQUAL(actual_status, PSA_ERROR_BAD_STATE); PSA_ASSERT(psa_sign_hash_abort(&operation)); @@ -7160,11 +7159,9 @@ void verify_hash_fail_interruptible(int key_type_arg, data_t *key_data, TEST_EQUAL(actual_status, expected_complete_status); - if (expected_complete_status != PSA_SUCCESS) { - actual_status = psa_verify_hash_complete(&operation); - - TEST_EQUAL(actual_status, PSA_ERROR_BAD_STATE); - } + /* Check that another complete returns BAD_STATE. */ + actual_status = psa_verify_hash_complete(&operation); + TEST_EQUAL(actual_status, PSA_ERROR_BAD_STATE); TEST_LE_U(min_completes, num_completes); TEST_LE_U(num_completes, max_completes);