lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-05 19:35:48 +03:00
Code Activity

build fixes

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman
2023-09-20 16:26:49 +01:00
parent c1a17f5458
commit 1d52368e85
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/cipher.c
View File

@@ -798,7 +798,8 @@ static int get_one_and_zeros_padding(unsigned char *input, size_t input_len,
*data_len = (*data_len & ~hit_first_nonzero) | ((size_t) i & hit_first_nonzero); *data_len = (*data_len & ~hit_first_nonzero) | ((size_t) i & hit_first_nonzero);
bad = mbedtls_ct_uint_if(hit_first_nonzero, !mbedtls_ct_size_bool_eq(input[i], 0x80), bad); bad = mbedtls_ct_uint_if((unsigned int) hit_first_nonzero,
!mbedtls_ct_size_bool_eq(input[i], 0x80), bad);
in_padding = in_padding & ~is_nonzero; in_padding = in_padding & ~is_nonzero;
} }
@@ -843,7 +844,7 @@ static int get_zeros_and_len_padding(unsigned char *input, size_t input_len,
/* The number of bytes checked must be independent of padding_len */ /* The number of bytes checked must be independent of padding_len */
pad_idx = input_len - padding_len; pad_idx = input_len - padding_len;
for (i = 0; i < input_len - 1; i++) { for (i = 0; i < input_len - 1; i++) {
unsigned int mask = mbedtls_ct_size_mask_ge(i, pad_idx); size_t mask = mbedtls_ct_size_mask_ge(i, pad_idx);
bad |= input[i] & mask; bad |= input[i] & mask;
} }

6
library/constant_time.c
View File

@@ -116,7 +116,8 @@ mbedtls_mpi_uint mbedtls_ct_mpi_uint_mask(mbedtls_mpi_uint value)
#endif /* MBEDTLS_BIGNUM_C */ #endif /* MBEDTLS_BIGNUM_C */
#if defined(MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC) #if defined(MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC) || defined(MBEDTLS_NIST_KW_C) || \
defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
/** Constant-flow mask generation for "less than" comparison: /** Constant-flow mask generation for "less than" comparison:
* - if \p x < \p y, return all-bits 1, that is (size_t) -1 * - if \p x < \p y, return all-bits 1, that is (size_t) -1
@@ -151,7 +152,8 @@ size_t mbedtls_ct_size_mask_ge(size_t x,
return ~mbedtls_ct_size_mask_lt(x, y); return ~mbedtls_ct_size_mask_lt(x, y);
} }
#endif /* MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC */ #endif /* defined(MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC) || defined(MBEDTLS_NIST_KW_C) ||
defined(MBEDTLS_CIPHER_MODE_WITH_PADDING) */
#if defined(MBEDTLS_BASE64_C) #if defined(MBEDTLS_BASE64_C)

6
library/constant_time_internal.h
View File

@@ -79,7 +79,8 @@ mbedtls_mpi_uint mbedtls_ct_mpi_uint_mask(mbedtls_mpi_uint value);
#endif /* MBEDTLS_BIGNUM_C */ #endif /* MBEDTLS_BIGNUM_C */
#if defined(MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC) #if defined(MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC) || defined(MBEDTLS_NIST_KW_C) || \
defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
/** Constant-flow mask generation for "greater or equal" comparison: /** Constant-flow mask generation for "greater or equal" comparison:
* - if \p x >= \p y, return all-bits 1, that is (size_t) -1 * - if \p x >= \p y, return all-bits 1, that is (size_t) -1
@@ -97,7 +98,8 @@ mbedtls_mpi_uint mbedtls_ct_mpi_uint_mask(mbedtls_mpi_uint value);
size_t mbedtls_ct_size_mask_ge(size_t x, size_t mbedtls_ct_size_mask_ge(size_t x,
size_t y); size_t y);
#endif /* MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC */ #endif /* defined(MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC) || defined(MBEDTLS_NIST_KW_C) ||
defined(MBEDTLS_CIPHER_MODE_WITH_PADDING) */
/** Constant-flow boolean "equal" comparison: /** Constant-flow boolean "equal" comparison:
* return x == y * return x == y