summaryrefslogtreecommitdiffstats
path: root/libtommath/pre_gen
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2011-03-14 14:23:22 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2011-03-14 14:23:22 (GMT)
commitaf01fe0b35a0b2afccffd2b93104778f54eb3f5b (patch)
tree36b3156067a6b9a0dc5de12048675aa0b7802bc9 /libtommath/pre_gen
parent8f3d2ff6163cce22d1c9b8c00a0051a9164fed0d (diff)
downloadtcl-af01fe0b35a0b2afccffd2b93104778f54eb3f5b.zip
tcl-af01fe0b35a0b2afccffd2b93104778f54eb3f5b.tar.gz
tcl-af01fe0b35a0b2afccffd2b93104778f54eb3f5b.tar.bz2
Apply non-comment changes to take our fork of libtommath up to tracking 0.42.0 libtommath_merge_0_42_0
from 0.39.
Diffstat (limited to 'libtommath/pre_gen')
-rw-r--r--libtommath/pre_gen/mpi.c24
1 files changed, 17 insertions, 7 deletions
diff --git a/libtommath/pre_gen/mpi.c b/libtommath/pre_gen/mpi.c
index b7a5bed..d2224c0 100644
--- a/libtommath/pre_gen/mpi.c
+++ b/libtommath/pre_gen/mpi.c
@@ -553,7 +553,7 @@ int fast_s_mp_mul_high_digs (mp_int * a, mp_int * b, mp_int * c, int digs)
register mp_digit *tmpc;
tmpc = c->dp + digs;
- for (ix = digs; ix <= pa; ix++) {
+ for (ix = digs; ix < pa; ix++) {
/* now extract the previous digit [below the carry] */
*tmpc++ = W[ix];
}
@@ -2026,7 +2026,12 @@ static int s_is_power_of_two(mp_digit b, int *p)
{
int x;
- for (x = 1; x < DIGIT_BIT; x++) {
+ /* fast return if no power of two */
+ if ((b==0) || (b & (b-1))) {
+ return 0;
+ }
+
+ for (x = 0; x < DIGIT_BIT; x++) {
if (b == (((mp_digit)1)<<x)) {
*p = x;
return 1;
@@ -4667,7 +4672,7 @@ mp_montgomery_setup (mp_int * n, mp_digit * rho)
#endif
/* rho = -1/m mod b */
- *rho = (((mp_word)1 << ((mp_word) DIGIT_BIT)) - x) & MP_MASK;
+ *rho = (unsigned long)(((mp_word)1 << ((mp_word) DIGIT_BIT)) - x) & MP_MASK;
return MP_OKAY;
}
@@ -5693,7 +5698,7 @@ int mp_prime_next_prime(mp_int *a, int t, int bbs_style)
/* is this prime? */
for (x = 0; x < t; x++) {
- mp_set(&b, ltm_prime_tab[t]);
+ mp_set(&b, ltm_prime_tab[x]);
if ((err = mp_prime_miller_rabin(a, &b, &res)) != MP_OKAY) {
goto LBL_ERR;
}
@@ -6847,12 +6852,17 @@ int mp_set_int (mp_int * a, unsigned long b)
int mp_shrink (mp_int * a)
{
mp_digit *tmp;
- if (a->alloc != a->used && a->used > 0) {
- if ((tmp = OPT_CAST(mp_digit) XREALLOC (a->dp, sizeof (mp_digit) * a->used)) == NULL) {
+ int used = 1;
+
+ if(a->used > 0)
+ used = a->used;
+
+ if (a->alloc != used) {
+ if ((tmp = OPT_CAST(mp_digit) XREALLOC (a->dp, sizeof (mp_digit) * used)) == NULL) {
return MP_MEM;
}
a->dp = tmp;
- a->alloc = a->used;
+ a->alloc = used;
}
return MP_OKAY;
}