From ba600b2fd92979d13b21d2e87035d75defefc74a Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Tue, 19 Sep 2023 17:26:13 +0100 Subject: [PATCH] Remove expected param from mbedtls_ct_memcmp_partial test Signed-off-by: Dave Rodgman --- tests/suites/test_suite_constant_time.data | 44 +++++++++---------- .../suites/test_suite_constant_time.function | 3 +- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/tests/suites/test_suite_constant_time.data b/tests/suites/test_suite_constant_time.data index 02b62f7c27..82ee869e4c 100644 --- a/tests/suites/test_suite_constant_time.data +++ b/tests/suites/test_suite_constant_time.data @@ -704,67 +704,67 @@ mbedtls_ct_memmove_left 16 16 mbedtls_ct_memmove_left:16:16 mbedtls_ct_memcmp_partial -1 0 0 0 -mbedtls_ct_memcmp_partial:-1:0:0:0:0 +mbedtls_ct_memcmp_partial:-1:0:0:0 mbedtls_ct_memcmp_partial 0 1 0 0 -mbedtls_ct_memcmp_partial:0:1:0:0:1 +mbedtls_ct_memcmp_partial:0:1:0:0 mbedtls_ct_memcmp_partial 0 1 1 0 -mbedtls_ct_memcmp_partial:0:1:1:0:0 +mbedtls_ct_memcmp_partial:0:1:1:0 mbedtls_ct_memcmp_partial 0 1 0 1 -mbedtls_ct_memcmp_partial:0:1:0:1:0 +mbedtls_ct_memcmp_partial:0:1:0:1 mbedtls_ct_memcmp_partial -1 1 0 0 -mbedtls_ct_memcmp_partial:-1:1:0:0:0 +mbedtls_ct_memcmp_partial:-1:1:0:0 mbedtls_ct_memcmp_partial 0 2 0 1 -mbedtls_ct_memcmp_partial:0:2:0:1:1 +mbedtls_ct_memcmp_partial:0:2:0:1 mbedtls_ct_memcmp_partial 0 2 1 0 -mbedtls_ct_memcmp_partial:0:2:1:0:0 +mbedtls_ct_memcmp_partial:0:2:1:0 mbedtls_ct_memcmp_partial 0 16 4 4 -mbedtls_ct_memcmp_partial:0:16:4:4:0 +mbedtls_ct_memcmp_partial:0:16:4:4 mbedtls_ct_memcmp_partial 2 16 4 4 -mbedtls_ct_memcmp_partial:2:16:4:4:0 +mbedtls_ct_memcmp_partial:2:16:4:4 mbedtls_ct_memcmp_partial 3 16 4 4 -mbedtls_ct_memcmp_partial:3:16:4:4:0 +mbedtls_ct_memcmp_partial:3:16:4:4 mbedtls_ct_memcmp_partial 4 16 4 4 -mbedtls_ct_memcmp_partial:4:16:4:4:1 +mbedtls_ct_memcmp_partial:4:16:4:4 mbedtls_ct_memcmp_partial 7 16 4 4 -mbedtls_ct_memcmp_partial:7:16:4:4:1 +mbedtls_ct_memcmp_partial:7:16:4:4 mbedtls_ct_memcmp_partial 11 16 4 4 -mbedtls_ct_memcmp_partial:11:16:4:4:1 +mbedtls_ct_memcmp_partial:11:16:4:4 mbedtls_ct_memcmp_partial 12 16 4 4 -mbedtls_ct_memcmp_partial:12:16:4:4:0 +mbedtls_ct_memcmp_partial:12:16:4:4 mbedtls_ct_memcmp_partial 15 16 4 4 -mbedtls_ct_memcmp_partial:15:16:4:4:0 +mbedtls_ct_memcmp_partial:15:16:4:4 mbedtls_ct_memcmp_partial 15 16 4 0 -mbedtls_ct_memcmp_partial:15:16:4:0:1 +mbedtls_ct_memcmp_partial:15:16:4:0 mbedtls_ct_memcmp_partial 15 16 0 4 -mbedtls_ct_memcmp_partial:15:16:0:4:0 +mbedtls_ct_memcmp_partial:15:16:0:4 mbedtls_ct_memcmp_partial 0 16 0 0 -mbedtls_ct_memcmp_partial:0:16:0:0:1 +mbedtls_ct_memcmp_partial:0:16:0:0 mbedtls_ct_memcmp_partial 15 16 0 0 -mbedtls_ct_memcmp_partial:15:16:0:0:1 +mbedtls_ct_memcmp_partial:15:16:0:0 mbedtls_ct_memcmp_partial -1 16 0 0 -mbedtls_ct_memcmp_partial:-1:16:0:0:0 +mbedtls_ct_memcmp_partial:-1:16:0:0 mbedtls_ct_memcmp_partial -1 16 12 4 -mbedtls_ct_memcmp_partial:-1:16:12:4:0 +mbedtls_ct_memcmp_partial:-1:16:12:4 mbedtls_ct_memcmp_partial -1 16 8 8 -mbedtls_ct_memcmp_partial:-1:16:8:8:0 +mbedtls_ct_memcmp_partial:-1:16:8:8 diff --git a/tests/suites/test_suite_constant_time.function b/tests/suites/test_suite_constant_time.function index d80610f704..baf77f3ca1 100644 --- a/tests/suites/test_suite_constant_time.function +++ b/tests/suites/test_suite_constant_time.function @@ -260,7 +260,7 @@ exit: /* END_CASE */ /* BEGIN_CASE depends_on:MBEDTLS_NIST_KW_C */ -void mbedtls_ct_memcmp_partial(int diff, int size, int skip_head, int skip_tail, int expected) +void mbedtls_ct_memcmp_partial(int diff, int size, int skip_head, int skip_tail) { uint8_t *a = NULL, *b = NULL; TEST_CALLOC(a, size + 1); // + 1 to avoid NULL result from TEST_CALLOC(0) @@ -290,7 +290,6 @@ void mbedtls_ct_memcmp_partial(int diff, int size, int skip_head, int skip_tail, TEST_CF_PUBLIC(&actual, sizeof(actual)); TEST_EQUAL(!!reference, !!actual); - TEST_EQUAL(!!expected, !!actual); exit: mbedtls_free(a); mbedtls_free(b);