Commit 31e64aa640db47e65224f567e5dd65933c4db820
2019-10-22T15:04:36
mp_prime_next_prime: use mp_bool for bbs_style
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
diff --git a/mp_prime_next_prime.c b/mp_prime_next_prime.c
index f8b2212..3256e37 100644
--- a/mp_prime_next_prime.c
+++ b/mp_prime_next_prime.c
@@ -6,9 +6,9 @@
/* finds the next prime after the number "a" using "t" trials
* of Miller-Rabin.
*
- * bbs_style = 1 means the prime must be congruent to 3 mod 4
+ * bbs_style = MP_YES means the prime must be congruent to 3 mod 4
*/
-mp_err mp_prime_next_prime(mp_int *a, int t, int bbs_style)
+mp_err mp_prime_next_prime(mp_int *a, int t, mp_bool bbs_style)
{
int x, y;
mp_ord cmp;
@@ -29,7 +29,7 @@ mp_err mp_prime_next_prime(mp_int *a, int t, int bbs_style)
continue;
}
if (cmp != MP_GT) {
- if ((bbs_style == 1) && ((s_mp_prime_tab[x] & 3u) != 3u)) {
+ if ((bbs_style == MP_YES) && ((s_mp_prime_tab[x] & 3u) != 3u)) {
/* try again until we get a prime congruent to 3 mod 4 */
continue;
} else {
@@ -42,7 +42,7 @@ mp_err mp_prime_next_prime(mp_int *a, int t, int bbs_style)
}
/* generate a prime congruent to 3 mod 4 or 1/3 mod 4? */
- if (bbs_style == 1) {
+ if (bbs_style == MP_YES) {
kstep = 4;
} else {
kstep = 2;
@@ -50,7 +50,7 @@ mp_err mp_prime_next_prime(mp_int *a, int t, int bbs_style)
/* at this point we will use a combination of a sieve and Miller-Rabin */
- if (bbs_style == 1) {
+ if (bbs_style == MP_YES) {
/* if a mod 4 != 3 subtract the correct value to make it so */
if ((a->dp[0] & 3u) != 3u) {
if ((err = mp_sub_d(a, (a->dp[0] & 3u) + 1u, a)) != MP_OKAY) {
diff --git a/tommath.h b/tommath.h
index a401be4..9421c6d 100644
--- a/tommath.h
+++ b/tommath.h
@@ -550,9 +550,9 @@ mp_err mp_prime_is_prime(const mp_int *a, int t, mp_bool *result) MP_WUR;
/* finds the next prime after the number "a" using "t" trials
* of Miller-Rabin.
*
- * bbs_style = 1 means the prime must be congruent to 3 mod 4
+ * bbs_style = MP_YES means the prime must be congruent to 3 mod 4
*/
-mp_err mp_prime_next_prime(mp_int *a, int t, int bbs_style) MP_WUR;
+mp_err mp_prime_next_prime(mp_int *a, int t, mp_bool bbs_style) MP_WUR;
/* makes a truly random prime of a given size (bits),
*