eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename ...if0 to ...else_0

Browse source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-08-10 12:11:31 +01:00
parent b7825ceb3e
commit 98ddc01a7c
8 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/bignum.c
View file

@ -94,7 +94,7 @@ int mbedtls_mpi_lt_mpi_ct(const mbedtls_mpi *X,
/* This array is used to conditionally swap the pointers in const time */ /* This array is used to conditionally swap the pointers in const time */
void * const p[2] = { X->p, Y->p }; void * const p[2] = { X->p, Y->p };
size_t i = mbedtls_ct_size_if0(X_is_negative, 1); size_t i = mbedtls_ct_size_if_else_0(X_is_negative, 1);
mbedtls_ct_condition_t lt = mbedtls_mpi_core_lt_ct(p[i], p[i ^ 1], X->n); mbedtls_ct_condition_t lt = mbedtls_mpi_core_lt_ct(p[i], p[i ^ 1], X->n);
/* /*
@ -104,7 +104,7 @@ int mbedtls_mpi_lt_mpi_ct(const mbedtls_mpi *X,
result = mbedtls_ct_bool_or(result, result = mbedtls_ct_bool_or(result,
mbedtls_ct_bool_and(mbedtls_ct_bool_not(different_sign), lt)); mbedtls_ct_bool_and(mbedtls_ct_bool_not(different_sign), lt));
*ret = mbedtls_ct_uint_if0(result, 1); *ret = mbedtls_ct_uint_if_else_0(result, 1);
return 0; return 0;
} }
@ -139,7 +139,7 @@ int mbedtls_mpi_safe_cond_assign(mbedtls_mpi *X,
mbedtls_ct_condition_t do_not_assign = mbedtls_ct_bool_not(do_assign); mbedtls_ct_condition_t do_not_assign = mbedtls_ct_bool_not(do_assign);
for (size_t i = Y->n; i < X->n; i++) { for (size_t i = Y->n; i < X->n; i++) {
X->p[i] = mbedtls_ct_mpi_uint_if0(do_not_assign, X->p[i]); X->p[i] = mbedtls_ct_mpi_uint_if_else_0(do_not_assign, X->p[i]);
} }
cleanup: cleanup:

2
library/bignum_core.c
View file

@ -463,7 +463,7 @@ mbedtls_mpi_uint mbedtls_mpi_core_add_if(mbedtls_mpi_uint *X,
mbedtls_ct_condition_t do_add = mbedtls_ct_bool(cond); mbedtls_ct_condition_t do_add = mbedtls_ct_bool(cond);
for (size_t i = 0; i < limbs; i++) { for (size_t i = 0; i < limbs; i++) {
mbedtls_mpi_uint add = mbedtls_ct_mpi_uint_if0(do_add, A[i]); mbedtls_mpi_uint add = mbedtls_ct_mpi_uint_if_else_0(do_add, A[i]);
mbedtls_mpi_uint t = c + X[i]; mbedtls_mpi_uint t = c + X[i];
c = (t < X[i]); c = (t < X[i]);
t += add; t += add;

2
library/constant_time.c
View file

@ -140,7 +140,7 @@ void mbedtls_ct_memmove_left(void *start, size_t total, size_t offset)
unsigned char next = buf[n+1]; unsigned char next = buf[n+1];
buf[n] = mbedtls_ct_uint_if(no_op, current, next); buf[n] = mbedtls_ct_uint_if(no_op, current, next);
} }
buf[total-1] = mbedtls_ct_uint_if0(no_op, buf[total-1]); buf[total-1] = mbedtls_ct_uint_if_else_0(no_op, buf[total-1]);
} }
} }

6
library/constant_time_impl.h
View file

@ -232,19 +232,19 @@ static inline mbedtls_mpi_uint mbedtls_ct_mpi_uint_if(mbedtls_ct_condition_t con
#endif #endif
static inline size_t mbedtls_ct_size_if0(mbedtls_ct_condition_t condition, size_t if1) static inline size_t mbedtls_ct_size_if_else_0(mbedtls_ct_condition_t condition, size_t if1)
{ {
return (size_t) (condition & if1); return (size_t) (condition & if1);
} }
static inline unsigned mbedtls_ct_uint_if0(mbedtls_ct_condition_t condition, unsigned if1) static inline unsigned mbedtls_ct_uint_if_else_0(mbedtls_ct_condition_t condition, unsigned if1)
{ {
return (unsigned) (condition & if1); return (unsigned) (condition & if1);
} }
#if defined(MBEDTLS_BIGNUM_C) #if defined(MBEDTLS_BIGNUM_C)
static inline mbedtls_mpi_uint mbedtls_ct_mpi_uint_if0(mbedtls_ct_condition_t condition, static inline mbedtls_mpi_uint mbedtls_ct_mpi_uint_if_else_0(mbedtls_ct_condition_t condition,
mbedtls_mpi_uint if1) mbedtls_mpi_uint if1)
{ {
return (mbedtls_mpi_uint) (condition & if1); return (mbedtls_mpi_uint) (condition & if1);

4
library/constant_time_internal.h
View file

@ -323,7 +323,7 @@ static inline mbedtls_mpi_uint mbedtls_ct_mpi_uint_if(mbedtls_ct_condition_t con
* *
* \return \c if1 if \p condition == MBEDTLS_CT_TRUE, otherwise 0. * \return \c if1 if \p condition == MBEDTLS_CT_TRUE, otherwise 0.
*/ */
static inline unsigned mbedtls_ct_uint_if0(mbedtls_ct_condition_t condition, unsigned if1); static inline unsigned mbedtls_ct_uint_if_else_0(mbedtls_ct_condition_t condition, unsigned if1);
#if defined(MBEDTLS_BIGNUM_C) #if defined(MBEDTLS_BIGNUM_C)
@ -341,7 +341,7 @@ static inline unsigned mbedtls_ct_uint_if0(mbedtls_ct_condition_t condition, uns
* *
* \return \c if1 if \p condition == MBEDTLS_CT_TRUE, otherwise 0. * \return \c if1 if \p condition == MBEDTLS_CT_TRUE, otherwise 0.
*/ */
static inline mbedtls_mpi_uint mbedtls_ct_mpi_uint_if0(mbedtls_ct_condition_t condition, static inline mbedtls_mpi_uint mbedtls_ct_mpi_uint_if_else_0(mbedtls_ct_condition_t condition,
mbedtls_mpi_uint if1); mbedtls_mpi_uint if1);
#endif #endif

4
library/rsa.c
View file

@ -128,7 +128,7 @@ static int mbedtls_ct_rsaes_pkcs1_v15_unpadding(unsigned char *input,
for (i = 2; i < ilen; i++) { for (i = 2; i < ilen; i++) {
mbedtls_ct_condition_t found = mbedtls_ct_uint_eq(input[i], 0); mbedtls_ct_condition_t found = mbedtls_ct_uint_eq(input[i], 0);
pad_done = mbedtls_ct_bool_or(pad_done, found); pad_done = mbedtls_ct_bool_or(pad_done, found);
pad_count += mbedtls_ct_uint_if0(mbedtls_ct_bool_not(pad_done), 1); pad_count += mbedtls_ct_uint_if_else_0(mbedtls_ct_bool_not(pad_done), 1);
} }
/* If pad_done is still zero, there's no data, only unfinished padding. */ /* If pad_done is still zero, there's no data, only unfinished padding. */
@ -161,7 +161,7 @@ static int mbedtls_ct_rsaes_pkcs1_v15_unpadding(unsigned char *input,
ret = -(int) mbedtls_ct_uint_if( ret = -(int) mbedtls_ct_uint_if(
bad, bad,
(unsigned) (-(MBEDTLS_ERR_RSA_INVALID_PADDING)), (unsigned) (-(MBEDTLS_ERR_RSA_INVALID_PADDING)),
mbedtls_ct_uint_if0( mbedtls_ct_uint_if_else_0(
output_too_large, output_too_large,
(unsigned) (-(MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE))) (unsigned) (-(MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE)))
); );

16
library/ssl_msg.c
View file

@ -1921,8 +1921,8 @@ hmac_failed_etm_enabled:
const mbedtls_ct_condition_t ge = mbedtls_ct_uint_ge( const mbedtls_ct_condition_t ge = mbedtls_ct_uint_ge(
rec->data_len, rec->data_len,
padlen + 1); padlen + 1);
correct = mbedtls_ct_size_if0(ge, correct); correct = mbedtls_ct_size_if_else_0(ge, correct);
padlen = mbedtls_ct_size_if0(ge, padlen); padlen = mbedtls_ct_size_if_else_0(ge, padlen);
} else { } else {
#if defined(MBEDTLS_SSL_DEBUG_ALL) #if defined(MBEDTLS_SSL_DEBUG_ALL)
if (rec->data_len < transform->maclen + padlen + 1) { if (rec->data_len < transform->maclen + padlen + 1) {
@ -1937,8 +1937,8 @@ hmac_failed_etm_enabled:
const mbedtls_ct_condition_t ge = mbedtls_ct_uint_ge( const mbedtls_ct_condition_t ge = mbedtls_ct_uint_ge(
rec->data_len, rec->data_len,
transform->maclen + padlen + 1); transform->maclen + padlen + 1);
correct = mbedtls_ct_size_if0(ge, correct); correct = mbedtls_ct_size_if_else_0(ge, correct);
padlen = mbedtls_ct_size_if0(ge, padlen); padlen = mbedtls_ct_size_if_else_0(ge, padlen);
} }
padlen++; padlen++;
@ -1968,19 +1968,19 @@ hmac_failed_etm_enabled:
* (check[idx] == padlen - 1); * (check[idx] == padlen - 1);
*/ */
const mbedtls_ct_condition_t a = mbedtls_ct_uint_ge(idx, padding_idx); const mbedtls_ct_condition_t a = mbedtls_ct_uint_ge(idx, padding_idx);
size_t increment = mbedtls_ct_size_if0(a, 1); size_t increment = mbedtls_ct_size_if_else_0(a, 1);
const mbedtls_ct_condition_t b = mbedtls_ct_uint_eq(check[idx], padlen - 1); const mbedtls_ct_condition_t b = mbedtls_ct_uint_eq(check[idx], padlen - 1);
increment = mbedtls_ct_size_if0(b, increment); increment = mbedtls_ct_size_if_else_0(b, increment);
pad_count += increment; pad_count += increment;
} }
correct = mbedtls_ct_size_if0(mbedtls_ct_uint_eq(pad_count, padlen), padlen); correct = mbedtls_ct_size_if_else_0(mbedtls_ct_uint_eq(pad_count, padlen), padlen);
#if defined(MBEDTLS_SSL_DEBUG_ALL) #if defined(MBEDTLS_SSL_DEBUG_ALL)
if (padlen > 0 && correct == 0) { if (padlen > 0 && correct == 0) {
MBEDTLS_SSL_DEBUG_MSG(1, ("bad padding byte detected")); MBEDTLS_SSL_DEBUG_MSG(1, ("bad padding byte detected"));
} }
#endif #endif
padlen = mbedtls_ct_size_if0(mbedtls_ct_bool(correct), padlen); padlen = mbedtls_ct_size_if_else_0(mbedtls_ct_bool(correct), padlen);
#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */ #endif /* MBEDTLS_SSL_PROTO_TLS1_2 */

4
tests/suites/test_suite_constant_time.function
View file

@ -135,9 +135,9 @@ void mbedtls_ct_if(char *c_str, char *t_str, char *f_str)
TEST_EQUAL(mbedtls_ct_mpi_uint_if(c, t, f), (mbedtls_mpi_uint) expected); TEST_EQUAL(mbedtls_ct_mpi_uint_if(c, t, f), (mbedtls_mpi_uint) expected);
#endif #endif
TEST_EQUAL(mbedtls_ct_uint_if0(c, t), (unsigned) expected0); TEST_EQUAL(mbedtls_ct_uint_if_else_0(c, t), (unsigned) expected0);
#if defined(MBEDTLS_BIGNUM_C) #if defined(MBEDTLS_BIGNUM_C)
TEST_EQUAL(mbedtls_ct_mpi_uint_if0(c, t), (mbedtls_mpi_uint) expected0); TEST_EQUAL(mbedtls_ct_mpi_uint_if_else_0(c, t), (mbedtls_mpi_uint) expected0);
#endif #endif
TEST_CF_PUBLIC(&c, sizeof(c)); TEST_CF_PUBLIC(&c, sizeof(c));