Switch to the new code style
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
diff --git a/library/bignum_core.h b/library/bignum_core.h
index 771f208..44d5c5a 100644
--- a/library/bignum_core.h
+++ b/library/bignum_core.h
@@ -86,19 +86,19 @@
#include "mbedtls/bignum.h"
#endif
-#define ciL ( sizeof(mbedtls_mpi_uint) ) /** chars in limb */
-#define biL ( ciL << 3 ) /** bits in limb */
-#define biH ( ciL << 2 ) /** half limb size */
+#define ciL (sizeof(mbedtls_mpi_uint)) /** chars in limb */
+#define biL (ciL << 3) /** bits in limb */
+#define biH (ciL << 2) /** half limb size */
/*
* Convert between bits/chars and number of limbs
* Divide first in order to avoid potential overflows
*/
-#define BITS_TO_LIMBS(i) ( (i) / biL + ( (i) % biL != 0 ) )
-#define CHARS_TO_LIMBS(i) ( (i) / ciL + ( (i) % ciL != 0 ) )
+#define BITS_TO_LIMBS(i) ((i) / biL + ((i) % biL != 0))
+#define CHARS_TO_LIMBS(i) ((i) / ciL + ((i) % ciL != 0))
/* Get a specific byte, without range checks. */
-#define GET_BYTE( X, i ) \
- ( ( (X)[(i) / ciL] >> ( ( (i) % ciL ) * 8 ) ) & 0xff )
+#define GET_BYTE(X, i) \
+ (((X)[(i) / ciL] >> (((i) % ciL) * 8)) & 0xff)
/** Count leading zero bits in a given integer.
*
@@ -106,7 +106,7 @@
*
* \return The number of leading zero bits in \p a.
*/
-size_t mbedtls_mpi_core_clz( mbedtls_mpi_uint a );
+size_t mbedtls_mpi_core_clz(mbedtls_mpi_uint a);
/** Return the minimum number of bits required to represent the value held
* in the MPI.
@@ -118,7 +118,7 @@
*
* \return The number of bits in \p A.
*/
-size_t mbedtls_mpi_core_bitlen( const mbedtls_mpi_uint *A, size_t A_limbs );
+size_t mbedtls_mpi_core_bitlen(const mbedtls_mpi_uint *A, size_t A_limbs);
/** Convert a big-endian byte array aligned to the size of mbedtls_mpi_uint
* into the storage form used by mbedtls_mpi.
@@ -126,8 +126,8 @@
* \param[in,out] A The address of the MPI.
* \param A_limbs The number of limbs of \p A.
*/
-void mbedtls_mpi_core_bigendian_to_host( mbedtls_mpi_uint *A,
- size_t A_limbs );
+void mbedtls_mpi_core_bigendian_to_host(mbedtls_mpi_uint *A,
+ size_t A_limbs);
/** \brief Compare a machine integer with an MPI.
*
@@ -141,9 +141,9 @@
*
* \return 1 if \p min is less than or equal to \p A, otherwise 0.
*/
-unsigned mbedtls_mpi_core_uint_le_mpi( mbedtls_mpi_uint min,
- const mbedtls_mpi_uint *A,
- size_t A_limbs );
+unsigned mbedtls_mpi_core_uint_le_mpi(mbedtls_mpi_uint min,
+ const mbedtls_mpi_uint *A,
+ size_t A_limbs);
/**
* \brief Perform a safe conditional copy of an MPI which doesn't reveal
@@ -166,10 +166,10 @@
* is indeterminate, and the resulting value in \p X might be
* neither its original value nor the value in \p A.
*/
-void mbedtls_mpi_core_cond_assign( mbedtls_mpi_uint *X,
- const mbedtls_mpi_uint *A,
- size_t limbs,
- unsigned char assign );
+void mbedtls_mpi_core_cond_assign(mbedtls_mpi_uint *X,
+ const mbedtls_mpi_uint *A,
+ size_t limbs,
+ unsigned char assign);
/**
* \brief Perform a safe conditional swap of two MPIs which doesn't reveal
@@ -192,10 +192,10 @@
* is indeterminate, and both \p X and \p Y might end up with
* values different to either of the original ones.
*/
-void mbedtls_mpi_core_cond_swap( mbedtls_mpi_uint *X,
- mbedtls_mpi_uint *Y,
- size_t limbs,
- unsigned char swap );
+void mbedtls_mpi_core_cond_swap(mbedtls_mpi_uint *X,
+ mbedtls_mpi_uint *Y,
+ size_t limbs,
+ unsigned char swap);
/** Import X from unsigned binary data, little-endian.
*
@@ -211,10 +211,10 @@
* \return #MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL if \p X isn't
* large enough to hold the value in \p input.
*/
-int mbedtls_mpi_core_read_le( mbedtls_mpi_uint *X,
- size_t X_limbs,
- const unsigned char *input,
- size_t input_length );
+int mbedtls_mpi_core_read_le(mbedtls_mpi_uint *X,
+ size_t X_limbs,
+ const unsigned char *input,
+ size_t input_length);
/** Import X from unsigned binary data, big-endian.
*
@@ -233,10 +233,10 @@
* \return #MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL if \p X isn't
* large enough to hold the value in \p input.
*/
-int mbedtls_mpi_core_read_be( mbedtls_mpi_uint *X,
- size_t X_limbs,
- const unsigned char *input,
- size_t input_length );
+int mbedtls_mpi_core_read_be(mbedtls_mpi_uint *X,
+ size_t X_limbs,
+ const unsigned char *input,
+ size_t input_length);
/** Export A into unsigned binary data, little-endian.
*
@@ -253,10 +253,10 @@
* \return #MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL if \p output isn't
* large enough to hold the value of \p A.
*/
-int mbedtls_mpi_core_write_le( const mbedtls_mpi_uint *A,
- size_t A_limbs,
- unsigned char *output,
- size_t output_length );
+int mbedtls_mpi_core_write_le(const mbedtls_mpi_uint *A,
+ size_t A_limbs,
+ unsigned char *output,
+ size_t output_length);
/** Export A into unsigned binary data, big-endian.
*
@@ -273,10 +273,10 @@
* \return #MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL if \p output isn't
* large enough to hold the value of \p A.
*/
-int mbedtls_mpi_core_write_be( const mbedtls_mpi_uint *A,
- size_t A_limbs,
- unsigned char *output,
- size_t output_length );
+int mbedtls_mpi_core_write_be(const mbedtls_mpi_uint *A,
+ size_t A_limbs,
+ unsigned char *output,
+ size_t output_length);
/** \brief Shift an MPI right in place by a number of bits.
*
@@ -290,8 +290,8 @@
* \param limbs The number of limbs of \p X. This must be at least 1.
* \param count The number of bits to shift by.
*/
-void mbedtls_mpi_core_shift_r( mbedtls_mpi_uint *X, size_t limbs,
- size_t count );
+void mbedtls_mpi_core_shift_r(mbedtls_mpi_uint *X, size_t limbs,
+ size_t count);
/**
* \brief Add two fixed-size large unsigned integers, returning the carry.
@@ -310,10 +310,10 @@
*
* \return 1 if `A + B >= 2^(biL*limbs)`, 0 otherwise.
*/
-mbedtls_mpi_uint mbedtls_mpi_core_add( mbedtls_mpi_uint *X,
- const mbedtls_mpi_uint *A,
- const mbedtls_mpi_uint *B,
- size_t limbs );
+mbedtls_mpi_uint mbedtls_mpi_core_add(mbedtls_mpi_uint *X,
+ const mbedtls_mpi_uint *A,
+ const mbedtls_mpi_uint *B,
+ size_t limbs);
/**
* \brief Conditional addition of two fixed-size large unsigned integers,
@@ -345,10 +345,10 @@
*
* \return 1 if `X + cond * A >= 2^(biL*limbs)`, 0 otherwise.
*/
-mbedtls_mpi_uint mbedtls_mpi_core_add_if( mbedtls_mpi_uint *X,
- const mbedtls_mpi_uint *A,
- size_t limbs,
- unsigned cond );
+mbedtls_mpi_uint mbedtls_mpi_core_add_if(mbedtls_mpi_uint *X,
+ const mbedtls_mpi_uint *A,
+ size_t limbs,
+ unsigned cond);
/**
* \brief Subtract two fixed-size large unsigned integers, returning the borrow.
@@ -368,10 +368,10 @@
* \return 1 if `A < B`.
* 0 if `A >= B`.
*/
-mbedtls_mpi_uint mbedtls_mpi_core_sub( mbedtls_mpi_uint *X,
- const mbedtls_mpi_uint *A,
- const mbedtls_mpi_uint *B,
- size_t limbs );
+mbedtls_mpi_uint mbedtls_mpi_core_sub(mbedtls_mpi_uint *X,
+ const mbedtls_mpi_uint *A,
+ const mbedtls_mpi_uint *B,
+ size_t limbs);
/**
* \brief Perform a fixed-size multiply accumulate operation: X += b * A
@@ -394,9 +394,9 @@
*
* \return The carry at the end of the operation.
*/
-mbedtls_mpi_uint mbedtls_mpi_core_mla( mbedtls_mpi_uint *X, size_t X_limbs,
- const mbedtls_mpi_uint *A, size_t A_limbs,
- mbedtls_mpi_uint b );
+mbedtls_mpi_uint mbedtls_mpi_core_mla(mbedtls_mpi_uint *X, size_t X_limbs,
+ const mbedtls_mpi_uint *A, size_t A_limbs,
+ mbedtls_mpi_uint b);
/**
* \brief Calculate initialisation value for fast Montgomery modular
@@ -407,7 +407,7 @@
*
* \return The initialisation value for fast Montgomery modular multiplication
*/
-mbedtls_mpi_uint mbedtls_mpi_core_montmul_init( const mbedtls_mpi_uint *N );
+mbedtls_mpi_uint mbedtls_mpi_core_montmul_init(const mbedtls_mpi_uint *N);
/**
* \brief Montgomery multiplication: X = A * B * R^-1 mod N (HAC 14.36)
@@ -444,11 +444,11 @@
* It must not alias or otherwise overlap any of the
* other parameters.
*/
-void mbedtls_mpi_core_montmul( mbedtls_mpi_uint *X,
- const mbedtls_mpi_uint *A,
- const mbedtls_mpi_uint *B, size_t B_limbs,
- const mbedtls_mpi_uint *N, size_t AN_limbs,
- mbedtls_mpi_uint mm, mbedtls_mpi_uint *T );
+void mbedtls_mpi_core_montmul(mbedtls_mpi_uint *X,
+ const mbedtls_mpi_uint *A,
+ const mbedtls_mpi_uint *B, size_t B_limbs,
+ const mbedtls_mpi_uint *N, size_t AN_limbs,
+ mbedtls_mpi_uint mm, mbedtls_mpi_uint *T);
/**
* \brief Calculate the square of the Montgomery constant. (Needed
@@ -465,8 +465,8 @@
* \return #MBEDTLS_ERR_MPI_DIVISION_BY_ZERO if \p N modulus is zero.
* \return #MBEDTLS_ERR_MPI_NEGATIVE_VALUE if \p N modulus is negative.
*/
-int mbedtls_mpi_core_get_mont_r2_unsafe( mbedtls_mpi *X,
- const mbedtls_mpi *N );
+int mbedtls_mpi_core_get_mont_r2_unsafe(mbedtls_mpi *X,
+ const mbedtls_mpi *N);
#if defined(MBEDTLS_TEST_HOOKS)
/**
@@ -481,11 +481,11 @@
* \param index The (secret) table index to look up. This must be in the
* range `0 .. count-1`.
*/
-void mbedtls_mpi_core_ct_uint_table_lookup( mbedtls_mpi_uint *dest,
- const mbedtls_mpi_uint *table,
- size_t limbs,
- size_t count,
- size_t index );
+void mbedtls_mpi_core_ct_uint_table_lookup(mbedtls_mpi_uint *dest,
+ const mbedtls_mpi_uint *table,
+ size_t limbs,
+ size_t count,
+ size_t index);
#endif /* MBEDTLS_TEST_HOOKS */
/**
@@ -507,10 +507,10 @@
* as a big-endian representation of an MPI; this can
* be relevant in applications like deterministic ECDSA.
*/
-int mbedtls_mpi_core_fill_random( mbedtls_mpi_uint *X, size_t X_limbs,
- size_t bytes,
- int (*f_rng)(void *, unsigned char *, size_t),
- void *p_rng );
+int mbedtls_mpi_core_fill_random(mbedtls_mpi_uint *X, size_t X_limbs,
+ size_t bytes,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng);
/** Generate a random number uniformly in a range.
*
@@ -542,12 +542,12 @@
* is significantly larger than \p min, which is the case
* for all usual cryptographic applications.
*/
-int mbedtls_mpi_core_random( mbedtls_mpi_uint *X,
- mbedtls_mpi_uint min,
- const mbedtls_mpi_uint *N,
- size_t limbs,
- int (*f_rng)(void *, unsigned char *, size_t),
- void *p_rng );
+int mbedtls_mpi_core_random(mbedtls_mpi_uint *X,
+ mbedtls_mpi_uint min,
+ const mbedtls_mpi_uint *N,
+ size_t limbs,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng);
/* BEGIN MERGE SLOT 1 */
@@ -568,7 +568,7 @@
* \return The number of limbs of working memory required by
* `mbedtls_mpi_core_exp_mod()`.
*/
-size_t mbedtls_mpi_core_exp_mod_working_limbs( size_t AN_limbs, size_t E_limbs );
+size_t mbedtls_mpi_core_exp_mod_working_limbs(size_t AN_limbs, size_t E_limbs);
/**
* \brief Perform a modular exponentiation with secret exponent:
@@ -597,12 +597,12 @@
* longer needed, and before freeing it if it was dynamically
* allocated.
*/
-void mbedtls_mpi_core_exp_mod( mbedtls_mpi_uint *X,
- const mbedtls_mpi_uint *A,
- const mbedtls_mpi_uint *N, size_t AN_limbs,
- const mbedtls_mpi_uint *E, size_t E_limbs,
- const mbedtls_mpi_uint *RR,
- mbedtls_mpi_uint *T );
+void mbedtls_mpi_core_exp_mod(mbedtls_mpi_uint *X,
+ const mbedtls_mpi_uint *A,
+ const mbedtls_mpi_uint *N, size_t AN_limbs,
+ const mbedtls_mpi_uint *E, size_t E_limbs,
+ const mbedtls_mpi_uint *RR,
+ mbedtls_mpi_uint *T);
/* END MERGE SLOT 1 */
@@ -624,10 +624,10 @@
* \return 1 if `A < b`.
* 0 if `A >= b`.
*/
-mbedtls_mpi_uint mbedtls_mpi_core_sub_int( mbedtls_mpi_uint *X,
- const mbedtls_mpi_uint *A,
- mbedtls_mpi_uint b,
- size_t limbs );
+mbedtls_mpi_uint mbedtls_mpi_core_sub_int(mbedtls_mpi_uint *X,
+ const mbedtls_mpi_uint *A,
+ mbedtls_mpi_uint b,
+ size_t limbs);
/**
* \brief Determine if a given MPI has the value \c 0 in constant time with
@@ -639,8 +639,8 @@
* \return 0 if `A == 0`
* non-0 (may be any value) if `A != 0`.
*/
-mbedtls_mpi_uint mbedtls_mpi_core_check_zero_ct( const mbedtls_mpi_uint *A,
- size_t limbs );
+mbedtls_mpi_uint mbedtls_mpi_core_check_zero_ct(const mbedtls_mpi_uint *A,
+ size_t limbs);
/**
* \brief Returns the number of limbs of working memory required for
@@ -654,9 +654,9 @@
* \return The number of limbs of working memory required by
* `mbedtls_mpi_core_montmul()` (or other similar function).
*/
-static inline size_t mbedtls_mpi_core_montmul_working_limbs( size_t AN_limbs )
+static inline size_t mbedtls_mpi_core_montmul_working_limbs(size_t AN_limbs)
{
- return( 2 * AN_limbs + 1 );
+ return 2 * AN_limbs + 1;
}
/** Convert an MPI into Montgomery form.
@@ -690,13 +690,13 @@
* It must not alias or otherwise overlap any of the
* other parameters.
*/
-void mbedtls_mpi_core_to_mont_rep( mbedtls_mpi_uint *X,
- const mbedtls_mpi_uint *A,
- const mbedtls_mpi_uint *N,
- size_t AN_limbs,
- mbedtls_mpi_uint mm,
- const mbedtls_mpi_uint *rr,
- mbedtls_mpi_uint *T );
+void mbedtls_mpi_core_to_mont_rep(mbedtls_mpi_uint *X,
+ const mbedtls_mpi_uint *A,
+ const mbedtls_mpi_uint *N,
+ size_t AN_limbs,
+ mbedtls_mpi_uint mm,
+ const mbedtls_mpi_uint *rr,
+ mbedtls_mpi_uint *T);
/** Convert an MPI from Montgomery form.
*
@@ -727,12 +727,12 @@
* It must not alias or otherwise overlap any of the
* other parameters.
*/
-void mbedtls_mpi_core_from_mont_rep( mbedtls_mpi_uint *X,
- const mbedtls_mpi_uint *A,
- const mbedtls_mpi_uint *N,
- size_t AN_limbs,
- mbedtls_mpi_uint mm,
- mbedtls_mpi_uint *T );
+void mbedtls_mpi_core_from_mont_rep(mbedtls_mpi_uint *X,
+ const mbedtls_mpi_uint *A,
+ const mbedtls_mpi_uint *N,
+ size_t AN_limbs,
+ mbedtls_mpi_uint mm,
+ mbedtls_mpi_uint *T);
/* END MERGE SLOT 3 */