lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-06-05 00:22:11 +03:00
Code

Fix failure to write back when reset != 0; tidy-up

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-03-31 16:20:32 +01:00
parent 0feecbd6f3
commit 42a5bb16c6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/timing.c
View File

@ -234,12 +234,13 @@ volatile int mbedtls_timing_alarmed = 0;
unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset) unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset)
{ {
/* Copy val to an 8-byte-aligned address, so that we can safely cast it */ /* Copy val to an 8-byte-aligned address, so that we can safely cast it */
uint64_t val_aligned[(sizeof(struct mbedtls_timing_hr_time) + 7) / 8]; uint64_t val_aligned[(sizeof(struct mbedtls_timing_hr_time) + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
memcpy(val_aligned, val, sizeof(struct _hr_time)); memcpy(val_aligned, val, sizeof(struct mbedtls_timing_hr_time));
struct _hr_time *t = (struct _hr_time *)val_aligned; struct _hr_time *t = (struct _hr_time *)val_aligned;
if (reset) { if (reset) {
QueryPerformanceCounter(&t->start); QueryPerformanceCounter(&t->start);
memcpy(val, t, sizeof(struct _hr_time));
return 0; return 0;
} else { } else {
unsigned long delta; unsigned long delta;
@ -283,12 +284,13 @@ void mbedtls_set_alarm(int seconds)
unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset) unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset)
{ {
/* Copy val to an 8-byte-aligned address, so that we can safely cast it */ /* Copy val to an 8-byte-aligned address, so that we can safely cast it */
uint64_t val_aligned[(sizeof(struct mbedtls_timing_hr_time) + 7) / 8]; uint64_t val_aligned[(sizeof(struct mbedtls_timing_hr_time) + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
memcpy(val_aligned, val, sizeof(struct _hr_time)); memcpy(val_aligned, val, sizeof(struct mbedtls_timing_hr_time));
struct _hr_time *t = (struct _hr_time *)val_aligned; struct _hr_time *t = (struct _hr_time *)val_aligned;
if (reset) { if (reset) {
gettimeofday(&t->start, NULL); gettimeofday(&t->start, NULL);
memcpy(val, t, sizeof(struct _hr_time));
return 0; return 0;
} else { } else {
unsigned long delta; unsigned long delta;