From d7fe3d1a75c5b6828c98244e6d75c298701690d0 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Sun, 3 Nov 2024 15:14:42 +0100 Subject: [PATCH] tests: crypto: tinycrypt: Fix premature Ztest end Don't use TC_END_RESULT() to report Ztest's result prematurely. Signed-off-by: Dmitrii Golovanov --- tests/crypto/tinycrypt/src/cbc_mode.c | 4 ++-- tests/crypto/tinycrypt/src/ccm_mode.c | 1 - tests/crypto/tinycrypt/src/cmac_mode.c | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/crypto/tinycrypt/src/cbc_mode.c b/tests/crypto/tinycrypt/src/cbc_mode.c index 8c1338255c3..bf309244c68 100644 --- a/tests/crypto/tinycrypt/src/cbc_mode.c +++ b/tests/crypto/tinycrypt/src/cbc_mode.c @@ -128,7 +128,7 @@ ZTEST(tinycrypt, test_cbc_sp_800_38a_encrypt_decrypt) result = check_result(1, ciphertext, sizeof(encrypted), encrypted, sizeof(encrypted), 1); - TC_END_RESULT(result); + zassert_false(result, "CBC test #1 failed."); TC_PRINT("CBC test #2 (decryption SP 800-38a tests):\n"); (void)tc_aes128_set_decrypt_key(&a, key); @@ -145,5 +145,5 @@ ZTEST(tinycrypt, test_cbc_sp_800_38a_encrypt_decrypt) decrypted, sizeof(decrypted), 1); /**TESTPOINT: Check result*/ - zassert_false(result, "CBC test #1 failed."); + zassert_false(result, "CBC test #2 failed."); } diff --git a/tests/crypto/tinycrypt/src/ccm_mode.c b/tests/crypto/tinycrypt/src/ccm_mode.c index bd1d69b7cbc..415a3bbc9f8 100644 --- a/tests/crypto/tinycrypt/src/ccm_mode.c +++ b/tests/crypto/tinycrypt/src/ccm_mode.c @@ -464,7 +464,6 @@ ZTEST(tinycrypt, test_ccm_vector_8) } result = TC_PASS; - TC_END_RESULT(result); /**TESTPOINT: Check result*/ zassert_false(result, "CCM test #8 (no payload data) failed."); diff --git a/tests/crypto/tinycrypt/src/cmac_mode.c b/tests/crypto/tinycrypt/src/cmac_mode.c index be9817927f2..888897643d6 100644 --- a/tests/crypto/tinycrypt/src/cmac_mode.c +++ b/tests/crypto/tinycrypt/src/cmac_mode.c @@ -111,7 +111,6 @@ static uint32_t verify_gf_2_128_double(uint8_t *K1, uint8_t *K2, struct tc_cmac_ return TC_FAIL; } - TC_END_RESULT(result); return result; } @@ -138,7 +137,6 @@ static uint32_t verify_cmac_null_msg(TCCmacState_t s) return TC_FAIL; } - TC_END_RESULT(result); return result; } @@ -170,7 +168,6 @@ static uint32_t verify_cmac_1_block_msg(TCCmacState_t s) return TC_FAIL; } - TC_END_RESULT(result); return result; } @@ -205,7 +202,6 @@ static uint32_t verify_cmac_320_bit_msg(TCCmacState_t s) return TC_FAIL; } - TC_END_RESULT(result); return result; } @@ -243,7 +239,6 @@ static uint32_t verify_cmac_512_bit_msg(TCCmacState_t s) return TC_FAIL; } - TC_END_RESULT(result); return result; }