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

clean up

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-05-26 10:19:07 -05:00
parent b59734d941
commit b09eac50ee
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,12 +60,13 @@ BN2mpz(fp_int *s, const BIGNUM *bn)
} }
static int static int
rsa_private_calculate(fp_int * in, fp_int * p, fp_int * q, tfm_rsa_private_calculate(fp_int * in, fp_int * p, fp_int * q,
fp_int * dmp1, fp_int * dmq1, fp_int * iqmp, fp_int * dmp1, fp_int * dmq1, fp_int * iqmp,
fp_int * out) fp_int * out)
{ {
fp_int vp, vq, u; fp_int vp, vq, u;
fp_init(&vp); fp_init(&vq); fp_init(&u);
fp_init_multi(&vp, &vq, &u, NULL);
/* vq = c ^ (d mod (q - 1)) mod q */ /* vq = c ^ (d mod (q - 1)) mod q */
/* vp = c ^ (d mod (p - 1)) mod p */ /* vp = c ^ (d mod (p - 1)) mod p */
@@ -143,9 +144,8 @@ tfm_rsa_public_encrypt(int flen, const unsigned char* from,
memcpy(p, from, flen); memcpy(p, from, flen);
p += flen; p += flen;
assert((p - p0) == size - 1); assert((p - p0) == size - 1);
fp_init(&enc); fp_init_multi(&enc, &dec, NULL);
fp_init(&dec);
fp_read_unsigned_bin(&dec, p0, size - 1); fp_read_unsigned_bin(&dec, p0, size - 1);
free(p0); free(p0);
@@ -197,8 +197,7 @@ tfm_rsa_public_decrypt(int flen, const unsigned char* from,
} }
#endif #endif
fp_init(&s); fp_init_multi(&s, &us, NULL);
fp_init(&us);
fp_read_unsigned_bin(&s, rk_UNCONST(from), flen); fp_read_unsigned_bin(&s, rk_UNCONST(from), flen);
if (fp_cmp(&s, &n) >= 0) { if (fp_cmp(&s, &n) >= 0) {
@@ -272,8 +271,7 @@ tfm_rsa_private_encrypt(int flen, const unsigned char* from,
BN2mpz(&n, rsa->n); BN2mpz(&n, rsa->n);
BN2mpz(&e, rsa->e); BN2mpz(&e, rsa->e);
fp_init(&in); fp_init_multi(&in, &out, NULL);
fp_init(&out);
fp_read_unsigned_bin(&in, p0, size); fp_read_unsigned_bin(&in, p0, size);
free(p0); free(p0);
@@ -292,7 +290,7 @@ tfm_rsa_private_encrypt(int flen, const unsigned char* from,
BN2mpz(&dmq1, rsa->dmq1); BN2mpz(&dmq1, rsa->dmq1);
BN2mpz(&iqmp, rsa->iqmp); BN2mpz(&iqmp, rsa->iqmp);
res = rsa_private_calculate(&in, &p, &q, &dmp1, &dmq1, &iqmp, &out); res = tfm_rsa_private_calculate(&in, &p, &q, &dmp1, &dmq1, &iqmp, &out);
fp_zero(&p); fp_zero(&p);
fp_zero(&q); fp_zero(&q);
@@ -349,8 +347,7 @@ tfm_rsa_private_decrypt(int flen, const unsigned char* from,
if (flen > size) if (flen > size)
return -2; return -2;
fp_init(&in); fp_init_multi(&in, &out, NULL);
fp_init(&out);
BN2mpz(&n, rsa->n); BN2mpz(&n, rsa->n);
BN2mpz(&e, rsa->e); BN2mpz(&e, rsa->e);
@@ -372,7 +369,7 @@ tfm_rsa_private_decrypt(int flen, const unsigned char* from,
BN2mpz(&dmq1, rsa->dmq1); BN2mpz(&dmq1, rsa->dmq1);
BN2mpz(&iqmp, rsa->iqmp); BN2mpz(&iqmp, rsa->iqmp);
res = rsa_private_calculate(&in, &p, &q, &dmp1, &dmq1, &iqmp, &out); res = tfm_rsa_private_calculate(&in, &p, &q, &dmp1, &dmq1, &iqmp, &out);
fp_zero(&p); fp_zero(&p);
fp_zero(&q); fp_zero(&q);