From 33b2210065a21acfe9a8bf81b6fdc1be357200f3 Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Fri, 31 Mar 2023 11:40:24 +0100 Subject: [PATCH 1/3] Fix cast alignment warning in timing.c Signed-off-by: Dave Rodgman --- include/mbedtls/timing.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mbedtls/timing.h b/include/mbedtls/timing.h index 2d4a19c01..830dcee63 100644 --- a/include/mbedtls/timing.h +++ b/include/mbedtls/timing.h @@ -39,7 +39,7 @@ extern "C" { * \brief timer structure */ struct mbedtls_timing_hr_time { - unsigned char MBEDTLS_PRIVATE(opaque)[32]; + uint64_t MBEDTLS_PRIVATE(opaque)[4]; }; /** From 4ffc9d80f792b298979739c4532704a6b6deea9c Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Fri, 31 Mar 2023 16:43:34 +0100 Subject: [PATCH 2/3] Test that setting reset actually does something Signed-off-by: Dave Rodgman --- tests/suites/test_suite_timing.function | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/suites/test_suite_timing.function b/tests/suites/test_suite_timing.function index 821ebd678..9882c83f3 100644 --- a/tests/suites/test_suite_timing.function +++ b/tests/suites/test_suite_timing.function @@ -20,8 +20,20 @@ void timing_get_timer() { struct mbedtls_timing_hr_time time; + + memset(&time, 0, sizeof(time)); + (void) mbedtls_timing_get_timer(&time, 1); + + /* Check that a non-zero time was written back */ + int all_zero = 1; + for (size_t i = 0; i < sizeof(time); i++) { + all_zero &= ((unsigned char *)&time)[i] == 0; + } + TEST_ASSERT(!all_zero); + (void) mbedtls_timing_get_timer(&time, 0); + /* This goto is added to avoid warnings from the generated code. */ goto exit; } From d43b42ebfac8d70749cccd6fc36f1219d6b903c3 Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Fri, 31 Mar 2023 18:04:34 +0100 Subject: [PATCH 3/3] Whitespace fix Signed-off-by: Dave Rodgman --- tests/suites/test_suite_timing.function | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/suites/test_suite_timing.function b/tests/suites/test_suite_timing.function index 9882c83f3..4143a1c51 100644 --- a/tests/suites/test_suite_timing.function +++ b/tests/suites/test_suite_timing.function @@ -28,7 +28,7 @@ void timing_get_timer() /* Check that a non-zero time was written back */ int all_zero = 1; for (size_t i = 0; i < sizeof(time); i++) { - all_zero &= ((unsigned char *)&time)[i] == 0; + all_zero &= ((unsigned char *) &time)[i] == 0; } TEST_ASSERT(!all_zero);