mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2025-03-08 10:09:54 +00:00
Move mbedtls_cf_size_mask_lt function to the constant-time module
Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
This commit is contained in:
parent
d361ccd663
commit
4d6b14624e
|
@ -136,3 +136,28 @@ size_t mbedtls_cf_size_mask( size_t bit )
|
||||||
#pragma warning( pop )
|
#pragma warning( pop )
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Constant-flow mask generation for "less than" comparison:
|
||||||
|
* - if x < y, return all bits 1, that is (size_t) -1
|
||||||
|
* - otherwise, return all bits 0, that is 0
|
||||||
|
*
|
||||||
|
* This function can be used to write constant-time code by replacing branches
|
||||||
|
* with bit operations using masks.
|
||||||
|
*
|
||||||
|
* This function is implemented without using comparison operators, as those
|
||||||
|
* might be translated to branches by some compilers on some platforms.
|
||||||
|
*/
|
||||||
|
size_t mbedtls_cf_size_mask_lt( size_t x, size_t y )
|
||||||
|
{
|
||||||
|
/* This has the most significant bit set if and only if x < y */
|
||||||
|
const size_t sub = x - y;
|
||||||
|
|
||||||
|
/* sub1 = (x < y) ? 1 : 0 */
|
||||||
|
const size_t sub1 = sub >> ( sizeof( sub ) * 8 - 1 );
|
||||||
|
|
||||||
|
/* mask = (x < y) ? 0xff... : 0x00... */
|
||||||
|
const size_t mask = mbedtls_cf_size_mask( sub1 );
|
||||||
|
|
||||||
|
return( mask );
|
||||||
|
}
|
||||||
|
|
|
@ -33,3 +33,5 @@ int mbedtls_safer_memcmp( const void *a, const void *b, size_t n );
|
||||||
unsigned mbedtls_cf_uint_mask( unsigned value );
|
unsigned mbedtls_cf_uint_mask( unsigned value );
|
||||||
|
|
||||||
size_t mbedtls_cf_size_mask( size_t bit );
|
size_t mbedtls_cf_size_mask( size_t bit );
|
||||||
|
|
||||||
|
size_t mbedtls_cf_size_mask_lt( size_t x, size_t y );
|
||||||
|
|
|
@ -1045,31 +1045,6 @@ int mbedtls_ssl_encrypt_buf( mbedtls_ssl_context *ssl,
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC)
|
#if defined(MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC)
|
||||||
/*
|
|
||||||
* Constant-flow mask generation for "less than" comparison:
|
|
||||||
* - if x < y, return all bits 1, that is (size_t) -1
|
|
||||||
* - otherwise, return all bits 0, that is 0
|
|
||||||
*
|
|
||||||
* This function can be used to write constant-time code by replacing branches
|
|
||||||
* with bit operations using masks.
|
|
||||||
*
|
|
||||||
* This function is implemented without using comparison operators, as those
|
|
||||||
* might be translated to branches by some compilers on some platforms.
|
|
||||||
*/
|
|
||||||
static size_t mbedtls_cf_size_mask_lt( size_t x, size_t y )
|
|
||||||
{
|
|
||||||
/* This has the most significant bit set if and only if x < y */
|
|
||||||
const size_t sub = x - y;
|
|
||||||
|
|
||||||
/* sub1 = (x < y) ? 1 : 0 */
|
|
||||||
const size_t sub1 = sub >> ( sizeof( sub ) * 8 - 1 );
|
|
||||||
|
|
||||||
/* mask = (x < y) ? 0xff... : 0x00... */
|
|
||||||
const size_t mask = mbedtls_cf_size_mask( sub1 );
|
|
||||||
|
|
||||||
return( mask );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Constant-flow mask generation for "greater or equal" comparison:
|
* Constant-flow mask generation for "greater or equal" comparison:
|
||||||
* - if x >= y, return all bits 1, that is (size_t) -1
|
* - if x >= y, return all bits 1, that is (size_t) -1
|
||||||
|
|
Loading…
Reference in a new issue