From 0fca150b8146f69d624d5e94a057a21e50c20ed3 Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Thu, 16 Nov 2023 20:12:17 +0000 Subject: [PATCH] Compare buffers even for zero-length cases This enables us to test that lengths are correctly zero when the buffer pointer is NULL. Signed-off-by: David Horstmann --- tests/suites/test_suite_psa_crypto_memory.function | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/suites/test_suite_psa_crypto_memory.function b/tests/suites/test_suite_psa_crypto_memory.function index e92cbb157f..593825823c 100644 --- a/tests/suites/test_suite_psa_crypto_memory.function +++ b/tests/suites/test_suite_psa_crypto_memory.function @@ -98,9 +98,9 @@ void input_copy_alloc(int input_len, psa_status_t exp_status) TEST_ASSERT(input_copy.buffer == NULL); } else { TEST_ASSERT(input_copy.buffer != input); - TEST_MEMORY_COMPARE(input, input_len, - input_copy.buffer, input_copy.len); } + TEST_MEMORY_COMPARE(input, input_len, + input_copy.buffer, input_copy.len); } exit: @@ -169,9 +169,8 @@ void output_copy_alloc(int output_len, psa_status_t exp_status) TEST_ASSERT(output_copy.original == output); if (output == NULL) { TEST_ASSERT(output_copy.buffer == NULL); - } else { - TEST_EQUAL(output_copy.len, output_len); } + TEST_EQUAL(output_copy.len, output_len); } exit: @@ -215,10 +214,8 @@ void output_copy_free(int output_len, int original_is_null, if (exp_status == PSA_SUCCESS) { TEST_ASSERT(output_copy.buffer == NULL); TEST_EQUAL(output_copy.len, 0); - if (output != NULL) { - TEST_MEMORY_COMPARE(buffer_copy_for_comparison, output_len, - output, output_len); - } + TEST_MEMORY_COMPARE(buffer_copy_for_comparison, output_len, + output, output_len); } exit: