Commit fcea5e3c35481430ffdc45d6785104871d50e9bf
2019-01-22T08:59:30
Merge pull request #149 from czurnieden/develop Added overflow check in mp_prime_is_prime and some verbosity in demo.c (cherry picked from commit 55a7af3d62cbbdd174276c4ee8117b57777ce634)
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 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117
diff --git a/bn_mp_prime_is_prime.c b/bn_mp_prime_is_prime.c
index 63d3725..8d96e6a 100644
--- a/bn_mp_prime_is_prime.c
+++ b/bn_mp_prime_is_prime.c
@@ -305,8 +305,12 @@ int mp_prime_is_prime(const mp_int *a, int t, int *result)
fips_rand &= mask;
}
#endif
- /* Ceil, because small numbers have a right to live, too, */
- len = (((int)fips_rand + DIGIT_BIT) / DIGIT_BIT);
+ if (fips_rand > ((unsigned int) INT_MAX - DIGIT_BIT)) {
+ len = INT_MAX / DIGIT_BIT;
+ }
+ else {
+ len = (((int)fips_rand + DIGIT_BIT) / DIGIT_BIT);
+ }
/* Unlikely. */
if (len < 0) {
ix--;
diff --git a/demo/demo.c b/demo/demo.c
index 863e0f0..642eab7 100644
--- a/demo/demo.c
+++ b/demo/demo.c
@@ -661,7 +661,7 @@ int main(void)
(rand() & 1) ? 0 : LTM_PRIME_2MSB_ON, myrng,
NULL);
if (err != MP_OKAY) {
- printf("failed with err code %d\n", err);
+ printf("\nfailed with error: %s\n", mp_error_to_string(err));
return EXIT_FAILURE;
}
if (mp_count_bits(&a) != ix) {
@@ -687,9 +687,19 @@ int main(void)
mp_set(&a,1u);
mp_mul_2d(&a,1119,&a);
mp_add_d(&a,53,&a);
- mp_prime_is_prime(&a, 8, &cnt);
+ err = mp_prime_is_prime(&a, 8, &cnt);
+ /* small problem */
+ if (err != MP_OKAY) {
+ printf("\nfailed with error: %s\n", mp_error_to_string(err));
+ }
+ /* large problem */
if (cnt == MP_NO) {
- printf("A certified prime is a prime but mp_prime_is_prime says it not.\n");
+ printf("A certified prime is a prime but mp_prime_is_prime says it is not.\n");
+ }
+ if ((err != MP_OKAY) || (cnt == MP_NO)) {
+ printf("prime tested was: ");
+ mp_fwrite(&a,16,stdout);
+ putchar('\n');
return EXIT_FAILURE;
}
for (ix = 16; ix < 128; ix++) {
@@ -699,7 +709,7 @@ int main(void)
&a, 8, ix, ((rand() & 1) ? 0 : LTM_PRIME_2MSB_ON) | LTM_PRIME_SAFE,
myrng, NULL);
if (err != MP_OKAY) {
- printf("failed with err code %d\n", err);
+ printf("\nfailed with error: %s\n", mp_error_to_string(err));
return EXIT_FAILURE;
}
if (mp_count_bits(&a) != ix) {
@@ -707,22 +717,46 @@ int main(void)
return EXIT_FAILURE;
}
/* let's see if it's really a safe prime */
- mp_sub_d(&a, 1uL, &a);
- mp_div_2(&a, &a);
- mp_prime_is_prime(&a, 8, &cnt);
- if (cnt != MP_YES) {
- printf("sub is not prime!\n");
+ mp_sub_d(&a, 1uL, &b);
+ mp_div_2(&b, &b);
+ err = mp_prime_is_prime(&b, 8, &cnt);
+ /* small problem */
+ if (err != MP_OKAY) {
+ printf("\nfailed with error: %s\n", mp_error_to_string(err));
+ }
+ /* large problem */
+ if (cnt == MP_NO) {
+ printf("\nsub is not prime!\n");
+ }
+ if ((err != MP_OKAY) || (cnt == MP_NO)) {
+ printf("prime tested was: ");
+ mp_fwrite(&a,16,stdout);
+ putchar('\n');
+ printf("sub tested was: ");
+ mp_fwrite(&b,16,stdout);
+ putchar('\n');
return EXIT_FAILURE;
}
+
}
/* Check regarding problem #143 */
#ifndef MP_8BIT
mp_read_radix(&a,
"FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A63A3620FFFFFFFFFFFFFFFF",
16);
- mp_prime_strong_lucas_selfridge(&a, &cnt);
- if (cnt != MP_YES) {
+ err = mp_prime_strong_lucas_selfridge(&a, &cnt);
+ /* small problem */
+ if (err != MP_OKAY) {
+ printf("\nmp_prime_strong_lucas_selfridge failed with error: %s\n", mp_error_to_string(err));
+ }
+ /* large problem */
+ if (cnt == MP_NO) {
printf("\n\nissue #143 - mp_prime_strong_lucas_selfridge FAILED!\n");
+ }
+ if ((err != MP_OKAY) || (cnt == MP_NO)) {
+ printf("prime tested was: ");
+ mp_fwrite(&a,16,stdout);
+ putchar('\n');
return EXIT_FAILURE;
}
#endif