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

add and use fp_isneg

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-05-26 10:45:15 -05:00
parent 658d110d4a
commit 3108d93489
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hcrypto/dh-tfm.c
View File

@@ -168,7 +168,7 @@ tfm_dh_compute_key(unsigned char *shared, const BIGNUM * pub, DH *dh)
BN2mpz(&peer_pub, pub);
/* check if peers pubkey is reasonable */
if (peer_pub.sign == FP_NEG
if (fp_isneg(&peer_pub)
|| fp_cmp(&peer_pub, &p) >= 0
|| fp_cmp_d(&peer_pub, 1) <= 0)
{

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

@@ -78,7 +78,7 @@ tfm_rsa_private_calculate(fp_int * in, fp_int * p, fp_int * q,
/* C2 = 1/q mod p (iqmp) */
/* u = (vp - vq)C2 mod p. */
fp_sub(&vp, &vq, &u);
if (u.sign == FP_NEG)
if (fp_isneg(&u))
fp_add(&u, p, &u);
fp_mul(&u, iqmp, &u);
fp_mod(&u, p, &u);
@@ -265,7 +265,7 @@ tfm_rsa_private_encrypt(int flen, const unsigned char* from,
fp_read_unsigned_bin(&in, p0, size);
free(p0);
if(in.sign == FP_NEG ||
if(fp_isneg(&in) ||
fp_cmp(&in, &n) >= 0) {
size = -3;
goto out;
@@ -337,8 +337,7 @@ tfm_rsa_private_decrypt(int flen, const unsigned char* from,
fp_read_unsigned_bin(&in, rk_UNCONST(from), flen);
if(in.sign == FP_NEG ||
fp_cmp(&in, &n) >= 0) {
if(fp_isneg(&in) || fp_cmp(&in, &n) >= 0) {
size = -2;
goto out;
}
@@ -364,8 +363,7 @@ tfm_rsa_private_decrypt(int flen, const unsigned char* from,
} else {
fp_int d;
if(in.sign == FP_NEG ||
fp_cmp(&in, &n) >= 0)
if(fp_isneg(&in) || fp_cmp(&in, &n) >= 0)
return -4;
BN2mpz(&d, rsa->d);

3
lib/hcrypto/tomsfastmath/src/headers/tfm.h
View File

@@ -310,6 +310,9 @@ void fp_init_multi(fp_int *a, ...);
#define fp_iseven(a) (((a)->used >= 0 && (((a)->dp[0] & 1) == 0)) ? FP_YES : FP_NO)
#define fp_isodd(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? FP_YES : FP_NO)
/* is negative ? */
#define fp_isneg(a) (((a)->sign) == FP_NEG)
/* set to a small digit */
void fp_set(fp_int *a, fp_digit b);