commit 14b61666a5b102df843abaf7d1aba9f18def9663
author Gilles Peskine <gilles.peskine@arm.com> Tue Feb 28 18:09:25 2023 +0100
committer GitHub <noreply@github.com> Tue Feb 28 18:09:25 2023 +0100
tree 9f7c2de2b8de9b69460c6016791e8f2dab4da83a
parent 7a5168e90db359e17e72591cb5ddb06ef5f0388f
parent 6ed143635d0a91c79c21ec1d762e7e7d6aae20f5

Merge pull request #7139 from daverodgman/fix-test-output-length-on-success-only-2.28

Backport 2.28 - Fix test to check output length on PSA_SUCCESS only

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 214096c..5bd7b36 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -4173,7 +4173,11 @@
                                            output, output_size,
                                            &output_length);
     TEST_EQUAL(actual_status, expected_status);
-    TEST_EQUAL(output_length, expected_output_length);
+    if (actual_status == PSA_SUCCESS) {
+        TEST_EQUAL(output_length, expected_output_length);
+    } else {
+        TEST_LE_U(output_length, output_size);
+    }
 
     /* If the label is empty, the test framework puts a non-null pointer
      * in label->x. Test that a null pointer works as well. */
@@ -4188,7 +4192,11 @@
                                                output, output_size,
                                                &output_length);
         TEST_EQUAL(actual_status, expected_status);
-        TEST_EQUAL(output_length, expected_output_length);
+        if (actual_status == PSA_SUCCESS) {
+            TEST_EQUAL(output_length, expected_output_length);
+        } else {
+            TEST_LE_U(output_length, output_size);
+        }
     }
 
 exit: