commit 75332531259083504df336ae4c1eb5fb2bea1ca2
author gabor-mezei-arm <gabor.mezei@arm.com> Mon Sep 27 12:59:30 2021 +0200
committer Gabor Mezei <gabor.mezei@arm.com> Thu Nov 11 10:52:42 2021 +0100
tree ebaa4a030ad6dd38d44fcb0e47db48e631e1cdda
parent 097d4f555e8504f86f34dc6477324c49d4359da2

Move mbedtls_cf_uint_if function to the constant-time module

Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>

library/constant_time.c

diff --git a/library/constant_time.c b/library/constant_time.c
index b513c6a..6d53134 100644
--- a/library/constant_time.c
+++ b/library/constant_time.c
@@ -273,3 +273,19 @@
 }
 
 #endif /* MBEDTLS_BIGNUM_C */
+
+/** Choose between two integer values, without branches.
+ *
+ * This is equivalent to `cond ? if1 : if0`, but is likely to be compiled
+ * to code using bitwise operation rather than a branch.
+ *
+ * \param cond      Condition to test.
+ * \param if1       Value to use if \p cond is nonzero.
+ * \param if0       Value to use if \p cond is zero.
+ * \return          \c if1 if \p cond is nonzero, otherwise \c if0.
+ */
+unsigned mbedtls_cf_uint_if( unsigned cond, unsigned if1, unsigned if0 )
+{
+    unsigned mask = mbedtls_cf_uint_mask( cond );
+    return( ( mask & if1 ) | (~mask & if0 ) );
+}

library/constant_time.h

diff --git a/library/constant_time.h b/library/constant_time.h
index 3c18b4e..973e856 100644
--- a/library/constant_time.h
+++ b/library/constant_time.h
@@ -52,3 +52,6 @@
                                  const mbedtls_mpi_uint y );
 
 #endif /* MBEDTLS_BIGNUM_C */
+
+unsigned mbedtls_cf_uint_if( unsigned cond, unsigned if1, unsigned if0 );
+

library/rsa.c

diff --git a/library/rsa.c b/library/rsa.c
index 26b6d34..2cee36f 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -1479,22 +1479,6 @@
 #endif /* MBEDTLS_PKCS1_V21 */
 
 #if defined(MBEDTLS_PKCS1_V15)
-/** Choose between two integer values, without branches.
- *
- * This is equivalent to `cond ? if1 : if0`, but is likely to be compiled
- * to code using bitwise operation rather than a branch.
- *
- * \param cond      Condition to test.
- * \param if1       Value to use if \p cond is nonzero.
- * \param if0       Value to use if \p cond is zero.
- * \return          \c if1 if \p cond is nonzero, otherwise \c if0.
- */
-static unsigned mbedtls_cf_uint_if( unsigned cond, unsigned if1, unsigned if0 )
-{
-    unsigned mask = mbedtls_cf_uint_mask( cond );
-    return( ( mask & if1 ) | (~mask & if0 ) );
-}
-
 /** Shift some data towards the left inside a buffer without leaking
  * the length of the data through side channels.
  *