diff --git a/library/bignum_core.c b/library/bignum_core.c index 83c115e11..473ef1ae2 100644 --- a/library/bignum_core.c +++ b/library/bignum_core.c @@ -163,15 +163,15 @@ void mbedtls_mpi_core_bigendian_to_host( mbedtls_mpi_uint *A, } void mbedtls_mpi_core_cond_assign( mbedtls_mpi_uint *X, - const mbedtls_mpi_uint *Y, + const mbedtls_mpi_uint *A, size_t limbs, unsigned char assign ) { - mbedtls_ct_mpi_uint_cond_assign( limbs, X, Y, assign ); + mbedtls_ct_mpi_uint_cond_assign( limbs, X, A, assign ); } -void mbedtls_mpi_core_cond_swap( mbedtls_mpi_uint *X, - mbedtls_mpi_uint *Y, +void mbedtls_mpi_core_cond_swap( mbedtls_mpi_uint *A, + mbedtls_mpi_uint *B, size_t limbs, unsigned char swap ) { @@ -180,9 +180,9 @@ void mbedtls_mpi_core_cond_swap( mbedtls_mpi_uint *X, for( size_t i = 0; i < limbs; i++ ) { - mbedtls_mpi_uint tmp = X[i]; - X[i] = ( X[i] & ~limb_mask ) | ( Y[i] & limb_mask ); - Y[i] = ( Y[i] & ~limb_mask ) | ( tmp & limb_mask ); + mbedtls_mpi_uint tmp = A[i]; + A[i] = ( A[i] & ~limb_mask ) | ( B[i] & limb_mask ); + B[i] = ( B[i] & ~limb_mask ) | ( tmp & limb_mask ); } } diff --git a/library/bignum_core.h b/library/bignum_core.h index cf7688d17..86180d3eb 100644 --- a/library/bignum_core.h +++ b/library/bignum_core.h @@ -80,11 +80,11 @@ void mbedtls_mpi_core_bigendian_to_host( mbedtls_mpi_uint *A, * * \param[OUT] X The address of the first MPI. This must be initialized. * It must have at least \p limbs limbs. - * \param[IN] Y The address of the second MPI. This must be initialized. - * \param limbs The number of limbs of \p Y. + * \param[IN] A The address of the second MPI. This must be initialized. + * \param limbs The number of limbs of \p A. * \param assign The condition deciding whether to perform the * assignment or not. Must be either 0 or 1: - * * \c 1: Perform the assignment `X = Y`. + * * \c 1: Perform the assignment `X = A`. * * \c 0: Keep the original value of \p X. * * \note This function avoids leaking any information about whether @@ -95,7 +95,7 @@ void mbedtls_mpi_core_bigendian_to_host( mbedtls_mpi_uint *A, * neither its original value nor the value in \p Y. */ void mbedtls_mpi_core_cond_assign( mbedtls_mpi_uint *X, - const mbedtls_mpi_uint *Y, + const mbedtls_mpi_uint *A, size_t limbs, unsigned char assign ); @@ -103,25 +103,25 @@ void mbedtls_mpi_core_cond_assign( mbedtls_mpi_uint *X, * \brief Perform a safe conditional swap of MPI which doesn't reveal whether * the condition was true or not. * - * \param[IN,OUT] X The address of the first MPI. + * \param[IN,OUT] A The address of the first MPI. * This must be initialized. - * \param[IN,OUT] Y The address of the second MPI. + * \param[IN,OUT] B The address of the second MPI. * This must be initialized. - * \param limbs The number of limbs of \p Y and \p X. + * \param limbs The number of limbs of \p A and \p B. * \param swap The condition deciding whether to perform * the swap or not. Must be either 0 or 1: - * * \c 1: Swap the values of \p X and \p Y. - * * \c 0: Keep the original values of \p X and \p Y. + * * \c 1: Swap the values of \p A and \p B. + * * \c 0: Keep the original values of \p A and \p B. * * \note This function avoids leaking any information about whether * the swap was done or not. * * \warning If \p swap is neither 0 nor 1, the result of this function - * is indeterminate, and both \p X and \p Y might end up with + * is indeterminate, and both \p A and \p B 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, +void mbedtls_mpi_core_cond_swap( mbedtls_mpi_uint *A, + mbedtls_mpi_uint *B, size_t limbs, unsigned char swap ); diff --git a/library/bignum_mod_raw.c b/library/bignum_mod_raw.c index 3c7f88966..82ef645f0 100644 --- a/library/bignum_mod_raw.c +++ b/library/bignum_mod_raw.c @@ -42,19 +42,19 @@ #include "constant_time_internal.h" void mbedtls_mpi_mod_raw_cond_assign( mbedtls_mpi_uint *X, - const mbedtls_mpi_uint *Y, + const mbedtls_mpi_uint *A, const mbedtls_mpi_mod_modulus *m, unsigned char assign ) { - mbedtls_mpi_core_cond_assign( X, Y, m->limbs, assign ); + mbedtls_mpi_core_cond_assign( X, A, m->limbs, assign ); } -void mbedtls_mpi_mod_raw_cond_swap( mbedtls_mpi_uint *X, - mbedtls_mpi_uint *Y, +void mbedtls_mpi_mod_raw_cond_swap( mbedtls_mpi_uint *A, + mbedtls_mpi_uint *B, const mbedtls_mpi_mod_modulus *m, unsigned char swap ) { - mbedtls_mpi_core_cond_swap( X, Y, m->limbs, swap ); + mbedtls_mpi_core_cond_swap( A, B, m->limbs, swap ); } int mbedtls_mpi_mod_raw_read( mbedtls_mpi_uint *X, diff --git a/library/bignum_mod_raw.h b/library/bignum_mod_raw.h index 60c8d8acf..edd356ce2 100644 --- a/library/bignum_mod_raw.h +++ b/library/bignum_mod_raw.h @@ -38,11 +38,11 @@ * the condition was true or not. * * \param[OUT] X The address of the first MPI. This must be initialized. - * \param[IN] Y The address of the second MPI. This must be initialized. - * \param[IN] m The address of the modulus related to \p X and \p Y. + * \param[IN] A The address of the second MPI. This must be initialized. + * \param[IN] m The address of the modulus related to \p X and \p A. * \param assign The condition deciding whether to perform the * assignment or not. Must be either 0 or 1: - * * \c 1: Perform the assignment `X = Y`. + * * \c 1: Perform the assignment `X = A`. * * \c 0: Keep the original value of \p X. * * \note This function avoids leaking any information about whether @@ -50,10 +50,10 @@ * * \warning If \p assign is neither 0 nor 1, the result of this function * is indeterminate, and the resulting value in \p X might be - * neither its original value nor the value in \p Y. + * neither its original value nor the value in \p B. */ void mbedtls_mpi_mod_raw_cond_assign( mbedtls_mpi_uint *X, - const mbedtls_mpi_uint *Y, + const mbedtls_mpi_uint *A, const mbedtls_mpi_mod_modulus *m, unsigned char assign ); @@ -61,23 +61,23 @@ void mbedtls_mpi_mod_raw_cond_assign( mbedtls_mpi_uint *X, * \brief Perform a safe conditional swap of MPI which doesn't reveal whether * the condition was true or not. * - * \param[IN,OUT] X The address of the first MPI. This must be initialized. - * \param[IN,OUT] Y The address of the second MPI. This must be initialized. - * \param[IN] m The address of the modulus related to \p X and \p Y. + * \param[IN,OUT] A The address of the first MPI. This must be initialized. + * \param[IN,OUT] B The address of the second MPI. This must be initialized. + * \param[IN] m The address of the modulus related to \p A and \p B. * \param swap The condition deciding whether to perform * the swap or not. Must be either 0 or 1: - * * \c 1: Swap the values of \p X and \p Y. - * * \c 0: Keep the original values of \p X and \p Y. + * * \c 1: Swap the values of \p A and \p B. + * * \c 0: Keep the original values of \p A and \p B. * * \note This function avoids leaking any information about whether * the swap was done or not. * * \warning If \p swap is neither 0 nor 1, the result of this function - * is indeterminate, and both \p X and \p Y might end up with + * is indeterminate, and both \p A and \p B might end up with * values different to either of the original ones. */ -void mbedtls_mpi_mod_raw_cond_swap( mbedtls_mpi_uint *X, - mbedtls_mpi_uint *Y, +void mbedtls_mpi_mod_raw_cond_swap( mbedtls_mpi_uint *A, + mbedtls_mpi_uint *B, const mbedtls_mpi_mod_modulus *m, unsigned char swap );