oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Convert mp_find_prime to use mp_prime_is_prime

Browse Source 
Modify the signature of mp_find_prime() to permit the number of
Miller-Rabin rounds to be specified.  In addition, valid responses
now include MP_NO, MP_YES, and MP_VAL which is returned when
mp_prime_is_prime() fails.

Change-Id: I0195129a4dd75875e6dddb6d49a5ceb30afb1a17
This commit is contained in:
Jeffrey Altman
2013-10-07 15:13:18 -05:00
parent 1859a85350
commit 28051fa99c
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/hcrypto/libtommath/bn_mp_find_prime.c
View File

@@ -6,16 +6,25 @@
*/ */
#include <tommath.h> #include <tommath.h>
#ifdef BN_MP_FIND_PRIME_C #ifdef BN_MP_FIND_PRIME_C
int mp_find_prime(mp_int *a) int mp_find_prime(mp_int *a, int t)
{ {
int res; int res = MP_NO;
/* valid value of t? */
if (t <= 0 || t > PRIME_SIZE) {
return MP_VAL;
}
if (mp_iseven(a)) if (mp_iseven(a))
mp_add_d(a, 1, a); mp_add_d(a, 1, a);
do { do {
if (mp_prime_is_prime(a, t, &res) != 0) {
res = MP_VAL;
break;
}
if ((res = mp_isprime(a)) == MP_NO) { if (res == MP_NO) {
mp_add_d(a, 2, a); mp_add_d(a, 2, a);
continue; continue;
} }

2
lib/hcrypto/libtommath/tommath.h
View File

@@ -520,7 +520,7 @@ int mp_prime_next_prime(mp_int *a, int t, int bbs_style);
*/ */
int mp_prime_random_ex(mp_int *a, int t, int size, int flags, ltm_prime_callback cb, void *dat); int mp_prime_random_ex(mp_int *a, int t, int size, int flags, ltm_prime_callback cb, void *dat);
int mp_find_prime(mp_int *a); int mp_find_prime(mp_int *a, int t);
int mp_isprime(mp_int *a); int mp_isprime(mp_int *a);

4
lib/hcrypto/rsa-ltm.c
View File

@@ -528,7 +528,7 @@ ltm_rsa_generate_key(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
do { do {
BN_GENCB_call(cb, 2, counter++); BN_GENCB_call(cb, 2, counter++);
CHECK(random_num(&p, bitsp), 0); CHECK(random_num(&p, bitsp), 0);
CHECK(mp_find_prime(&p), MP_YES); CHECK(mp_find_prime(&p,128), MP_YES);
mp_sub_d(&p, 1, &t1); mp_sub_d(&p, 1, &t1);
mp_gcd(&t1, &el, &t2); mp_gcd(&t1, &el, &t2);
@@ -540,7 +540,7 @@ ltm_rsa_generate_key(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
do { do {
BN_GENCB_call(cb, 2, counter++); BN_GENCB_call(cb, 2, counter++);
CHECK(random_num(&q, bits - bitsp), 0); CHECK(random_num(&q, bits - bitsp), 0);
CHECK(mp_find_prime(&q), MP_YES); CHECK(mp_find_prime(&q,128), MP_YES);
if (mp_cmp(&p, &q) == 0) /* don't let p and q be the same */ if (mp_cmp(&p, &q) == 0) /* don't let p and q be the same */
continue; continue;