mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-16 08:42:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify mbedtls_ct_memcmp_partial

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-09-19 14:13:41 +01:00
parent 66d6ac92e6
commit c2630fac52
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/constant_time.c
View File

@ -158,13 +158,15 @@ int mbedtls_ct_memcmp_partial(const void *a,
for (size_t i = 0; i < n; i++) { for (size_t i = 0; i < n; i++) {
unsigned char x = A[i], y = B[i]; unsigned char x = A[i], y = B[i];
int d = x ^ y; unsigned int d = x ^ y;
mbedtls_ct_condition_t valid = mbedtls_ct_bool_and(mbedtls_ct_uint_ge(i, skip_head), mbedtls_ct_condition_t valid = mbedtls_ct_bool_and(mbedtls_ct_uint_ge(i, skip_head),
mbedtls_ct_uint_lt(i, valid_end)); mbedtls_ct_uint_lt(i, valid_end));
diff |= mbedtls_ct_uint_if_else_0(valid, d); diff |= mbedtls_ct_uint_if_else_0(valid, d);
} }
return (int) ((diff & 0xffff) | (diff >> 16)); /* Since we go byte-by-byte, the only bits set will be in the bottom 8 bits, so the
* cast from uint to int is safe. */
return (int) diff;
} }
#endif #endif