TeaSpeak/tommath
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #149 from czurnieden/develop

Browse Source 
Added overflow check in mp_prime_is_prime and some verbosity in demo.c
(cherry picked from commit 55a7af3d62cbbdd174276c4ee8117b57777ce634)
This commit is contained in:
Steffen Jaeckel 2019-01-22 08:59:30 +01:00 committed by Steffen Jaeckel
parent 538cace5cd
commit fcea5e3c35
2 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bn_mp_prime_is_prime.c
View File

@ -305,8 +305,12 @@ int mp_prime_is_prime(const mp_int *a, int t, int *result)
fips_rand &= mask; fips_rand &= mask;
} }
#endif #endif
/* Ceil, because small numbers have a right to live, too, */ if (fips_rand > ((unsigned int) INT_MAX - DIGIT_BIT)) {
len = (((int)fips_rand + DIGIT_BIT) / DIGIT_BIT); len = INT_MAX / DIGIT_BIT;
}
else {
len = (((int)fips_rand + DIGIT_BIT) / DIGIT_BIT);
}
/* Unlikely. */ /* Unlikely. */
if (len < 0) { if (len < 0) {
ix--; ix--;

56
demo/demo.c
View File

@ -661,7 +661,7 @@ int main(void)
(rand() & 1) ? 0 : LTM_PRIME_2MSB_ON, myrng, (rand() & 1) ? 0 : LTM_PRIME_2MSB_ON, myrng,
NULL); NULL);
if (err != MP_OKAY) { 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; return EXIT_FAILURE;
} }
if (mp_count_bits(&a) != ix) { if (mp_count_bits(&a) != ix) {
@ -687,9 +687,19 @@ int main(void)
mp_set(&a,1u); mp_set(&a,1u);
mp_mul_2d(&a,1119,&a); mp_mul_2d(&a,1119,&a);
mp_add_d(&a,53,&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) { 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; return EXIT_FAILURE;
} }
for (ix = 16; ix < 128; ix++) { 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, &a, 8, ix, ((rand() & 1) ? 0 : LTM_PRIME_2MSB_ON) | LTM_PRIME_SAFE,
myrng, NULL); myrng, NULL);
if (err != MP_OKAY) { 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; return EXIT_FAILURE;
} }
if (mp_count_bits(&a) != ix) { if (mp_count_bits(&a) != ix) {
@ -707,22 +717,46 @@ int main(void)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
/* let's see if it's really a safe prime */ /* let's see if it's really a safe prime */
mp_sub_d(&a, 1uL, &a); mp_sub_d(&a, 1uL, &b);
mp_div_2(&a, &a); mp_div_2(&b, &b);
mp_prime_is_prime(&a, 8, &cnt); err = mp_prime_is_prime(&b, 8, &cnt);
if (cnt != MP_YES) { /* small problem */
printf("sub is not prime!\n"); 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; return EXIT_FAILURE;
} }
} }
/* Check regarding problem #143 */ /* Check regarding problem #143 */
#ifndef MP_8BIT #ifndef MP_8BIT
mp_read_radix(&a, mp_read_radix(&a,
"FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A63A3620FFFFFFFFFFFFFFFF", "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A63A3620FFFFFFFFFFFFFFFF",
16); 16);
mp_prime_strong_lucas_selfridge(&a, &cnt); err = mp_prime_strong_lucas_selfridge(&a, &cnt);
if (cnt != MP_YES) { /* 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"); 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; return EXIT_FAILURE;
} }
#endif #endif