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

add support to generate keys

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-05-26 09:31:23 -05:00
parent fa5a1cb201
commit 323ccec648
1 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
lib/hcrypto/rsa-tfm.c
View File

@@ -172,7 +172,7 @@ tfm_rsa_public_encrypt(int flen, const unsigned char* from,
static int static int
tfm_rsa_public_decrypt(int flen, const unsigned char* from, tfm_rsa_public_decrypt(int flen, const unsigned char* from,
unsigned char* to, RSA* rsa, int padding) unsigned char* to, RSA* rsa, int padding)
{ {
unsigned char *p; unsigned char *p;
int res; int res;
@@ -244,7 +244,7 @@ tfm_rsa_public_decrypt(int flen, const unsigned char* from,
static int static int
tfm_rsa_private_encrypt(int flen, const unsigned char* from, tfm_rsa_private_encrypt(int flen, const unsigned char* from,
unsigned char* to, RSA* rsa, int padding) unsigned char* to, RSA* rsa, int padding)
{ {
unsigned char *p, *p0; unsigned char *p, *p0;
int res; int res;
@@ -335,7 +335,7 @@ tfm_rsa_private_encrypt(int flen, const unsigned char* from,
static int static int
tfm_rsa_private_decrypt(int flen, const unsigned char* from, tfm_rsa_private_decrypt(int flen, const unsigned char* from,
unsigned char* to, RSA* rsa, int padding) unsigned char* to, RSA* rsa, int padding)
{ {
unsigned char *ptr; unsigned char *ptr;
int res; int res;
@@ -434,7 +434,6 @@ tfm_rsa_private_decrypt(int flen, const unsigned char* from,
return size; return size;
} }
#if 0
static BIGNUM * static BIGNUM *
mpz2BN(fp_int *s) mpz2BN(fp_int *s)
{ {
@@ -458,7 +457,6 @@ static int
random_num(fp_int *num, size_t len) random_num(fp_int *num, size_t len)
{ {
unsigned char *p; unsigned char *p;
int res;
len = (len + 7) / 8; len = (len + 7) / 8;
p = malloc(len); p = malloc(len);
@@ -472,33 +470,23 @@ random_num(fp_int *num, size_t len)
free(p); free(p);
return 0; return 0;
} }
#endif
#define CHECK(f, v) if ((f) != (v)) { goto out; } #define CHECK(f, v) if ((f) != (v)) { goto out; }
static int static int
tfm_rsa_generate_key(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) tfm_rsa_generate_key(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
{ {
#if 0
fp_int el, p, q, n, d, dmp1, dmq1, iqmp, t1, t2, t3; fp_int el, p, q, n, d, dmp1, dmq1, iqmp, t1, t2, t3;
int counter, ret; int counter, ret, bitsp;
if (bits < 789) if (bits < 789)
return -1; return -1;
bitsp = (bits + 1) / 2;
ret = -1; ret = -1;
fp_init(&el); fp_init_multi(&el, &p, &q, &n, &n, &d, &dmp1, &dmq1, &iqmp, &t1, &t2, &t3, NULL);
fp_init(&p);
fp_init(&q);
fp_init(&n);
fp_init(&d);
fp_init(&dmp1);
fp_init(&dmq1);
fp_init(&iqmp);
fp_init(&t1);
fp_init(&t2);
fp_init(&t3);
BN2mpz(&el, e); BN2mpz(&el, e);
@@ -506,11 +494,11 @@ tfm_rsa_generate_key(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
counter = 0; counter = 0;
do { do {
BN_GENCB_call(cb, 2, counter++); BN_GENCB_call(cb, 2, counter++);
CHECK(random_num(&p, bits / 2 + 1), 0); CHECK(random_num(&p, bitsp), 0);
CHECK(mp_int_find_prime(&p), MP_TRUE); CHECK(fp_find_prime(&p), FP_YES);
CHECK(fp_sub_d(&p, 1, &t1), MP_OK); fp_sub_d(&p, 1, &t1);
CHECK(mp_int_gcd(&t1, &el, &t2), MP_OK); fp_gcd(&t1, &el, &t2);
} while(fp_cmp_d(&t2, 1) != 0); } while(fp_cmp_d(&t2, 1) != 0);
BN_GENCB_call(cb, 3, 0); BN_GENCB_call(cb, 3, 0);
@@ -518,15 +506,15 @@ tfm_rsa_generate_key(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
counter = 0; counter = 0;
do { do {
BN_GENCB_call(cb, 2, counter++); BN_GENCB_call(cb, 2, counter++);
CHECK(random_num(&q, bits / 2 + 1), 0); CHECK(random_num(&q, bits - bitsp), 0);
CHECK(mp_int_find_prime(&q), MP_TRUE); CHECK(fp_find_prime(&q), FP_YES);
if (fp_cmp(&p, &q) == 0) /* don't let p and q be the same */ if (fp_cmp(&p, &q) == 0) /* don't let p and q be the same */
continue; continue;
CHECK(fp_sub_d(&q, 1, &t1), MP_OK); fp_sub_d(&q, 1, &t1);
CHECK(mp_int_gcd(&t1, &el, &t2), MP_OK); fp_gcd(&t1, &el, &t2);
} while(mp_int_compare_value(&t2, 1) != 0); } while(fp_cmp_d(&t2, 1) != 0);
/* make p > q */ /* make p > q */
if (fp_cmp(&p, &q) < 0) { if (fp_cmp(&p, &q) < 0) {
@@ -539,20 +527,20 @@ tfm_rsa_generate_key(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
BN_GENCB_call(cb, 3, 1); BN_GENCB_call(cb, 3, 1);
/* calculate n, n = p * q */ /* calculate n, n = p * q */
CHECK(fp_mul(&p, &q, &n), MP_OK); fp_mul(&p, &q, &n);
/* calculate d, d = 1/e mod (p - 1)(q - 1) */ /* calculate d, d = 1/e mod (p - 1)(q - 1) */
CHECK(fp_sub_d(&p, 1, &t1), MP_OK); fp_sub_d(&p, 1, &t1);
CHECK(fp_sub_d(&q, 1, &t2), MP_OK); fp_sub_d(&q, 1, &t2);
CHECK(fp_mul(&t1, &t2, &t3), MP_OK); fp_mul(&t1, &t2, &t3);
CHECK(fp_invmod(&el, &t3, &d), MP_OK); fp_invmod(&el, &t3, &d);
/* calculate dmp1 dmp1 = d mod (p-1) */ /* calculate dmp1 dmp1 = d mod (p-1) */
CHECK(fp_mod(&d, &t1, &dmp1), MP_OK); fp_mod(&d, &t1, &dmp1);
/* calculate dmq1 dmq1 = d mod (q-1) */ /* calculate dmq1 dmq1 = d mod (q-1) */
CHECK(fp_mod(&d, &t2, &dmq1), MP_OK); fp_mod(&d, &t2, &dmq1);
/* calculate iqmp iqmp = 1/q mod p */ /* calculate iqmp iqmp = 1/q mod p */
CHECK(fp_invmod(&q, &p, &iqmp), MP_OK); fp_invmod(&q, &p, &iqmp);
/* fill in RSA key */ /* fill in RSA key */
@@ -566,6 +554,7 @@ tfm_rsa_generate_key(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
rsa->iqmp = mpz2BN(&iqmp); rsa->iqmp = mpz2BN(&iqmp);
ret = 1; ret = 1;
out: out:
fp_zero(&el); fp_zero(&el);
fp_zero(&p); fp_zero(&p);
@@ -580,9 +569,6 @@ out:
fp_zero(&t3); fp_zero(&t3);
return ret; return ret;
#else
return -1;
#endif
} }
static int static int