TeaSpeak/tommath
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

literal suffix

Browse Source
This commit is contained in:
Francois Perrad 2017-10-15 19:57:12 +02:00
parent 40c763a18d
commit bdbed00079
40 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bn_fast_s_mp_sqr.c
View File

@ -77,7 +77,7 @@ int fast_s_mp_sqr(const mp_int *a, mp_int *b)
_W = _W + _W + W1; _W = _W + _W + W1;
/* even columns have the square term in them */ /* even columns have the square term in them */
if ((ix&1) == 0) { if (((unsigned)ix & 1u) == 0u) {
_W += ((mp_word)a->dp[ix>>1])*((mp_word)a->dp[ix>>1]); _W += ((mp_word)a->dp[ix>>1])*((mp_word)a->dp[ix>>1]);
} }

2
bn_mp_clamp.c
View File

@ -27,7 +27,7 @@ void mp_clamp(mp_int *a)
/* decrease used while the most significant digit is /* decrease used while the most significant digit is
* zero. * zero.
*/ */
while ((a->used > 0) && (a->dp[a->used - 1] == 0)) { while ((a->used > 0) && (a->dp[a->used - 1] == 0u)) {
--(a->used); --(a->used);
} }

8
bn_mp_cnt_lsb.c
View File

@ -31,17 +31,17 @@ int mp_cnt_lsb(const mp_int *a)
} }
/* scan lower digits until non-zero */ /* scan lower digits until non-zero */
for (x = 0; (x < a->used) && (a->dp[x] == 0); x++) {} for (x = 0; (x < a->used) && (a->dp[x] == 0u); x++) {}
q = a->dp[x]; q = a->dp[x];
x *= DIGIT_BIT; x *= DIGIT_BIT;
/* now scan this digit until a 1 is found */ /* now scan this digit until a 1 is found */
if ((q & 1) == 0) { if ((q & 1u) == 0u) {
do { do {
qq = q & 15; qq = q & 15u;
x += lnz[qq]; x += lnz[qq];
q >>= 4; q >>= 4;
} while (qq == 0); } while (qq == 0u);
} }
return x; return x;
} }

12
bn_mp_div.c
View File

@ -207,13 +207,13 @@ int mp_div(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d)
do q{i-t-1} -= 1; do q{i-t-1} -= 1;
*/ */
q.dp[(i - t) - 1] = (q.dp[(i - t) - 1] + 1) & MP_MASK; q.dp[(i - t) - 1] = (q.dp[(i - t) - 1] + 1uL) & MP_MASK;
do { do {
q.dp[(i - t) - 1] = (q.dp[(i - t) - 1] - 1) & MP_MASK; q.dp[(i - t) - 1] = (q.dp[(i - t) - 1] - 1uL) & MP_MASK;
/* find left hand */ /* find left hand */
mp_zero(&t1); mp_zero(&t1);
t1.dp[0] = ((t - 1) < 0) ? 0 : y.dp[t - 1]; t1.dp[0] = ((t - 1) < 0) ? 0u : y.dp[t - 1];
t1.dp[1] = y.dp[t]; t1.dp[1] = y.dp[t];
t1.used = 2; t1.used = 2;
if ((res = mp_mul_d(&t1, q.dp[(i - t) - 1], &t1)) != MP_OKAY) { if ((res = mp_mul_d(&t1, q.dp[(i - t) - 1], &t1)) != MP_OKAY) {
@ -221,8 +221,8 @@ int mp_div(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d)
} }
/* find right hand */ /* find right hand */
t2.dp[0] = ((i - 2) < 0) ? 0 : x.dp[i - 2]; t2.dp[0] = ((i - 2) < 0) ? 0u : x.dp[i - 2];
t2.dp[1] = ((i - 1) < 0) ? 0 : x.dp[i - 1]; t2.dp[1] = ((i - 1) < 0) ? 0u : x.dp[i - 1];
t2.dp[2] = x.dp[i]; t2.dp[2] = x.dp[i];
t2.used = 3; t2.used = 3;
} while (mp_cmp_mag(&t1, &t2) == MP_GT); } while (mp_cmp_mag(&t1, &t2) == MP_GT);
@ -252,7 +252,7 @@ int mp_div(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d)
goto LBL_Y; goto LBL_Y;
} }
q.dp[(i - t) - 1] = (q.dp[(i - t) - 1] - 1UL) & MP_MASK; q.dp[(i - t) - 1] = (q.dp[(i - t) - 1] - 1uL) & MP_MASK;
} }
} }

2
bn_mp_div_2.c
View File

@ -42,7 +42,7 @@ int mp_div_2(const mp_int *a, mp_int *b)
r = 0; r = 0;
for (x = b->used - 1; x >= 0; x--) { for (x = b->used - 1; x >= 0; x--) {
/* get the carry for the next iteration */ /* get the carry for the next iteration */
rr = *tmpa & 1; rr = *tmpa & 1u;
/* shift the current digit, add in carry and store */ /* shift the current digit, add in carry and store */
*tmpb-- = (*tmpa-- >> 1) | (r << (DIGIT_BIT - 1)); *tmpb-- = (*tmpa-- >> 1) | (r << (DIGIT_BIT - 1));

4
bn_mp_div_2d.c
View File

@ -50,11 +50,11 @@ int mp_div_2d(const mp_int *a, int b, mp_int *c, mp_int *d)
/* shift any bit count < DIGIT_BIT */ /* shift any bit count < DIGIT_BIT */
D = (mp_digit)(b % DIGIT_BIT); D = (mp_digit)(b % DIGIT_BIT);
if (D != 0) { if (D != 0u) {
mp_digit *tmpc, mask, shift; mp_digit *tmpc, mask, shift;
/* mask */ /* mask */
mask = (((mp_digit)1) << D) - 1; mask = (1uL << D) - 1uL;
/* shift for lsb */ /* shift for lsb */
shift = DIGIT_BIT - D; shift = DIGIT_BIT - D;

8
bn_mp_div_3.c
View File

@ -36,7 +36,7 @@ int mp_div_3(const mp_int *a, mp_int *c, mp_digit *d)
for (ix = a->used - 1; ix >= 0; ix--) { for (ix = a->used - 1; ix >= 0; ix--) {
w = (w << ((mp_word)DIGIT_BIT)) | ((mp_word)a->dp[ix]); w = (w << ((mp_word)DIGIT_BIT)) | ((mp_word)a->dp[ix]);
if (w >= 3) { if (w >= 3u) {
/* multiply w by [1/3] */ /* multiply w by [1/3] */
t = (w * ((mp_word)b)) >> ((mp_word)DIGIT_BIT); t = (w * ((mp_word)b)) >> ((mp_word)DIGIT_BIT);
@ -46,9 +46,9 @@ int mp_div_3(const mp_int *a, mp_int *c, mp_digit *d)
/* fixup the remainder as required since /* fixup the remainder as required since
* the optimization is not exact. * the optimization is not exact.
*/ */
while (w >= 3) { while (w >= 3u) {
t += 1; t += 1u;
w -= 3; w -= 3u;
} }
} else { } else {
t = 0; t = 0;

12
bn_mp_div_d.c
View File

@ -20,12 +20,12 @@ static int s_is_power_of_two(mp_digit b, int *p)
int x; int x;
/* fast return if no power of two */ /* fast return if no power of two */
if ((b == 0) || ((b & (b-1)) != 0)) { if ((b == 0u) || ((b & (b-1u)) != 0u)) {
return 0; return 0;
} }
for (x = 0; x < DIGIT_BIT; x++) { for (x = 0; x < DIGIT_BIT; x++) {
if (b == (((mp_digit)1)<<x)) { if (b == (1uL<<x)) {
*p = x; *p = x;
return 1; return 1;
} }
@ -42,12 +42,12 @@ int mp_div_d(const mp_int *a, mp_digit b, mp_int *c, mp_digit *d)
int res, ix; int res, ix;
/* cannot divide by zero */ /* cannot divide by zero */
if (b == 0) { if (b == 0u) {
return MP_VAL; return MP_VAL;
} }
/* quick outs */ /* quick outs */
if ((b == 1) || (mp_iszero(a) == MP_YES)) { if ((b == 1u) || (mp_iszero(a) == MP_YES)) {
if (d != NULL) { if (d != NULL) {
*d = 0; *d = 0;
} }
@ -60,7 +60,7 @@ int mp_div_d(const mp_int *a, mp_digit b, mp_int *c, mp_digit *d)
/* power of two ? */ /* power of two ? */
if (s_is_power_of_two(b, &ix) == 1) { if (s_is_power_of_two(b, &ix) == 1) {
if (d != NULL) { if (d != NULL) {
*d = a->dp[0] & ((((mp_digit)1)<<ix) - 1); *d = a->dp[0] & ((1uL<<ix) - 1uL);
} }
if (c != NULL) { if (c != NULL) {
return mp_div_2d(a, ix, c, NULL); return mp_div_2d(a, ix, c, NULL);
@ -70,7 +70,7 @@ int mp_div_d(const mp_int *a, mp_digit b, mp_int *c, mp_digit *d)
#ifdef BN_MP_DIV_3_C #ifdef BN_MP_DIV_3_C
/* three? */ /* three? */
if (b == 3) { if (b == 3u) {
return mp_div_3(a, c, d); return mp_div_3(a, c, d);
} }
#endif #endif

18
bn_mp_export.c
View File

@ -38,33 +38,33 @@ int mp_export(void *rop, size_t *countp, int order, size_t size,
} lint; } lint;
lint.i = 0x01020304; lint.i = 0x01020304;
endian = (lint.c[0] == 4) ? -1 : 1; endian = (lint.c[0] == '\x04') ? -1 : 1;
} }
odd_nails = (nails % 8); odd_nails = (nails % 8u);
odd_nail_mask = 0xff; odd_nail_mask = 0xff;
for (i = 0; i < odd_nails; ++i) { for (i = 0; i < odd_nails; ++i) {
odd_nail_mask ^= (1 << (7 - i)); odd_nail_mask ^= (unsigned char)(1u << (7u - i));
} }
nail_bytes = nails / 8; nail_bytes = nails / 8u;
bits = mp_count_bits(&t); bits = mp_count_bits(&t);
count = (bits / ((size * 8) - nails)) + (((bits % ((size * 8) - nails)) != 0) ? 1 : 0); count = (bits / ((size * 8u) - nails)) + (((bits % ((size * 8u) - nails)) != 0u) ? 1u : 0u);
for (i = 0; i < count; ++i) { for (i = 0; i < count; ++i) {
for (j = 0; j < size; ++j) { for (j = 0; j < size; ++j) {
unsigned char *byte = (unsigned char *)rop + unsigned char *byte = (unsigned char *)rop +
(((order == -1) ? i : ((count - 1) - i)) * size) + (((order == -1) ? i : ((count - 1u) - i)) * size) +
((endian == -1) ? j : ((size - 1) - j)); ((endian == -1) ? j : ((size - 1u) - j));
if (j >= (size - nail_bytes)) { if (j >= (size - nail_bytes)) {
*byte = 0; *byte = 0;
continue; continue;
} }
*byte = (unsigned char)((j == ((size - nail_bytes) - 1)) ? (t.dp[0] & odd_nail_mask) : (t.dp[0] & 0xFF)); *byte = (unsigned char)((j == ((size - nail_bytes) - 1u)) ? (t.dp[0] & odd_nail_mask) : (t.dp[0] & 0xFFuL));
if ((result = mp_div_2d(&t, ((j == ((size - nail_bytes) - 1)) ? (8 - odd_nails) : 8), &t, NULL)) != MP_OKAY) { if ((result = mp_div_2d(&t, (j == ((size - nail_bytes) - 1u)) ? (int)(8u - odd_nails) : 8, &t, NULL)) != MP_OKAY) {
mp_clear(&t); mp_clear(&t);
return result; return result;
} }

8
bn_mp_expt_d_ex.c
View File

@ -31,9 +31,9 @@ int mp_expt_d_ex(const mp_int *a, mp_digit b, mp_int *c, int fast)
mp_set(c, 1uL); mp_set(c, 1uL);
if (fast != 0) { if (fast != 0) {
while (b > 0) { while (b > 0u) {
/* if the bit is set multiply */ /* if the bit is set multiply */
if ((b & 1) != 0) { if ((b & 1u) != 0u) {
if ((res = mp_mul(c, &g, c)) != MP_OKAY) { if ((res = mp_mul(c, &g, c)) != MP_OKAY) {
mp_clear(&g); mp_clear(&g);
return res; return res;
@ -41,7 +41,7 @@ int mp_expt_d_ex(const mp_int *a, mp_digit b, mp_int *c, int fast)
} }
/* square */ /* square */
if (b > 1) { if (b > 1u) {
if ((res = mp_sqr(&g, &g)) != MP_OKAY) { if ((res = mp_sqr(&g, &g)) != MP_OKAY) {
mp_clear(&g); mp_clear(&g);
return res; return res;
@ -60,7 +60,7 @@ int mp_expt_d_ex(const mp_int *a, mp_digit b, mp_int *c, int fast)
} }
/* if the bit is set multiply */ /* if the bit is set multiply */
if ((b & (mp_digit)(((mp_digit)1) << (DIGIT_BIT - 1))) != 0) { if ((b & (mp_digit)(1uL << (DIGIT_BIT - 1))) != 0u) {
if ((res = mp_mul(c, &g, c)) != MP_OKAY) { if ((res = mp_mul(c, &g, c)) != MP_OKAY) {
mp_clear(&g); mp_clear(&g);
return res; return res;

16
bn_mp_import.c
View File

@ -34,27 +34,27 @@ int mp_import(mp_int *rop, size_t count, int order, size_t size,
} lint; } lint;
lint.i = 0x01020304; lint.i = 0x01020304;
endian = (lint.c[0] == 4) ? -1 : 1; endian = (lint.c[0] == '\x04') ? -1 : 1;
} }
odd_nails = (nails % 8); odd_nails = (nails % 8u);
odd_nail_mask = 0xff; odd_nail_mask = 0xff;
for (i = 0; i < odd_nails; ++i) { for (i = 0; i < odd_nails; ++i) {
odd_nail_mask ^= (1 << (7 - i)); odd_nail_mask ^= (unsigned char)(1u << (7u - i));
} }
nail_bytes = nails / 8; nail_bytes = nails / 8u;
for (i = 0; i < count; ++i) { for (i = 0; i < count; ++i) {
for (j = 0; j < (size - nail_bytes); ++j) { for (j = 0; j < (size - nail_bytes); ++j) {
unsigned char byte = *((unsigned char *)op + unsigned char byte = *((unsigned char *)op +
(((order == 1) ? i : ((count - 1) - i)) * size) + (((order == 1) ? i : ((count - 1u) - i)) * size) +
((endian == 1) ? (j + nail_bytes) : (((size - 1) - j) - nail_bytes))); ((endian == 1) ? (j + nail_bytes) : (((size - 1u) - j) - nail_bytes)));
if ((result = mp_mul_2d(rop, ((j == 0) ? (8 - odd_nails) : 8), rop)) != MP_OKAY) { if ((result = mp_mul_2d(rop, (j == 0u) ? (int)(8u - odd_nails) : 8, rop)) != MP_OKAY) {
return result; return result;
} }
rop->dp[0] |= (j == 0) ? (byte & odd_nail_mask) : byte; rop->dp[0] |= (j == 0u) ? (byte & odd_nail_mask) : byte;
rop->used += 1; rop->used += 1;
} }
} }

16
bn_mp_is_square.c
View File

@ -58,7 +58,7 @@ int mp_is_square(const mp_int *arg, int *ret)
} }
/* First check mod 128 (suppose that DIGIT_BIT is at least 7) */ /* First check mod 128 (suppose that DIGIT_BIT is at least 7) */
if (rem_128[127 & DIGIT(arg, 0)] == 1) { if (rem_128[127u & DIGIT(arg, 0)] == 1) {
return MP_OKAY; return MP_OKAY;
} }
@ -82,13 +82,13 @@ int mp_is_square(const mp_int *arg, int *ret)
* free "t" so the easiest way is to goto ERR. We know that res * free "t" so the easiest way is to goto ERR. We know that res
* is already equal to MP_OKAY from the mp_mod call * is already equal to MP_OKAY from the mp_mod call
*/ */
if (((1L<<(r%11)) & 0x5C4L) != 0L) goto ERR; if (((1uL<<(r%11uL)) & 0x5C4uL) != 0uL) goto ERR;
if (((1L<<(r%13)) & 0x9E4L) != 0L) goto ERR; if (((1uL<<(r%13uL)) & 0x9E4uL) != 0uL) goto ERR;
if (((1L<<(r%17)) & 0x5CE8L) != 0L) goto ERR; if (((1uL<<(r%17uL)) & 0x5CE8uL) != 0uL) goto ERR;
if (((1L<<(r%19)) & 0x4F50CL) != 0L) goto ERR; if (((1uL<<(r%19uL)) & 0x4F50CuL) != 0uL) goto ERR;
if (((1L<<(r%23)) & 0x7ACCA0L) != 0L) goto ERR; if (((1uL<<(r%23uL)) & 0x7ACCA0uL) != 0uL) goto ERR;
if (((1L<<(r%29)) & 0xC2EDD0CL) != 0L) goto ERR; if (((1uL<<(r%29uL)) & 0xC2EDD0CuL) != 0uL) goto ERR;
if (((1L<<(r%31)) & 0x6DE2B848L) != 0L) goto ERR; if (((1uL<<(r%31uL)) & 0x6DE2B848uL) != 0uL) goto ERR;
/* Final check - is sqr(sqrt(arg)) == arg ? */ /* Final check - is sqr(sqrt(arg)) == arg ? */
if ((res = mp_sqrt(arg, &t)) != MP_OKAY) { if ((res = mp_sqrt(arg, &t)) != MP_OKAY) {

10
bn_mp_jacobi.c
View File

@ -72,21 +72,21 @@ int mp_jacobi(const mp_int *a, const mp_int *n, int *c)
} }
/* step 4. if e is even set s=1 */ /* step 4. if e is even set s=1 */
if ((k & 1) == 0) { if (((unsigned)k & 1u) == 0u) {
s = 1; s = 1;
} else { } else {
/* else set s=1 if p = 1/7 (mod 8) or s=-1 if p = 3/5 (mod 8) */ /* else set s=1 if p = 1/7 (mod 8) or s=-1 if p = 3/5 (mod 8) */
residue = n->dp[0] & 7; residue = n->dp[0] & 7u;
if ((residue == 1) || (residue == 7)) { if ((residue == 1u) || (residue == 7u)) {
s = 1; s = 1;
} else if ((residue == 3) || (residue == 5)) { } else if ((residue == 3u) || (residue == 5u)) {
s = -1; s = -1;
} }
} }
/* step 5. if p == 3 (mod 4) *and* a1 == 3 (mod 4) then s = -s */ /* step 5. if p == 3 (mod 4) *and* a1 == 3 (mod 4) then s = -s */
if (((n->dp[0] & 3) == 3) && ((a1.dp[0] & 3) == 3)) { if (((n->dp[0] & 3u) == 3u) && ((a1.dp[0] & 3u) == 3u)) {
s = -s; s = -s;
} }

2
bn_mp_mod_2d.c
View File

@ -43,7 +43,7 @@ int mp_mod_2d(const mp_int *a, int b, mp_int *c)
} }
/* clear the digit that is not completely outside/inside the modulus */ /* clear the digit that is not completely outside/inside the modulus */
c->dp[b / DIGIT_BIT] &= c->dp[b / DIGIT_BIT] &=
(mp_digit)((((mp_digit) 1) << (((mp_digit) b) % DIGIT_BIT)) - ((mp_digit) 1)); (mp_digit)((1uL << (((mp_digit) b) % DIGIT_BIT)) - 1uL);
mp_clamp(c); mp_clamp(c);
return MP_OKAY; return MP_OKAY;
} }

4
bn_mp_montgomery_reduce.c
View File

@ -31,7 +31,7 @@ int mp_montgomery_reduce(mp_int *x, const mp_int *n, mp_digit rho)
if ((digs < MP_WARRAY) && if ((digs < MP_WARRAY) &&
(x->used <= MP_WARRAY) && (x->used <= MP_WARRAY) &&
(n->used < (n->used <
(1 << ((CHAR_BIT * sizeof(mp_word)) - (2 * DIGIT_BIT))))) { (int)(1u << (((size_t)CHAR_BIT * sizeof(mp_word)) - (2u * (size_t)DIGIT_BIT))))) {
return fast_mp_montgomery_reduce(x, n, rho); return fast_mp_montgomery_reduce(x, n, rho);
} }
@ -85,7 +85,7 @@ int mp_montgomery_reduce(mp_int *x, const mp_int *n, mp_digit rho)
/* propagate carries upwards as required*/ /* propagate carries upwards as required*/
while (u != 0) { while (u != 0u) {
*tmpx += u; *tmpx += u;
u = *tmpx >> DIGIT_BIT; u = *tmpx >> DIGIT_BIT;
*tmpx++ &= MP_MASK; *tmpx++ &= MP_MASK;

12
bn_mp_montgomery_setup.c
View File

@ -30,20 +30,20 @@ int mp_montgomery_setup(const mp_int *n, mp_digit *rho)
*/ */
b = n->dp[0]; b = n->dp[0];
if ((b & 1) == 0) { if ((b & 1u) == 0u) {
return MP_VAL; return MP_VAL;
} }
x = (((b + 2) & 4) << 1) + b; /* here x*a==1 mod 2**4 */ x = (((b + 2u) & 4u) << 1) + b; /* here x*a==1 mod 2**4 */
x *= 2 - (b * x); /* here x*a==1 mod 2**8 */ x *= 2u - (b * x); /* here x*a==1 mod 2**8 */
#if !defined(MP_8BIT) #if !defined(MP_8BIT)
x *= 2 - (b * x); /* here x*a==1 mod 2**16 */ x *= 2u - (b * x); /* here x*a==1 mod 2**16 */
#endif #endif
#if defined(MP_64BIT) || !(defined(MP_8BIT) || defined(MP_16BIT)) #if defined(MP_64BIT) || !(defined(MP_8BIT) || defined(MP_16BIT))
x *= 2 - (b * x); /* here x*a==1 mod 2**32 */ x *= 2u - (b * x); /* here x*a==1 mod 2**32 */
#endif #endif
#ifdef MP_64BIT #ifdef MP_64BIT
x *= 2 - (b * x); /* here x*a==1 mod 2**64 */ x *= 2u - (b * x); /* here x*a==1 mod 2**64 */
#endif #endif
/* rho = -1/m mod b */ /* rho = -1/m mod b */

2
bn_mp_mul.c
View File

@ -45,7 +45,7 @@ int mp_mul(const mp_int *a, const mp_int *b, mp_int *c)
#ifdef BN_FAST_S_MP_MUL_DIGS_C #ifdef BN_FAST_S_MP_MUL_DIGS_C
if ((digs < MP_WARRAY) && if ((digs < MP_WARRAY) &&
(MIN(a->used, b->used) <= (MIN(a->used, b->used) <=
(1 << ((CHAR_BIT * sizeof(mp_word)) - (2 * DIGIT_BIT))))) { (int)(1u << (((size_t)CHAR_BIT * sizeof(mp_word)) - (2u * (size_t)DIGIT_BIT))))) {
res = fast_s_mp_mul_digs(a, b, c, digs); res = fast_s_mp_mul_digs(a, b, c, digs);
} else } else
#endif #endif

4
bn_mp_mul_2.c
View File

@ -49,7 +49,7 @@ int mp_mul_2(const mp_int *a, mp_int *b)
rr = *tmpa >> ((mp_digit)(DIGIT_BIT - 1)); rr = *tmpa >> ((mp_digit)(DIGIT_BIT - 1));
/* now shift up this digit, add in the carry [from the previous] */ /* now shift up this digit, add in the carry [from the previous] */
*tmpb++ = ((*tmpa++ << ((mp_digit)1)) | r) & MP_MASK; *tmpb++ = ((*tmpa++ << 1uL) | r) & MP_MASK;
/* copy the carry that would be from the source /* copy the carry that would be from the source
* digit into the next iteration * digit into the next iteration
@ -58,7 +58,7 @@ int mp_mul_2(const mp_int *a, mp_int *b)
} }
/* new leading digit? */ /* new leading digit? */
if (r != 0) { if (r != 0u) {
/* add a MSB which is always 1 at this point */ /* add a MSB which is always 1 at this point */
*tmpb = 1; *tmpb = 1;
++(b->used); ++(b->used);

6
bn_mp_mul_2d.c
View File

@ -43,12 +43,12 @@ int mp_mul_2d(const mp_int *a, int b, mp_int *c)
/* shift any bit count < DIGIT_BIT */ /* shift any bit count < DIGIT_BIT */
d = (mp_digit)(b % DIGIT_BIT); d = (mp_digit)(b % DIGIT_BIT);
if (d != 0) { if (d != 0u) {
mp_digit *tmpc, shift, mask, r, rr; mp_digit *tmpc, shift, mask, r, rr;
int x; int x;
/* bitmask for carries */ /* bitmask for carries */
mask = (((mp_digit)1) << d) - 1; mask = (1uL << d) - 1uL;
/* shift for msbs */ /* shift for msbs */
shift = DIGIT_BIT - d; shift = DIGIT_BIT - d;
@ -71,7 +71,7 @@ int mp_mul_2d(const mp_int *a, int b, mp_int *c)
} }
/* set final carry */ /* set final carry */
if (r != 0) { if (r != 0u) {
c->dp[(c->used)++] = r; c->dp[(c->used)++] = r;
} }
} }

4
bn_mp_n_root_ex.c
View File

@ -31,7 +31,7 @@ int mp_n_root_ex(const mp_int *a, mp_digit b, mp_int *c, int fast)
int res; int res;
/* input must be positive if b is even */ /* input must be positive if b is even */
if (((b & 1) == 0) && (a->sign == MP_NEG)) { if (((b & 1u) == 0u) && (a->sign == MP_NEG)) {
return MP_VAL; return MP_VAL;
} }
@ -63,7 +63,7 @@ int mp_n_root_ex(const mp_int *a, mp_digit b, mp_int *c, int fast)
/* t2 = t1 - ((t1**b - a) / (b * t1**(b-1))) */ /* t2 = t1 - ((t1**b - a) / (b * t1**(b-1))) */
/* t3 = t1**(b-1) */ /* t3 = t1**(b-1) */
if ((res = mp_expt_d_ex(&t1, b - 1, &t3, fast)) != MP_OKAY) { if ((res = mp_expt_d_ex(&t1, b - 1u, &t3, fast)) != MP_OKAY) {
goto LBL_T3; goto LBL_T3;
} }

2
bn_mp_prime_is_divisible.c
View File

@ -35,7 +35,7 @@ int mp_prime_is_divisible(const mp_int *a, int *result)
} }
/* is the residue zero? */ /* is the residue zero? */
if (res == 0) { if (res == 0u) {
*result = MP_YES; *result = MP_YES;
return MP_OKAY; return MP_OKAY;
} }

14
bn_mp_prime_next_prime.c
View File

@ -46,10 +46,10 @@ int mp_prime_next_prime(mp_int *a, int t, int bbs_style)
* however, the prime must be * however, the prime must be
* congruent to 3 mod 4 * congruent to 3 mod 4
*/ */
if ((ltm_prime_tab[x + 1] & 3) != 3) { if ((ltm_prime_tab[x + 1] & 3u) != 3u) {
/* scan upwards for a prime congruent to 3 mod 4 */ /* scan upwards for a prime congruent to 3 mod 4 */
for (y = x + 1; y < PRIME_SIZE; y++) { for (y = x + 1; y < PRIME_SIZE; y++) {
if ((ltm_prime_tab[y] & 3) == 3) { if ((ltm_prime_tab[y] & 3u) == 3u) {
mp_set(a, ltm_prime_tab[y]); mp_set(a, ltm_prime_tab[y]);
return MP_OKAY; return MP_OKAY;
} }
@ -80,8 +80,8 @@ int mp_prime_next_prime(mp_int *a, int t, int bbs_style)
if (bbs_style == 1) { if (bbs_style == 1) {
/* if a mod 4 != 3 subtract the correct value to make it so */ /* if a mod 4 != 3 subtract the correct value to make it so */
if ((a->dp[0] & 3) != 3) { if ((a->dp[0] & 3u) != 3u) {
if ((err = mp_sub_d(a, (a->dp[0] & 3) + 1, a)) != MP_OKAY) { if ((err = mp_sub_d(a, (a->dp[0] & 3u) + 1u, a)) != MP_OKAY) {
return err; return err;
}; };
} }
@ -127,11 +127,11 @@ int mp_prime_next_prime(mp_int *a, int t, int bbs_style)
} }
/* set flag if zero */ /* set flag if zero */
if (res_tab[x] == 0) { if (res_tab[x] == 0u) {
y = 1; y = 1;
} }
} }
} while ((y == 1) && (step < ((((mp_digit)1) << DIGIT_BIT) - kstep))); } while ((y == 1) && (step < ((1uL << DIGIT_BIT) - kstep)));
/* add the step */ /* add the step */
if ((err = mp_add_d(a, step, a)) != MP_OKAY) { if ((err = mp_add_d(a, step, a)) != MP_OKAY) {
@ -139,7 +139,7 @@ int mp_prime_next_prime(mp_int *a, int t, int bbs_style)
} }
/* if didn't pass sieve and step == MAX then skip test */ /* if didn't pass sieve and step == MAX then skip test */
if ((y == 1) && (step >= ((((mp_digit)1) << DIGIT_BIT) - kstep))) { if ((y == 1) && (step >= ((1uL << DIGIT_BIT) - kstep))) {
continue; continue;
} }

4
bn_mp_rand.c
View File

@ -15,7 +15,7 @@
* Tom St Denis, tstdenis82@gmail.com, http://libtom.org * Tom St Denis, tstdenis82@gmail.com, http://libtom.org
*/ */
#if MP_GEN_RANDOM_MAX == 0xffffffff #if MP_GEN_RANDOM_MAX == 0xffffffffu
#define MP_GEN_RANDOM_SHIFT 32 #define MP_GEN_RANDOM_SHIFT 32
#elif MP_GEN_RANDOM_MAX == 32767 #elif MP_GEN_RANDOM_MAX == 32767
/* SHRT_MAX */ /* SHRT_MAX */
@ -54,7 +54,7 @@ int mp_rand(mp_int *a, int digits)
/* first place a random non-zero digit */ /* first place a random non-zero digit */
do { do {
d = s_gen_random(); d = s_gen_random();
} while (d == 0); } while (d == 0u);
if ((res = mp_add_d(a, d, a)) != MP_OKAY) { if ((res = mp_add_d(a, d, a)) != MP_OKAY) {
return res; return res;

2
bn_mp_read_unsigned_bin.c
View File

@ -41,7 +41,7 @@ int mp_read_unsigned_bin(mp_int *a, const unsigned char *b, int c)
a->used += 1; a->used += 1;
#else #else
a->dp[0] = (*b & MP_MASK); a->dp[0] = (*b & MP_MASK);
a->dp[1] |= ((*b++ >> 7U) & 1); a->dp[1] |= ((*b++ >> 7) & 1u);
a->used += 2; a->used += 2;
#endif #endif
} }

2
bn_mp_reduce.c
View File

@ -33,7 +33,7 @@ int mp_reduce(mp_int *x, const mp_int *m, const mp_int *mu)
mp_rshd(&q, um - 1); mp_rshd(&q, um - 1);
/* according to HAC this optimization is ok */ /* according to HAC this optimization is ok */
if (((mp_digit) um) > (((mp_digit)1) << (DIGIT_BIT - 1))) { if (((mp_digit) um) > (1uL << (DIGIT_BIT - 1))) {
if ((res = mp_mul(&q, mu, &q)) != MP_OKAY) { if ((res = mp_mul(&q, mu, &q)) != MP_OKAY) {
goto CLEANUP; goto CLEANUP;
} }

2
bn_mp_reduce_2k.c
View File

@ -32,7 +32,7 @@ top:
goto ERR; goto ERR;
} }
if (d != 1) { if (d != 1u) {
/* q = q * d */ /* q = q * d */
if ((res = mp_mul_d(&q, d, &q)) != MP_OKAY) { if ((res = mp_mul_d(&q, d, &q)) != MP_OKAY) {
goto ERR; goto ERR;

2
bn_mp_reduce_is_2k.c
View File

@ -32,7 +32,7 @@ int mp_reduce_is_2k(const mp_int *a)
/* Test every bit from the second digit up, must be 1 */ /* Test every bit from the second digit up, must be 1 */
for (ix = DIGIT_BIT; ix < iy; ix++) { for (ix = DIGIT_BIT; ix < iy; ix++) {
if ((a->dp[iw] & iz) == 0) { if ((a->dp[iw] & iz) == 0u) {
return MP_NO; return MP_NO;
} }
iz <<= 1; iz <<= 1;

2
bn_mp_set.c
View File

@ -20,7 +20,7 @@ void mp_set(mp_int *a, mp_digit b)
{ {
mp_zero(a); mp_zero(a);
a->dp[0] = b & MP_MASK; a->dp[0] = b & MP_MASK;
a->used = (a->dp[0] != 0) ? 1 : 0; a->used = (a->dp[0] != 0u) ? 1 : 0;
} }
#endif #endif

2
bn_mp_set_int.c
View File

@ -30,7 +30,7 @@ int mp_set_int(mp_int *a, unsigned long b)
} }
/* OR in the top four bits of the source */ /* OR in the top four bits of the source */
a->dp[0] |= (b >> 28) & 15; a->dp[0] |= (b >> 28) & 15uL;
/* shift the source up to the next four bits */ /* shift the source up to the next four bits */
b <<= 4; b <<= 4;

2
bn_mp_sqr.c
View File

@ -37,7 +37,7 @@ int mp_sqr(const mp_int *a, mp_int *b)
/* can we use the fast comba multiplier? */ /* can we use the fast comba multiplier? */
if ((((a->used * 2) + 1) < MP_WARRAY) && if ((((a->used * 2) + 1) < MP_WARRAY) &&
(a->used < (a->used <
(1 << (((sizeof(mp_word) * CHAR_BIT) - (2 * DIGIT_BIT)) - 1)))) { (int)(1u << (((sizeof(mp_word) * (size_t)CHAR_BIT) - (2u * (size_t)DIGIT_BIT)) - 1u)))) {
res = fast_s_mp_sqr(a, b); res = fast_s_mp_sqr(a, b);
} else } else
#endif #endif

8
bn_mp_sqrtmod_prime.c
View File

@ -39,7 +39,7 @@ int mp_sqrtmod_prime(const mp_int *n, const mp_int *prime, mp_int *ret)
* Handbook of Applied Cryptography algorithm 3.36 * Handbook of Applied Cryptography algorithm 3.36
*/ */
if ((res = mp_mod_d(prime, 4uL, &i)) != MP_OKAY) goto cleanup; if ((res = mp_mod_d(prime, 4uL, &i)) != MP_OKAY) goto cleanup;
if (i == 3) { if (i == 3u) {
if ((res = mp_add_d(prime, 1uL, &t1)) != MP_OKAY) goto cleanup; if ((res = mp_add_d(prime, 1uL, &t1)) != MP_OKAY) goto cleanup;
if ((res = mp_div_2(&t1, &t1)) != MP_OKAY) goto cleanup; if ((res = mp_div_2(&t1, &t1)) != MP_OKAY) goto cleanup;
if ((res = mp_div_2(&t1, &t1)) != MP_OKAY) goto cleanup; if ((res = mp_div_2(&t1, &t1)) != MP_OKAY) goto cleanup;
@ -64,7 +64,7 @@ int mp_sqrtmod_prime(const mp_int *n, const mp_int *prime, mp_int *ret)
} }
/* find a Z such that the Legendre symbol (Z|prime) == -1 */ /* find a Z such that the Legendre symbol (Z|prime) == -1 */
if ((res = mp_set_int(&Z, 2)) != MP_OKAY) goto cleanup; if ((res = mp_set_int(&Z, 2uL)) != MP_OKAY) goto cleanup;
/* Z = 2 */ /* Z = 2 */
while (1) { while (1) {
if ((res = mp_jacobi(&Z, prime, &legendre)) != MP_OKAY) goto cleanup; if ((res = mp_jacobi(&Z, prime, &legendre)) != MP_OKAY) goto cleanup;
@ -84,7 +84,7 @@ int mp_sqrtmod_prime(const mp_int *n, const mp_int *prime, mp_int *ret)
/* T = n ^ Q mod prime */ /* T = n ^ Q mod prime */
if ((res = mp_copy(&S, &M)) != MP_OKAY) goto cleanup; if ((res = mp_copy(&S, &M)) != MP_OKAY) goto cleanup;
/* M = S */ /* M = S */
if ((res = mp_set_int(&two, 2)) != MP_OKAY) goto cleanup; if ((res = mp_set_int(&two, 2uL)) != MP_OKAY) goto cleanup;
res = MP_VAL; res = MP_VAL;
while (1) { while (1) {
@ -95,7 +95,7 @@ int mp_sqrtmod_prime(const mp_int *n, const mp_int *prime, mp_int *ret)
if ((res = mp_exptmod(&t1, &two, prime, &t1)) != MP_OKAY) goto cleanup; if ((res = mp_exptmod(&t1, &two, prime, &t1)) != MP_OKAY) goto cleanup;
i++; i++;
} }
if (i == 0) { if (i == 0u) {
if ((res = mp_copy(&R, ret)) != MP_OKAY) goto cleanup; if ((res = mp_copy(&R, ret)) != MP_OKAY) goto cleanup;
res = MP_OKAY; res = MP_OKAY;
goto cleanup; goto cleanup;

4
bn_mp_sub_d.c
View File

@ -67,13 +67,13 @@ int mp_sub_d(const mp_int *a, mp_digit b, mp_int *c)
/* subtract first digit */ /* subtract first digit */
*tmpc = *tmpa++ - b; *tmpc = *tmpa++ - b;
mu = *tmpc >> ((sizeof(mp_digit) * CHAR_BIT) - 1); mu = *tmpc >> ((sizeof(mp_digit) * (size_t)CHAR_BIT) - 1u);
*tmpc++ &= MP_MASK; *tmpc++ &= MP_MASK;
/* handle rest of the digits */ /* handle rest of the digits */
for (ix = 1; ix < a->used; ix++) { for (ix = 1; ix < a->used; ix++) {
*tmpc = *tmpa++ - mu; *tmpc = *tmpa++ - mu;
mu = *tmpc >> ((sizeof(mp_digit) * CHAR_BIT) - 1); mu = *tmpc >> ((sizeof(mp_digit) * (size_t)CHAR_BIT) - 1u);
*tmpc++ &= MP_MASK; *tmpc++ &= MP_MASK;
} }
} }

4
bn_mp_to_unsigned_bin.c
View File

@ -28,9 +28,9 @@ int mp_to_unsigned_bin(const mp_int *a, unsigned char *b)
x = 0; x = 0;
while (mp_iszero(&t) == MP_NO) { while (mp_iszero(&t) == MP_NO) {
#ifndef MP_8BIT #ifndef MP_8BIT
b[x++] = (unsigned char)(t.dp[0] & 255); b[x++] = (unsigned char)(t.dp[0] & 255u);
#else #else
b[x++] = (unsigned char)(t.dp[0] | ((t.dp[1] & 0x01) << 7)); b[x++] = (unsigned char)(t.dp[0] | ((t.dp[1] & 1u) << 7));
#endif #endif
if ((res = mp_div_2d(&t, 8, &t, NULL)) != MP_OKAY) { if ((res = mp_div_2d(&t, 8, &t, NULL)) != MP_OKAY) {
mp_clear(&t); mp_clear(&t);

2
bn_mp_unsigned_bin_size.c
View File

@ -19,7 +19,7 @@
int mp_unsigned_bin_size(const mp_int *a) int mp_unsigned_bin_size(const mp_int *a)
{ {
int size = mp_count_bits(a); int size = mp_count_bits(a);
return (size / 8) + (((size & 7) != 0) ? 1 : 0); return (size / 8) + ((((unsigned)size & 7u) != 0u) ? 1 : 0);
} }
#endif #endif

2
bn_s_mp_mul_digs.c
View File

@ -30,7 +30,7 @@ int s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs)
/* can we use the fast multiplier? */ /* can we use the fast multiplier? */
if (((digs) < MP_WARRAY) && if (((digs) < MP_WARRAY) &&
(MIN(a->used, b->used) < (MIN(a->used, b->used) <
(1 << ((CHAR_BIT * sizeof(mp_word)) - (2 * DIGIT_BIT))))) { (int)(1u << (((size_t)CHAR_BIT * sizeof(mp_word)) - (2u * (size_t)DIGIT_BIT))))) {
return fast_s_mp_mul_digs(a, b, c, digs); return fast_s_mp_mul_digs(a, b, c, digs);
} }

2
bn_s_mp_mul_high_digs.c
View File

@ -29,7 +29,7 @@ int s_mp_mul_high_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs)
/* can we use the fast multiplier? */ /* can we use the fast multiplier? */
#ifdef BN_FAST_S_MP_MUL_HIGH_DIGS_C #ifdef BN_FAST_S_MP_MUL_HIGH_DIGS_C
if (((a->used + b->used + 1) < MP_WARRAY) if (((a->used + b->used + 1) < MP_WARRAY)
&& (MIN(a->used, b->used) < (1 << ((CHAR_BIT * sizeof(mp_word)) - (2 * DIGIT_BIT))))) { && (MIN(a->used, b->used) < (int)(1u << (((size_t)CHAR_BIT * sizeof(mp_word)) - (2u * (size_t)DIGIT_BIT))))) {
return fast_s_mp_mul_high_digs(a, b, c, digs); return fast_s_mp_mul_high_digs(a, b, c, digs);
} }
#endif #endif

2
bn_s_mp_sqr.c
View File

@ -65,7 +65,7 @@ int s_mp_sqr(const mp_int *a, mp_int *b)
u = (mp_digit)(r >> ((mp_word) DIGIT_BIT)); u = (mp_digit)(r >> ((mp_word) DIGIT_BIT));
} }
/* propagate upwards */ /* propagate upwards */
while (u != ((mp_digit) 0)) { while (u != 0uL) {
r = ((mp_word) *tmpt) + ((mp_word) u); r = ((mp_word) *tmpt) + ((mp_word) u);
*tmpt++ = (mp_digit)(r & ((mp_word) MP_MASK)); *tmpt++ = (mp_digit)(r & ((mp_word) MP_MASK));
u = (mp_digit)(r >> ((mp_word) DIGIT_BIT)); u = (mp_digit)(r >> ((mp_word) DIGIT_BIT));

4
bn_s_mp_sub.c
View File

@ -53,7 +53,7 @@ int s_mp_sub(const mp_int *a, const mp_int *b, mp_int *c)
* if a carry does occur it will propagate all the way to the * if a carry does occur it will propagate all the way to the
* MSB. As a result a single shift is enough to get the carry * MSB. As a result a single shift is enough to get the carry
*/ */
u = *tmpc >> ((mp_digit)((CHAR_BIT * sizeof(mp_digit)) - 1)); u = *tmpc >> ((mp_digit)((CHAR_BIT * sizeof(mp_digit)) - 1u));
/* Clear carry from T[i] */ /* Clear carry from T[i] */
*tmpc++ &= MP_MASK; *tmpc++ &= MP_MASK;
@ -65,7 +65,7 @@ int s_mp_sub(const mp_int *a, const mp_int *b, mp_int *c)
*tmpc = *tmpa++ - u; *tmpc = *tmpa++ - u;
/* U = carry bit of T[i] */ /* U = carry bit of T[i] */
u = *tmpc >> ((mp_digit)((CHAR_BIT * sizeof(mp_digit)) - 1)); u = *tmpc >> ((mp_digit)((CHAR_BIT * sizeof(mp_digit)) - 1u));
/* Clear carry from T[i] */ /* Clear carry from T[i] */
*tmpc++ &= MP_MASK; *tmpc++ &= MP_MASK;

4
tommath.h
View File

@ -105,7 +105,7 @@ typedef mp_digit mp_min_u32;
/* use arc4random on platforms that support it */ /* use arc4random on platforms that support it */
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
# define MP_GEN_RANDOM() arc4random() # define MP_GEN_RANDOM() arc4random()
# define MP_GEN_RANDOM_MAX 0xffffffff # define MP_GEN_RANDOM_MAX 0xffffffffu
#endif #endif
/* use rand() as fall-back if there's no better rand function */ /* use rand() as fall-back if there's no better rand function */
@ -160,7 +160,7 @@ extern int KARATSUBA_MUL_CUTOFF,
#endif #endif
/* size of comba arrays, should be at least 2 * 2**(BITS_PER_WORD - BITS_PER_DIGIT*2) */ /* size of comba arrays, should be at least 2 * 2**(BITS_PER_WORD - BITS_PER_DIGIT*2) */
#define MP_WARRAY (1 << (((sizeof(mp_word) * CHAR_BIT) - (2 * DIGIT_BIT)) + 1)) #define MP_WARRAY (1u << (((sizeof(mp_word) * CHAR_BIT) - (2 * DIGIT_BIT)) + 1))
/* the infamous mp_int structure */ /* the infamous mp_int structure */
typedef struct { typedef struct {

2
tommath_private.h
View File

@ -101,7 +101,7 @@ int func_name (mp_int * a, type b) \
} \ } \
\ \
/* OR in the top four bits of the source */ \ /* OR in the top four bits of the source */ \
a->dp[0] |= (b >> ((sizeof(type) * 8u) - 4u)) & 15u; \ a->dp[0] |= (b >> ((sizeof(type) * 8u) - 4u)) & 15uL;\
\ \
/* shift the source up to the next four bits */ \ /* shift the source up to the next four bits */ \
b <<= 4; \ b <<= 4; \