feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge branch 'master' of github.com:cyassl/cyassl

Browse Source
This commit is contained in:
John Safranek
2012-05-02 21:59:54 -07:00
parent 669fbf2a14 225fba5c8d
commit 7ee09ea23c
5 changed files with 233 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
ctaocrypt/src/tfm.c
View File

@@ -1800,6 +1800,15 @@ void fp_reverse (unsigned char *s, int len)
}
/* c = a - b */
void fp_sub_d(fp_int *a, fp_digit b, fp_int *c)
{
fp_int tmp;
fp_set(&tmp, b);
fp_sub(a, &tmp, c);
}
/* CyaSSL callers from normal lib */
/* init a new mp_int */
@@ -1917,6 +1926,42 @@ int mp_read_unsigned_bin (mp_int * a, const unsigned char *b, int c)
}
int mp_sub_d(fp_int *a, fp_digit b, fp_int *c)
{
fp_sub_d(a, b, c);
return MP_OKAY;
}
/* fast math conversion */
int mp_copy(fp_int* a, fp_int* b)
{
fp_copy(a, b);
return MP_OKAY;
}
/* fast math conversion */
int mp_isodd(mp_int* a)
{
return fp_isodd(a);
}
/* fast math conversion */
int mp_iszero(mp_int* a)
{
return fp_iszero(a);
}
/* fast math conversion */
int mp_count_bits (mp_int* a)
{
return fp_count_bits(a);
}
#if defined(CYASSL_KEY_GEN) || defined (HAVE_ECC)
/* c = a * a (mod b) */
@@ -1941,14 +1986,6 @@ int mp_montgomery_calc_normalization(mp_int *a, mp_int *b)
return MP_OKAY;
}
/* fast math conversion */
int mp_copy(fp_int* a, fp_int* b)
{
fp_copy(a, b);
return MP_OKAY;
}
#endif /* CYASSL_KEYGEN || HAVE_ECC */
@@ -1956,7 +1993,6 @@ int mp_copy(fp_int* a, fp_int* b)
void fp_gcd(fp_int *a, fp_int *b, fp_int *c);
void fp_lcm(fp_int *a, fp_int *b, fp_int *c);
void fp_sub_d(fp_int *a, fp_digit b, fp_int *c);
int fp_isprime(fp_int *a);
int fp_cnt_lsb(fp_int *a);
@@ -1982,13 +2018,6 @@ int mp_lcm(fp_int *a, fp_int *b, fp_int *c)
}
int mp_sub_d(fp_int *a, fp_digit b, fp_int *c)
{
fp_sub_d(a, b, c);
return MP_OKAY;
}
int mp_prime_is_prime(mp_int* a, int t, int* result)
{
(void)t;
@@ -1998,15 +2027,6 @@ int mp_prime_is_prime(mp_int* a, int t, int* result)
/* c = a - b */
void fp_sub_d(fp_int *a, fp_digit b, fp_int *c)
{
fp_int tmp;
fp_set(&tmp, b);
fp_sub(a, &tmp, c);
}
static int s_is_power_of_two(fp_digit b, int *p)
{
int x;
@@ -2408,12 +2428,6 @@ int mp_read_radix(mp_int *a, const char *str, int radix)
return fp_read_radix(a, str, radix);
}
/* fast math conversion */
int mp_iszero(mp_int* a)
{
return fp_iszero(a);
}
/* fast math conversion */
int mp_set(fp_int *a, fp_digit b)
{
@@ -2442,13 +2456,6 @@ int mp_montgomery_setup(fp_int *a, fp_digit *rho)
return fp_montgomery_setup(a, rho);
}
/* fast math conversion */
int mp_isodd(mp_int* a)
{
return fp_isodd(a);
}
int mp_div_2(fp_int * a, fp_int * b)
{
fp_div_2(a, b);