commit 04a334af550205cfed3990c1686270d5fad2ee6a
author Dave Rodgman <dave.rodgman@arm.com> Mon Jul 31 12:35:26 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Mon Jul 31 12:48:33 2023 +0100
tree 498a7a77407b3b194a8464d0897e1b347e6d26f1
parent ad9e5b9abe89216c90d70bf2676359bf6b989964

Make const-time test not depend on internal knowledge of mbedtls_ct_condition_t

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

tests/suites/test_suite_constant_time.function

diff --git a/tests/suites/test_suite_constant_time.function b/tests/suites/test_suite_constant_time.function
index d8a1fcc..bdd27f5 100644
--- a/tests/suites/test_suite_constant_time.function
+++ b/tests/suites/test_suite_constant_time.function
@@ -77,13 +77,13 @@
     expected = x1 <= y1 ? MBEDTLS_CT_TRUE : MBEDTLS_CT_FALSE;
     TEST_EQUAL(mbedtls_ct_bool_le(x, y), expected);
 
-    expected = mbedtls_ct_bool(x1) ^ mbedtls_ct_bool(y1) ? MBEDTLS_CT_TRUE : MBEDTLS_CT_FALSE;
+    expected = (!!x1) ^ (!!y1) ? MBEDTLS_CT_TRUE : MBEDTLS_CT_FALSE;
     TEST_EQUAL(mbedtls_ct_bool_xor(mbedtls_ct_bool(x), mbedtls_ct_bool(y)), expected);
 
-    expected = mbedtls_ct_bool(x1) & mbedtls_ct_bool(y1) ? MBEDTLS_CT_TRUE : MBEDTLS_CT_FALSE;
+    expected = (!!x1) && (!!y1) ? MBEDTLS_CT_TRUE : MBEDTLS_CT_FALSE;
     TEST_EQUAL(mbedtls_ct_bool_and(mbedtls_ct_bool(x), mbedtls_ct_bool(y)), expected);
 
-    expected = mbedtls_ct_bool(x1) | mbedtls_ct_bool(y1) ? MBEDTLS_CT_TRUE : MBEDTLS_CT_FALSE;
+    expected = (!!x1) || (!!y1) ? MBEDTLS_CT_TRUE : MBEDTLS_CT_FALSE;
     TEST_EQUAL(mbedtls_ct_bool_or(mbedtls_ct_bool(x), mbedtls_ct_bool(y)), expected);
 
     TEST_CF_PUBLIC(&x, sizeof(x));