From 2701deaa4b4a9a6257470b038c5ccab3745f25cc Mon Sep 17 00:00:00 2001 From: Tom Cosgrove Date: Thu, 15 Sep 2022 15:00:07 +0100 Subject: [PATCH] Use mbedtls_ct_mpi_uint_mask() rather than rolling our own Signed-off-by: Tom Cosgrove --- library/bignum_core.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/library/bignum_core.c b/library/bignum_core.c index 13fc074a6d..bb6e7cd3bc 100644 --- a/library/bignum_core.c +++ b/library/bignum_core.c @@ -300,19 +300,8 @@ mbedtls_mpi_uint mbedtls_mpi_core_add_if( mbedtls_mpi_uint *A, { mbedtls_mpi_uint c = 0; - /* MSVC has a warning about unary minus on unsigned integer types, - * but this is well-defined and precisely what we want to do here. */ -#if defined(_MSC_VER) -#pragma warning( push ) -#pragma warning( disable : 4146 ) -#endif - - /* all-bits 1 if cond is 1, all-bits 0 if cond is 0 */ - const mbedtls_mpi_uint mask = -(mbedtls_mpi_uint)cond; - -#if defined(_MSC_VER) -#pragma warning( pop ) -#endif + /* all-bits 0 if cond is 0, all-bits 1 if cond is non-0 */ + const mbedtls_mpi_uint mask = mbedtls_ct_mpi_uint_mask( cond ); for( size_t i = 0; i < limbs; i++ ) {