yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bignum: Removed merge scaffolding.

Browse source 
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
This commit is contained in:
Minos Galanakis 2023-03-21 10:04:12 +00:00
parent 56f59d749c
commit 00bd8925a7
16 changed files with 0 additions and 579 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
library/bignum_core.c
View file

@ -640,8 +640,6 @@ cleanup:
return ret; return ret;
} }
/* BEGIN MERGE SLOT 1 */
static size_t exp_mod_get_window_size(size_t Ebits) static size_t exp_mod_get_window_size(size_t Ebits)
{ {
size_t wsize = (Ebits > 671) ? 6 : (Ebits > 239) ? 5 : size_t wsize = (Ebits > 671) ? 6 : (Ebits > 239) ? 5 :
@ -791,14 +789,6 @@ void mbedtls_mpi_core_exp_mod(mbedtls_mpi_uint *X,
} while (!(E_bit_index == 0 && E_limb_index == 0)); } while (!(E_bit_index == 0 && E_limb_index == 0));
} }
/* END MERGE SLOT 1 */
/* BEGIN MERGE SLOT 2 */
/* END MERGE SLOT 2 */
/* BEGIN MERGE SLOT 3 */
mbedtls_mpi_uint mbedtls_mpi_core_sub_int(mbedtls_mpi_uint *X, mbedtls_mpi_uint mbedtls_mpi_core_sub_int(mbedtls_mpi_uint *X,
const mbedtls_mpi_uint *A, const mbedtls_mpi_uint *A,
mbedtls_mpi_uint c, /* doubles as carry */ mbedtls_mpi_uint c, /* doubles as carry */
@ -849,34 +839,4 @@ void mbedtls_mpi_core_from_mont_rep(mbedtls_mpi_uint *X,
mbedtls_mpi_core_montmul(X, A, &Rinv, 1, N, AN_limbs, mm, T); mbedtls_mpi_core_montmul(X, A, &Rinv, 1, N, AN_limbs, mm, T);
} }
/* END MERGE SLOT 3 */
/* BEGIN MERGE SLOT 4 */
/* END MERGE SLOT 4 */
/* BEGIN MERGE SLOT 5 */
/* END MERGE SLOT 5 */
/* BEGIN MERGE SLOT 6 */
/* END MERGE SLOT 6 */
/* BEGIN MERGE SLOT 7 */
/* END MERGE SLOT 7 */
/* BEGIN MERGE SLOT 8 */
/* END MERGE SLOT 8 */
/* BEGIN MERGE SLOT 9 */
/* END MERGE SLOT 9 */
/* BEGIN MERGE SLOT 10 */
/* END MERGE SLOT 10 */
#endif /* MBEDTLS_BIGNUM_C */ #endif /* MBEDTLS_BIGNUM_C */

40
library/bignum_core.h
View file

@ -569,8 +569,6 @@ int mbedtls_mpi_core_random(mbedtls_mpi_uint *X,
int (*f_rng)(void *, unsigned char *, size_t), int (*f_rng)(void *, unsigned char *, size_t),
void *p_rng); void *p_rng);
/* BEGIN MERGE SLOT 1 */
/** /**
* \brief Returns the number of limbs of working memory required for * \brief Returns the number of limbs of working memory required for
* a call to `mbedtls_mpi_core_exp_mod()`. * a call to `mbedtls_mpi_core_exp_mod()`.
@ -624,14 +622,6 @@ void mbedtls_mpi_core_exp_mod(mbedtls_mpi_uint *X,
const mbedtls_mpi_uint *RR, const mbedtls_mpi_uint *RR,
mbedtls_mpi_uint *T); mbedtls_mpi_uint *T);
/* END MERGE SLOT 1 */
/* BEGIN MERGE SLOT 2 */
/* END MERGE SLOT 2 */
/* BEGIN MERGE SLOT 3 */
/** /**
* \brief Subtract unsigned integer from known-size large unsigned integers. * \brief Subtract unsigned integer from known-size large unsigned integers.
* Return the borrow. * Return the borrow.
@ -754,34 +744,4 @@ void mbedtls_mpi_core_from_mont_rep(mbedtls_mpi_uint *X,
mbedtls_mpi_uint mm, mbedtls_mpi_uint mm,
mbedtls_mpi_uint *T); mbedtls_mpi_uint *T);
/* END MERGE SLOT 3 */
/* BEGIN MERGE SLOT 4 */
/* END MERGE SLOT 4 */
/* BEGIN MERGE SLOT 5 */
/* END MERGE SLOT 5 */
/* BEGIN MERGE SLOT 6 */
/* END MERGE SLOT 6 */
/* BEGIN MERGE SLOT 7 */
/* END MERGE SLOT 7 */
/* BEGIN MERGE SLOT 8 */
/* END MERGE SLOT 8 */
/* BEGIN MERGE SLOT 9 */
/* END MERGE SLOT 9 */
/* BEGIN MERGE SLOT 10 */
/* END MERGE SLOT 10 */
#endif /* MBEDTLS_BIGNUM_CORE_H */ #endif /* MBEDTLS_BIGNUM_CORE_H */

34
library/bignum_mod.c
View file

@ -171,12 +171,6 @@ exit:
return ret; return ret;
} }
/* BEGIN MERGE SLOT 1 */
/* END MERGE SLOT 1 */
/* BEGIN MERGE SLOT 2 */
int mbedtls_mpi_mod_mul(mbedtls_mpi_mod_residue *X, int mbedtls_mpi_mod_mul(mbedtls_mpi_mod_residue *X,
const mbedtls_mpi_mod_residue *A, const mbedtls_mpi_mod_residue *A,
const mbedtls_mpi_mod_residue *B, const mbedtls_mpi_mod_residue *B,
@ -202,9 +196,6 @@ int mbedtls_mpi_mod_mul(mbedtls_mpi_mod_residue *X,
return 0; return 0;
} }
/* END MERGE SLOT 2 */
/* BEGIN MERGE SLOT 3 */
int mbedtls_mpi_mod_sub(mbedtls_mpi_mod_residue *X, int mbedtls_mpi_mod_sub(mbedtls_mpi_mod_residue *X,
const mbedtls_mpi_mod_residue *A, const mbedtls_mpi_mod_residue *A,
const mbedtls_mpi_mod_residue *B, const mbedtls_mpi_mod_residue *B,
@ -309,13 +300,7 @@ int mbedtls_mpi_mod_inv(mbedtls_mpi_mod_residue *X,
return ret; return ret;
} }
/* END MERGE SLOT 3 */
/* BEGIN MERGE SLOT 4 */
/* END MERGE SLOT 4 */
/* BEGIN MERGE SLOT 5 */
int mbedtls_mpi_mod_add(mbedtls_mpi_mod_residue *X, int mbedtls_mpi_mod_add(mbedtls_mpi_mod_residue *X,
const mbedtls_mpi_mod_residue *A, const mbedtls_mpi_mod_residue *A,
const mbedtls_mpi_mod_residue *B, const mbedtls_mpi_mod_residue *B,
@ -329,9 +314,6 @@ int mbedtls_mpi_mod_add(mbedtls_mpi_mod_residue *X,
return 0; return 0;
} }
/* END MERGE SLOT 5 */
/* BEGIN MERGE SLOT 6 */
int mbedtls_mpi_mod_random(mbedtls_mpi_mod_residue *X, int mbedtls_mpi_mod_random(mbedtls_mpi_mod_residue *X,
mbedtls_mpi_uint min, mbedtls_mpi_uint min,
@ -345,9 +327,6 @@ int mbedtls_mpi_mod_random(mbedtls_mpi_mod_residue *X,
return mbedtls_mpi_mod_raw_random(X->p, min, N, f_rng, p_rng); return mbedtls_mpi_mod_raw_random(X->p, min, N, f_rng, p_rng);
} }
/* END MERGE SLOT 6 */
/* BEGIN MERGE SLOT 7 */
int mbedtls_mpi_mod_read(mbedtls_mpi_mod_residue *r, int mbedtls_mpi_mod_read(mbedtls_mpi_mod_residue *r,
const mbedtls_mpi_mod_modulus *N, const mbedtls_mpi_mod_modulus *N,
const unsigned char *buf, const unsigned char *buf,
@ -417,18 +396,5 @@ cleanup:
return ret; return ret;
} }
/* END MERGE SLOT 7 */
/* BEGIN MERGE SLOT 8 */
/* END MERGE SLOT 8 */
/* BEGIN MERGE SLOT 9 */
/* END MERGE SLOT 9 */
/* BEGIN MERGE SLOT 10 */
/* END MERGE SLOT 10 */
#endif /* MBEDTLS_BIGNUM_C */ #endif /* MBEDTLS_BIGNUM_C */

35
library/bignum_mod.h
View file

@ -220,12 +220,6 @@ int mbedtls_mpi_mod_modulus_setup(mbedtls_mpi_mod_modulus *N,
*/ */
void mbedtls_mpi_mod_modulus_free(mbedtls_mpi_mod_modulus *N); void mbedtls_mpi_mod_modulus_free(mbedtls_mpi_mod_modulus *N);
/* BEGIN MERGE SLOT 1 */
/* END MERGE SLOT 1 */
/* BEGIN MERGE SLOT 2 */
/** \brief Multiply two residues, returning the residue modulo the specified /** \brief Multiply two residues, returning the residue modulo the specified
* modulus. * modulus.
* *
@ -260,9 +254,6 @@ int mbedtls_mpi_mod_mul(mbedtls_mpi_mod_residue *X,
const mbedtls_mpi_mod_residue *B, const mbedtls_mpi_mod_residue *B,
const mbedtls_mpi_mod_modulus *N); const mbedtls_mpi_mod_modulus *N);
/* END MERGE SLOT 2 */
/* BEGIN MERGE SLOT 3 */
/** /**
* \brief Perform a fixed-size modular subtraction. * \brief Perform a fixed-size modular subtraction.
* *
@ -321,13 +312,6 @@ int mbedtls_mpi_mod_sub(mbedtls_mpi_mod_residue *X,
int mbedtls_mpi_mod_inv(mbedtls_mpi_mod_residue *X, int mbedtls_mpi_mod_inv(mbedtls_mpi_mod_residue *X,
const mbedtls_mpi_mod_residue *A, const mbedtls_mpi_mod_residue *A,
const mbedtls_mpi_mod_modulus *N); const mbedtls_mpi_mod_modulus *N);
/* END MERGE SLOT 3 */
/* BEGIN MERGE SLOT 4 */
/* END MERGE SLOT 4 */
/* BEGIN MERGE SLOT 5 */
/** /**
* \brief Perform a fixed-size modular addition. * \brief Perform a fixed-size modular addition.
* *
@ -358,9 +342,6 @@ int mbedtls_mpi_mod_add(mbedtls_mpi_mod_residue *X,
const mbedtls_mpi_mod_residue *A, const mbedtls_mpi_mod_residue *A,
const mbedtls_mpi_mod_residue *B, const mbedtls_mpi_mod_residue *B,
const mbedtls_mpi_mod_modulus *N); const mbedtls_mpi_mod_modulus *N);
/* END MERGE SLOT 5 */
/* BEGIN MERGE SLOT 6 */
/** Generate a random number uniformly in a range. /** Generate a random number uniformly in a range.
* *
@ -395,9 +376,6 @@ int mbedtls_mpi_mod_random(mbedtls_mpi_mod_residue *X,
int (*f_rng)(void *, unsigned char *, size_t), int (*f_rng)(void *, unsigned char *, size_t),
void *p_rng); void *p_rng);
/* END MERGE SLOT 6 */
/* BEGIN MERGE SLOT 7 */
/** Read a residue from a byte buffer. /** Read a residue from a byte buffer.
* *
* The residue will be automatically converted to the internal representation * The residue will be automatically converted to the internal representation
@ -464,18 +442,5 @@ int mbedtls_mpi_mod_write(const mbedtls_mpi_mod_residue *r,
unsigned char *buf, unsigned char *buf,
size_t buflen, size_t buflen,
mbedtls_mpi_mod_ext_rep ext_rep); mbedtls_mpi_mod_ext_rep ext_rep);
/* END MERGE SLOT 7 */
/* BEGIN MERGE SLOT 8 */
/* END MERGE SLOT 8 */
/* BEGIN MERGE SLOT 9 */
/* END MERGE SLOT 9 */
/* BEGIN MERGE SLOT 10 */
/* END MERGE SLOT 10 */
#endif /* MBEDTLS_BIGNUM_MOD_H */ #endif /* MBEDTLS_BIGNUM_MOD_H */

36
library/bignum_mod_raw.c
View file

@ -104,12 +104,6 @@ int mbedtls_mpi_mod_raw_write(const mbedtls_mpi_uint *A,
} }
} }
/* BEGIN MERGE SLOT 1 */
/* END MERGE SLOT 1 */
/* BEGIN MERGE SLOT 2 */
void mbedtls_mpi_mod_raw_sub(mbedtls_mpi_uint *X, void mbedtls_mpi_mod_raw_sub(mbedtls_mpi_uint *X,
const mbedtls_mpi_uint *A, const mbedtls_mpi_uint *A,
const mbedtls_mpi_uint *B, const mbedtls_mpi_uint *B,
@ -143,10 +137,6 @@ void mbedtls_mpi_mod_raw_mul(mbedtls_mpi_uint *X,
N->rep.mont.mm, T); N->rep.mont.mm, T);
} }
/* END MERGE SLOT 2 */
/* BEGIN MERGE SLOT 3 */
size_t mbedtls_mpi_mod_raw_inv_prime_working_limbs(size_t AN_limbs) size_t mbedtls_mpi_mod_raw_inv_prime_working_limbs(size_t AN_limbs)
{ {
/* mbedtls_mpi_mod_raw_inv_prime() needs a temporary for the exponent, /* mbedtls_mpi_mod_raw_inv_prime() needs a temporary for the exponent,
@ -178,13 +168,6 @@ void mbedtls_mpi_mod_raw_inv_prime(mbedtls_mpi_uint *X,
RR, T + AN_limbs); RR, T + AN_limbs);
} }
/* END MERGE SLOT 3 */
/* BEGIN MERGE SLOT 4 */
/* END MERGE SLOT 4 */
/* BEGIN MERGE SLOT 5 */
void mbedtls_mpi_mod_raw_add(mbedtls_mpi_uint *X, void mbedtls_mpi_mod_raw_add(mbedtls_mpi_uint *X,
const mbedtls_mpi_uint *A, const mbedtls_mpi_uint *A,
const mbedtls_mpi_uint *B, const mbedtls_mpi_uint *B,
@ -195,9 +178,6 @@ void mbedtls_mpi_mod_raw_add(mbedtls_mpi_uint *X,
borrow = mbedtls_mpi_core_sub(X, X, N->p, N->limbs); borrow = mbedtls_mpi_core_sub(X, X, N->p, N->limbs);
(void) mbedtls_mpi_core_add_if(X, N->p, N->limbs, (unsigned) (carry ^ borrow)); (void) mbedtls_mpi_core_add_if(X, N->p, N->limbs, (unsigned) (carry ^ borrow));
} }
/* END MERGE SLOT 5 */
/* BEGIN MERGE SLOT 6 */
int mbedtls_mpi_mod_raw_canonical_to_modulus_rep( int mbedtls_mpi_mod_raw_canonical_to_modulus_rep(
mbedtls_mpi_uint *X, mbedtls_mpi_uint *X,
@ -240,9 +220,6 @@ int mbedtls_mpi_mod_raw_random(mbedtls_mpi_uint *X,
return mbedtls_mpi_mod_raw_canonical_to_modulus_rep(X, N); return mbedtls_mpi_mod_raw_canonical_to_modulus_rep(X, N);
} }
/* END MERGE SLOT 6 */
/* BEGIN MERGE SLOT 7 */
int mbedtls_mpi_mod_raw_to_mont_rep(mbedtls_mpi_uint *X, int mbedtls_mpi_mod_raw_to_mont_rep(mbedtls_mpi_uint *X,
const mbedtls_mpi_mod_modulus *N) const mbedtls_mpi_mod_modulus *N)
{ {
@ -289,18 +266,5 @@ void mbedtls_mpi_mod_raw_neg(mbedtls_mpi_uint *X,
mbedtls_mpi_uint borrow = mbedtls_mpi_core_sub(X, X, N->p, N->limbs); mbedtls_mpi_uint borrow = mbedtls_mpi_core_sub(X, X, N->p, N->limbs);
(void) mbedtls_mpi_core_add_if(X, N->p, N->limbs, (unsigned) borrow); (void) mbedtls_mpi_core_add_if(X, N->p, N->limbs, (unsigned) borrow);
} }
/* END MERGE SLOT 7 */
/* BEGIN MERGE SLOT 8 */
/* END MERGE SLOT 8 */
/* BEGIN MERGE SLOT 9 */
/* END MERGE SLOT 9 */
/* BEGIN MERGE SLOT 10 */
/* END MERGE SLOT 10 */
#endif /* MBEDTLS_BIGNUM_C */ #endif /* MBEDTLS_BIGNUM_C */

36
library/bignum_mod_raw.h
View file

@ -187,12 +187,6 @@ int mbedtls_mpi_mod_raw_write(const mbedtls_mpi_uint *A,
size_t output_length, size_t output_length,
mbedtls_mpi_mod_ext_rep ext_rep); mbedtls_mpi_mod_ext_rep ext_rep);
/* BEGIN MERGE SLOT 1 */
/* END MERGE SLOT 1 */
/* BEGIN MERGE SLOT 2 */
/** \brief Subtract two MPIs, returning the residue modulo the specified /** \brief Subtract two MPIs, returning the residue modulo the specified
* modulus. * modulus.
* *
@ -250,10 +244,6 @@ void mbedtls_mpi_mod_raw_mul(mbedtls_mpi_uint *X,
const mbedtls_mpi_mod_modulus *N, const mbedtls_mpi_mod_modulus *N,
mbedtls_mpi_uint *T); mbedtls_mpi_uint *T);
/* END MERGE SLOT 2 */
/* BEGIN MERGE SLOT 3 */
/** /**
* \brief Returns the number of limbs of working memory required for * \brief Returns the number of limbs of working memory required for
* a call to `mbedtls_mpi_mod_raw_inv_prime()`. * a call to `mbedtls_mpi_mod_raw_inv_prime()`.
@ -303,13 +293,6 @@ void mbedtls_mpi_mod_raw_inv_prime(mbedtls_mpi_uint *X,
const mbedtls_mpi_uint *RR, const mbedtls_mpi_uint *RR,
mbedtls_mpi_uint *T); mbedtls_mpi_uint *T);
/* END MERGE SLOT 3 */
/* BEGIN MERGE SLOT 4 */
/* END MERGE SLOT 4 */
/* BEGIN MERGE SLOT 5 */
/** /**
* \brief Perform a known-size modular addition. * \brief Perform a known-size modular addition.
* *
@ -332,9 +315,6 @@ void mbedtls_mpi_mod_raw_add(mbedtls_mpi_uint *X,
const mbedtls_mpi_uint *A, const mbedtls_mpi_uint *A,
const mbedtls_mpi_uint *B, const mbedtls_mpi_uint *B,
const mbedtls_mpi_mod_modulus *N); const mbedtls_mpi_mod_modulus *N);
/* END MERGE SLOT 5 */
/* BEGIN MERGE SLOT 6 */
/** Convert an MPI from canonical representation (little-endian limb array) /** Convert an MPI from canonical representation (little-endian limb array)
* to the representation associated with the modulus. * to the representation associated with the modulus.
@ -404,9 +384,6 @@ int mbedtls_mpi_mod_raw_random(mbedtls_mpi_uint *X,
int (*f_rng)(void *, unsigned char *, size_t), int (*f_rng)(void *, unsigned char *, size_t),
void *p_rng); void *p_rng);
/* END MERGE SLOT 6 */
/* BEGIN MERGE SLOT 7 */
/** Convert an MPI into Montgomery form. /** Convert an MPI into Montgomery form.
* *
* \param X The address of the MPI. * \param X The address of the MPI.
@ -447,18 +424,5 @@ int mbedtls_mpi_mod_raw_from_mont_rep(mbedtls_mpi_uint *X,
void mbedtls_mpi_mod_raw_neg(mbedtls_mpi_uint *X, void mbedtls_mpi_mod_raw_neg(mbedtls_mpi_uint *X,
const mbedtls_mpi_uint *A, const mbedtls_mpi_uint *A,
const mbedtls_mpi_mod_modulus *N); const mbedtls_mpi_mod_modulus *N);
/* END MERGE SLOT 7 */
/* BEGIN MERGE SLOT 8 */
/* END MERGE SLOT 8 */
/* BEGIN MERGE SLOT 9 */
/* END MERGE SLOT 9 */
/* BEGIN MERGE SLOT 10 */
/* END MERGE SLOT 10 */
#endif /* MBEDTLS_BIGNUM_MOD_RAW_H */ #endif /* MBEDTLS_BIGNUM_MOD_RAW_H */

40
scripts/mbedtls_dev/bignum_common.py
View file

@ -389,43 +389,3 @@ class ModOperationCommon(OperationCommon):
lambda test_object: test_object.is_valid, lambda test_object: test_object.is_valid,
chain(test_objects, special_cases) chain(test_objects, special_cases)
)) ))
# BEGIN MERGE SLOT 1
# END MERGE SLOT 1
# BEGIN MERGE SLOT 2
# END MERGE SLOT 2
# BEGIN MERGE SLOT 3
# END MERGE SLOT 3
# BEGIN MERGE SLOT 4
# END MERGE SLOT 4
# BEGIN MERGE SLOT 5
# END MERGE SLOT 5
# BEGIN MERGE SLOT 6
# END MERGE SLOT 6
# BEGIN MERGE SLOT 7
# END MERGE SLOT 7
# BEGIN MERGE SLOT 8
# END MERGE SLOT 8
# BEGIN MERGE SLOT 9
# END MERGE SLOT 9
# BEGIN MERGE SLOT 10
# END MERGE SLOT 10

38
scripts/mbedtls_dev/bignum_core.py
View file

@ -774,7 +774,6 @@ def mpi_modmul_case_generate() -> None:
i += 1 i += 1
print(generated_inputs) print(generated_inputs)
# BEGIN MERGE SLOT 1
class BignumCoreExpMod(BignumCoreTarget, bignum_common.ModOperationCommon): class BignumCoreExpMod(BignumCoreTarget, bignum_common.ModOperationCommon):
"""Test cases for bignum core exponentiation.""" """Test cases for bignum core exponentiation."""
@ -796,13 +795,6 @@ class BignumCoreExpMod(BignumCoreTarget, bignum_common.ModOperationCommon):
# the modulus (see for example exponent blinding) # the modulus (see for example exponent blinding)
return bool(self.int_a < self.int_n) return bool(self.int_a < self.int_n)
# END MERGE SLOT 1
# BEGIN MERGE SLOT 2
# END MERGE SLOT 2
# BEGIN MERGE SLOT 3
class BignumCoreSubInt(BignumCoreTarget, bignum_common.OperationCommon): class BignumCoreSubInt(BignumCoreTarget, bignum_common.OperationCommon):
"""Test cases for bignum core sub int.""" """Test cases for bignum core sub int."""
@ -848,33 +840,3 @@ class BignumCoreZeroCheckCT(BignumCoreTarget, bignum_common.OperationCommon):
def result(self) -> List[str]: def result(self) -> List[str]:
result = 1 if self.int_a == 0 else 0 result = 1 if self.int_a == 0 else 0
return [str(result)] return [str(result)]
# END MERGE SLOT 3
# BEGIN MERGE SLOT 4
# END MERGE SLOT 4
# BEGIN MERGE SLOT 5
# END MERGE SLOT 5
# BEGIN MERGE SLOT 6
# END MERGE SLOT 6
# BEGIN MERGE SLOT 7
# END MERGE SLOT 7
# BEGIN MERGE SLOT 8
# END MERGE SLOT 8
# BEGIN MERGE SLOT 9
# END MERGE SLOT 9
# BEGIN MERGE SLOT 10
# END MERGE SLOT 10

37
scripts/mbedtls_dev/bignum_mod.py
View file

@ -25,11 +25,6 @@ class BignumModTarget(test_data_generation.BaseTarget):
"""Target for bignum mod test case generation.""" """Target for bignum mod test case generation."""
target_basename = 'test_suite_bignum_mod.generated' target_basename = 'test_suite_bignum_mod.generated'
# BEGIN MERGE SLOT 1
# END MERGE SLOT 1
# BEGIN MERGE SLOT 2
class BignumModMul(bignum_common.ModOperationCommon, class BignumModMul(bignum_common.ModOperationCommon,
BignumModTarget): BignumModTarget):
@ -51,9 +46,6 @@ class BignumModMul(bignum_common.ModOperationCommon,
result = (self.int_a * self.int_b) % self.int_n result = (self.int_a * self.int_b) % self.int_n
return [self.format_result(self.to_montgomery(result))] return [self.format_result(self.to_montgomery(result))]
# END MERGE SLOT 2
# BEGIN MERGE SLOT 3
class BignumModSub(bignum_common.ModOperationCommon, BignumModTarget): class BignumModSub(bignum_common.ModOperationCommon, BignumModTarget):
"""Test cases for bignum mpi_mod_sub().""" """Test cases for bignum mpi_mod_sub()."""
@ -105,13 +97,7 @@ class BignumModInvMont(bignum_common.ModOperationCommon, BignumModTarget):
# generated cases # generated cases
return [self.format_result(mont_result), "0"] return [self.format_result(mont_result), "0"]
# END MERGE SLOT 3
# BEGIN MERGE SLOT 4
# END MERGE SLOT 4
# BEGIN MERGE SLOT 5
class BignumModAdd(bignum_common.ModOperationCommon, BignumModTarget): class BignumModAdd(bignum_common.ModOperationCommon, BignumModTarget):
"""Test cases for bignum mpi_mod_add().""" """Test cases for bignum mpi_mod_add()."""
count = 0 count = 0
@ -125,26 +111,3 @@ class BignumModAdd(bignum_common.ModOperationCommon, BignumModTarget):
# To make negative tests easier, append "0" for success to the # To make negative tests easier, append "0" for success to the
# generated cases # generated cases
return [self.format_result(result), "0"] return [self.format_result(result), "0"]
# END MERGE SLOT 5
# BEGIN MERGE SLOT 6
# END MERGE SLOT 6
# BEGIN MERGE SLOT 7
# END MERGE SLOT 7
# BEGIN MERGE SLOT 8
# END MERGE SLOT 8
# BEGIN MERGE SLOT 9
# END MERGE SLOT 9
# BEGIN MERGE SLOT 10
# END MERGE SLOT 10

34
scripts/mbedtls_dev/bignum_mod_raw.py
View file

@ -26,11 +26,6 @@ class BignumModRawTarget(test_data_generation.BaseTarget):
"""Target for bignum mod_raw test case generation.""" """Target for bignum mod_raw test case generation."""
target_basename = 'test_suite_bignum_mod_raw.generated' target_basename = 'test_suite_bignum_mod_raw.generated'
# BEGIN MERGE SLOT 1
# END MERGE SLOT 1
# BEGIN MERGE SLOT 2
class BignumModRawSub(bignum_common.ModOperationCommon, class BignumModRawSub(bignum_common.ModOperationCommon,
BignumModRawTarget): BignumModRawTarget):
@ -101,9 +96,6 @@ class BignumModRawMul(bignum_common.ModOperationCommon,
result = (self.int_a * self.int_b) % self.int_n result = (self.int_a * self.int_b) % self.int_n
return [self.format_result(self.to_montgomery(result))] return [self.format_result(self.to_montgomery(result))]
# END MERGE SLOT 2
# BEGIN MERGE SLOT 3
class BignumModRawInvPrime(bignum_common.ModOperationCommon, class BignumModRawInvPrime(bignum_common.ModOperationCommon,
BignumModRawTarget): BignumModRawTarget):
@ -123,13 +115,6 @@ class BignumModRawInvPrime(bignum_common.ModOperationCommon,
mont_result = self.to_montgomery(result) mont_result = self.to_montgomery(result)
return [self.format_result(mont_result)] return [self.format_result(mont_result)]
# END MERGE SLOT 3
# BEGIN MERGE SLOT 4
# END MERGE SLOT 4
# BEGIN MERGE SLOT 5
class BignumModRawAdd(bignum_common.ModOperationCommon, class BignumModRawAdd(bignum_common.ModOperationCommon,
BignumModRawTarget): BignumModRawTarget):
@ -144,9 +129,6 @@ class BignumModRawAdd(bignum_common.ModOperationCommon,
result = (self.int_a + self.int_b) % self.int_n result = (self.int_a + self.int_b) % self.int_n
return [self.format_result(result)] return [self.format_result(result)]
# END MERGE SLOT 5
# BEGIN MERGE SLOT 6
class BignumModRawConvertRep(bignum_common.ModOperationCommon, class BignumModRawConvertRep(bignum_common.ModOperationCommon,
BignumModRawTarget): BignumModRawTarget):
@ -230,9 +212,6 @@ class BignumModRawModulusToCanonicalRep(BignumModRawConvertRep):
def result(self) -> List[str]: def result(self) -> List[str]:
return [self.format_result(self.int_a)] return [self.format_result(self.int_a)]
# END MERGE SLOT 6
# BEGIN MERGE SLOT 7
class BignumModRawConvertToMont(bignum_common.ModOperationCommon, class BignumModRawConvertToMont(bignum_common.ModOperationCommon,
BignumModRawTarget): BignumModRawTarget):
@ -272,16 +251,3 @@ class BignumModRawModNegate(bignum_common.ModOperationCommon,
def result(self) -> List[str]: def result(self) -> List[str]:
result = (self.int_n - self.int_a) % self.int_n result = (self.int_n - self.int_a) % self.int_n
return [self.format_result(result)] return [self.format_result(result)]
# END MERGE SLOT 7
# BEGIN MERGE SLOT 8
# END MERGE SLOT 8
# BEGIN MERGE SLOT 9
# END MERGE SLOT 9
# BEGIN MERGE SLOT 10
# END MERGE SLOT 10

40
tests/suites/test_suite_bignum_core.function
View file

@ -1123,8 +1123,6 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* BEGIN MERGE SLOT 1 */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_core_exp_mod(char *input_N, char *input_A, void mpi_core_exp_mod(char *input_N, char *input_A,
char *input_E, char *input_X) char *input_E, char *input_X)
@ -1204,14 +1202,6 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* END MERGE SLOT 1 */
/* BEGIN MERGE SLOT 2 */
/* END MERGE SLOT 2 */
/* BEGIN MERGE SLOT 3 */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_core_sub_int(char *input_A, char *input_B, void mpi_core_sub_int(char *input_A, char *input_B,
char *input_X, int borrow) char *input_X, int borrow)
@ -1276,33 +1266,3 @@ exit:
mbedtls_free(X); mbedtls_free(X);
} }
/* END_CASE */ /* END_CASE */
/* END MERGE SLOT 3 */
/* BEGIN MERGE SLOT 4 */
/* END MERGE SLOT 4 */
/* BEGIN MERGE SLOT 5 */
/* END MERGE SLOT 5 */
/* BEGIN MERGE SLOT 6 */
/* END MERGE SLOT 6 */
/* BEGIN MERGE SLOT 7 */
/* END MERGE SLOT 7 */
/* BEGIN MERGE SLOT 8 */
/* END MERGE SLOT 8 */
/* BEGIN MERGE SLOT 9 */
/* END MERGE SLOT 9 */
/* BEGIN MERGE SLOT 10 */
/* END MERGE SLOT 10 */

39
tests/suites/test_suite_bignum_core.misc.data
View file

@ -491,42 +491,3 @@ mpi_core_fill_random:42:0:-1:0:MBEDTLS_ERR_MPI_BAD_INPUT_DATA
Fill random core: 42 bytes, 5 missing limbs Fill random core: 42 bytes, 5 missing limbs
mpi_core_fill_random:42:0:-5:0:MBEDTLS_ERR_MPI_BAD_INPUT_DATA mpi_core_fill_random:42:0:-5:0:MBEDTLS_ERR_MPI_BAD_INPUT_DATA
# BEGIN MERGE SLOT 1
# END MERGE SLOT 1
# BEGIN MERGE SLOT 2
# END MERGE SLOT 2
# BEGIN MERGE SLOT 3
# END MERGE SLOT 3
# BEGIN MERGE SLOT 4
# END MERGE SLOT 4
# BEGIN MERGE SLOT 5
# END MERGE SLOT 5
# BEGIN MERGE SLOT 6
# END MERGE SLOT 6
# BEGIN MERGE SLOT 7
# END MERGE SLOT 7
# BEGIN MERGE SLOT 8
# END MERGE SLOT 8
# BEGIN MERGE SLOT 9
# END MERGE SLOT 9
# BEGIN MERGE SLOT 10
# END MERGE SLOT 10

34
tests/suites/test_suite_bignum_mod.function
View file

@ -96,12 +96,6 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* BEGIN MERGE SLOT 1 */
/* END MERGE SLOT 1 */
/* BEGIN MERGE SLOT 2 */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_mod_mul(char *input_A, void mpi_mod_mul(char *input_A,
char *input_B, char *input_B,
@ -238,9 +232,6 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* END MERGE SLOT 2 */
/* BEGIN MERGE SLOT 3 */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_mod_sub(char *input_N, void mpi_mod_sub(char *input_N,
char *input_A, char *input_B, char *input_A, char *input_B,
@ -440,13 +431,7 @@ exit:
mbedtls_free(X_raw); mbedtls_free(X_raw);
} }
/* END_CASE */ /* END_CASE */
/* END MERGE SLOT 3 */
/* BEGIN MERGE SLOT 4 */
/* END MERGE SLOT 4 */
/* BEGIN MERGE SLOT 5 */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_mod_add(char *input_N, void mpi_mod_add(char *input_N,
char *input_A, char *input_B, char *input_A, char *input_B,
@ -549,13 +534,7 @@ exit:
mbedtls_free(X_raw); mbedtls_free(X_raw);
} }
/* END_CASE */ /* END_CASE */
/* END MERGE SLOT 5 */
/* BEGIN MERGE SLOT 6 */
/* END MERGE SLOT 6 */
/* BEGIN MERGE SLOT 7 */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_residue_setup(char *input_N, char *input_R, int ret) void mpi_residue_setup(char *input_N, char *input_R, int ret)
{ {
@ -762,16 +741,3 @@ exit:
mbedtls_free(obuf); mbedtls_free(obuf);
} }
/* END_CASE */ /* END_CASE */
/* END MERGE SLOT 7 */
/* BEGIN MERGE SLOT 8 */
/* END MERGE SLOT 8 */
/* BEGIN MERGE SLOT 9 */
/* END MERGE SLOT 9 */
/* BEGIN MERGE SLOT 10 */
/* END MERGE SLOT 10 */

21
tests/suites/test_suite_bignum_mod.misc.data
View file

@ -7,11 +7,6 @@ mpi_mod_setup:MBEDTLS_MPI_MOD_REP_OPT_RED:0
Test mbedtls_mpi_mod_setup #7 (Montgomery representation) Test mbedtls_mpi_mod_setup #7 (Montgomery representation)
mpi_mod_setup:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0 mpi_mod_setup:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
# BEGIN MERGE SLOT 1
# END MERGE SLOT 1
# BEGIN MERGE SLOT 2
Test mpi_mod_mul #1 N->limbs != A->limbs Test mpi_mod_mul #1 N->limbs != A->limbs
mpi_mod_mul_neg:"1":"00000000000000000000000000000000":"f0000000000000000000000000000000":"0":MBEDTLS_ERR_MPI_BAD_INPUT_DATA mpi_mod_mul_neg:"1":"00000000000000000000000000000000":"f0000000000000000000000000000000":"0":MBEDTLS_ERR_MPI_BAD_INPUT_DATA
@ -20,9 +15,6 @@ mpi_mod_mul_neg:"1234567890abcdef1234567890abcdef":"0":"f00000000000000000000000
Test mpi_mod_mul #3 N->limbs != X->limbs Test mpi_mod_mul #3 N->limbs != X->limbs
mpi_mod_mul_neg:"1234567890abcdef1234567890abcdef":"00000000000000000000000000000000":"f0000000000000000000000000000000":"0":MBEDTLS_ERR_MPI_BAD_INPUT_DATA mpi_mod_mul_neg:"1234567890abcdef1234567890abcdef":"00000000000000000000000000000000":"f0000000000000000000000000000000":"0":MBEDTLS_ERR_MPI_BAD_INPUT_DATA
# END MERGE SLOT 2
# BEGIN MERGE SLOT 3
mpi_mod_sub base case for negative testing (N, a, b all >= 1 limb) mpi_mod_sub base case for negative testing (N, a, b all >= 1 limb)
mpi_mod_sub:"014320a022ccb75bdf470ddf25":"000000025a55a46e5da99c71c7":"00033b2e3c9fd0803ce8000f93":"013fe57440828b4a0008aa4159":0 mpi_mod_sub:"014320a022ccb75bdf470ddf25":"000000025a55a46e5da99c71c7":"00033b2e3c9fd0803ce8000f93":"013fe57440828b4a0008aa4159":0
@ -89,13 +81,6 @@ mbedtls_mpi_mod_inv 64-bit Mont. form - A too short
depends_on:MBEDTLS_HAVE_INT64 depends_on:MBEDTLS_HAVE_INT64
mpi_mod_inv_mont:"0000000000000000000000000000152d02c7e14af67fe0bf":"00000000000009545642424381c611fb":"000000000000000000000000000009545642424381c611fb":MBEDTLS_ERR_MPI_BAD_INPUT_DATA mpi_mod_inv_mont:"0000000000000000000000000000152d02c7e14af67fe0bf":"00000000000009545642424381c611fb":"000000000000000000000000000009545642424381c611fb":MBEDTLS_ERR_MPI_BAD_INPUT_DATA
# END MERGE SLOT 3
# BEGIN MERGE SLOT 4
# END MERGE SLOT 4
# BEGIN MERGE SLOT 5
mpi_mod_add base case for negative testing (N, a, b all >= 1 limb) mpi_mod_add base case for negative testing (N, a, b all >= 1 limb)
mpi_mod_add:"014320a022ccb75bdf470ddf25":"000000025a55a46e5da99c71c7":"00033b2e3c9fd0803ce8000f93":"00033b3096f574ee9a919c815a":0 mpi_mod_add:"014320a022ccb75bdf470ddf25":"000000025a55a46e5da99c71c7":"00033b2e3c9fd0803ce8000f93":"00033b3096f574ee9a919c815a":0
@ -116,13 +101,7 @@ mpi_mod_add:"014320a022ccb75bdf470ddf25":"a99c71c7":"00033b2e3c9fd0803ce8000f93"
mpi_mod_add with second input too short mpi_mod_add with second input too short
mpi_mod_add:"014320a022ccb75bdf470ddf25":"000000025a55a46e5da99c71c7":"e8000f93":"00":MBEDTLS_ERR_MPI_BAD_INPUT_DATA mpi_mod_add:"014320a022ccb75bdf470ddf25":"000000025a55a46e5da99c71c7":"e8000f93":"00":MBEDTLS_ERR_MPI_BAD_INPUT_DATA
# END MERGE SLOT 5
# BEGIN MERGE SLOT 6
# END MERGE SLOT 6
# BEGIN MERGE SLOT 7
Test mbedtls_mpi_residue_setup #1 m > r Test mbedtls_mpi_residue_setup #1 m > r
mpi_residue_setup:"fe":"01":0 mpi_residue_setup:"fe":"01":0

39
tests/suites/test_suite_bignum_mod_raw.data
View file

@ -179,42 +179,3 @@ mpi_mod_raw_cond_swap:"000000001111111122222222333333334444444455555555666666667
mbedtls_mpi_mod_raw_cond_swap: copy half of the limbs mbedtls_mpi_mod_raw_cond_swap: copy half of the limbs
mpi_mod_raw_cond_swap:"00000000FFFFFFFF55555555AAAAAAAA":"FEDCBA9876543210FEDCBA9876543210":8 mpi_mod_raw_cond_swap:"00000000FFFFFFFF55555555AAAAAAAA":"FEDCBA9876543210FEDCBA9876543210":8
# BEGIN MERGE SLOT 1
# END MERGE SLOT 1
# BEGIN MERGE SLOT 2
# END MERGE SLOT 2
# BEGIN MERGE SLOT 3
# END MERGE SLOT 3
# BEGIN MERGE SLOT 4
# END MERGE SLOT 4
# BEGIN MERGE SLOT 5
# END MERGE SLOT 5
# BEGIN MERGE SLOT 6
# END MERGE SLOT 6
# BEGIN MERGE SLOT 7
# END MERGE SLOT 7
# BEGIN MERGE SLOT 8
# END MERGE SLOT 8
# BEGIN MERGE SLOT 9
# END MERGE SLOT 9
# BEGIN MERGE SLOT 10
# END MERGE SLOT 10

36
tests/suites/test_suite_bignum_mod_raw.function
View file

@ -263,12 +263,6 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* BEGIN MERGE SLOT 1 */
/* END MERGE SLOT 1 */
/* BEGIN MERGE SLOT 2 */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_mod_raw_sub(char *input_A, void mpi_mod_raw_sub(char *input_A,
char *input_B, char *input_B,
@ -482,10 +476,6 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* END MERGE SLOT 2 */
/* BEGIN MERGE SLOT 3 */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_mod_raw_inv_prime(char *input_N, char *input_A, char *input_X) void mpi_mod_raw_inv_prime(char *input_N, char *input_A, char *input_X)
{ {
@ -559,14 +549,6 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* END MERGE SLOT 3 */
/* BEGIN MERGE SLOT 4 */
/* END MERGE SLOT 4 */
/* BEGIN MERGE SLOT 5 */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_mod_raw_add(char *input_N, void mpi_mod_raw_add(char *input_N,
char *input_A, char *input_B, char *input_A, char *input_B,
@ -655,9 +637,7 @@ exit:
mbedtls_free(X); mbedtls_free(X);
} }
/* END_CASE */ /* END_CASE */
/* END MERGE SLOT 5 */
/* BEGIN MERGE SLOT 6 */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_mod_raw_canonical_to_modulus_rep(const char *input_N, int rep, void mpi_mod_raw_canonical_to_modulus_rep(const char *input_N, int rep,
const char *input_A, const char *input_A,
@ -711,9 +691,7 @@ exit:
mbedtls_free(X); mbedtls_free(X);
} }
/* END_CASE */ /* END_CASE */
/* END MERGE SLOT 6 */
/* BEGIN MERGE SLOT 7 */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_mod_raw_to_mont_rep(char *input_N, char *input_A, char *input_X) void mpi_mod_raw_to_mont_rep(char *input_N, char *input_A, char *input_X)
{ {
@ -896,17 +874,3 @@ exit:
mbedtls_free(Z); mbedtls_free(Z);
} }
/* END_CASE */ /* END_CASE */
/* END MERGE SLOT 7 */
/* BEGIN MERGE SLOT 8 */
/* END MERGE SLOT 8 */
/* BEGIN MERGE SLOT 9 */
/* END MERGE SLOT 9 */
/* BEGIN MERGE SLOT 10 */
/* END MERGE SLOT 10 */