+#include <tommath.h>
+#ifdef BN_MP_PRIME_IS_PRIME_C
/* LibTomMath, multiple-precision integer library -- Tom St Denis
*
- * LibTomMath is library that provides for multiple-precision
+ * LibTomMath is a library that provides multiple-precision
* integer arithmetic as well as number theoretic functionality.
*
- * The library is designed directly after the MPI library by
+ * The library was designed directly after the MPI library by
* Michael Fromberger but has been written from scratch with
* additional optimizations in place.
*
*
* Tom St Denis, tomstdenis@iahu.ca, http://math.libtomcrypt.org
*/
-#include <tommath.h>
/* performs a variable number of rounds of Miller-Rabin
*
* Probability of error after t rounds is no more than
- * (1/4)^t when 1 <= t <= 256
+
*
* Sets result to 1 if probably prime, 0 otherwise
*/
-int
-mp_prime_is_prime (mp_int * a, int t, int *result)
+int mp_prime_is_prime (mp_int * a, int t, int *result)
{
mp_int b;
int ix, err, res;
/* default to no */
- *result = 0;
+ *result = MP_NO;
/* valid value of t? */
- if (t < 1 || t > PRIME_SIZE) {
+ if (t <= 0 || t > PRIME_SIZE) {
return MP_VAL;
}
/* is the input equal to one of the primes in the table? */
for (ix = 0; ix < PRIME_SIZE; ix++) {
- if (mp_cmp_d(a, __prime_tab[ix]) == MP_EQ) {
+ if (mp_cmp_d(a, ltm_prime_tab[ix]) == MP_EQ) {
*result = 1;
return MP_OKAY;
}
if ((err = mp_prime_is_divisible (a, &res)) != MP_OKAY) {
return err;
}
- if (res == 1) {
+
+ /* return if it was trivially divisible */
+ if (res == MP_YES) {
return MP_OKAY;
}
for (ix = 0; ix < t; ix++) {
/* set the prime */
- mp_set (&b, __prime_tab[ix]);
+ mp_set (&b, ltm_prime_tab[ix]);
if ((err = mp_prime_miller_rabin (a, &b, &res)) != MP_OKAY) {
- goto __B;
+ goto LBL_B;
}
- if (res == 0) {
- goto __B;
+ if (res == MP_NO) {
+ goto LBL_B;
}
}
/* passed the test */
- *result = 1;
-__B:mp_clear (&b);
+ *result = MP_YES;
+LBL_B:mp_clear (&b);
return err;
}
+#endif