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

mtest: fix compiler warnings

Browse Source
This commit is contained in:
Steffen Jaeckel 2014-10-14 13:55:35 +02:00
parent 410ae3951e
commit e581d078f6
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mtest/mpi.c
View File

@ -1264,7 +1264,7 @@ mp_err mp_expt(mp_int *a, mp_int *b, mp_int *c)
mp_int s, x; mp_int s, x;
mp_err res; mp_err res;
mp_digit d; mp_digit d;
int dig, bit; unsigned int bit, dig;
ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG); ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
@ -1637,7 +1637,7 @@ mp_err mp_exptmod(mp_int *a, mp_int *b, mp_int *m, mp_int *c)
mp_err res; mp_err res;
mp_digit d, *db = DIGITS(b); mp_digit d, *db = DIGITS(b);
mp_size ub = USED(b); mp_size ub = USED(b);
int dig, bit; unsigned int bit, dig;
ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG); ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
@ -2387,7 +2387,7 @@ mp_err mp_to_unsigned_bin(mp_int *mp, unsigned char *str)
/* Generate digits in reverse order */ /* Generate digits in reverse order */
while(dp < end) { while(dp < end) {
int ix; unsigned int ix;
d = *dp; d = *dp;
for(ix = 0; ix < sizeof(mp_digit); ++ix) { for(ix = 0; ix < sizeof(mp_digit); ++ix) {
@ -2541,7 +2541,7 @@ int mp_value_radix_size(int num, int qty, int radix)
/* {{{ mp_toradix(mp, str, radix) */ /* {{{ mp_toradix(mp, str, radix) */
mp_err mp_toradix(mp_int *mp, unsigned char *str, int radix) mp_err mp_toradix(mp_int *mp, char *str, int radix)
{ {
int ix, pos = 0; int ix, pos = 0;
@ -2587,10 +2587,10 @@ mp_err mp_toradix(mp_int *mp, unsigned char *str, int radix)
/* Reverse the digits and sign indicator */ /* Reverse the digits and sign indicator */
ix = 0; ix = 0;
while(ix < pos) { while(ix < pos) {
char tmp = str[ix]; char _tmp = str[ix];
str[ix] = str[pos]; str[ix] = str[pos];
str[pos] = tmp; str[pos] = _tmp;
++ix; ++ix;
--pos; --pos;
} }
@ -2833,7 +2833,7 @@ mp_err s_mp_lshd(mp_int *mp, mp_size p)
dp[ix + p] = dp[ix]; dp[ix + p] = dp[ix];
/* Fill the bottom digits with zeroes */ /* Fill the bottom digits with zeroes */
for(ix = 0; ix < p; ix++) for(ix = 0; (unsigned)ix < p; ix++)
dp[ix] = 0; dp[ix] = 0;
return MP_OKAY; return MP_OKAY;
@ -2898,7 +2898,7 @@ void s_mp_div_2(mp_int *mp)
mp_err s_mp_mul_2(mp_int *mp) mp_err s_mp_mul_2(mp_int *mp)
{ {
int ix; unsigned int ix;
mp_digit kin = 0, kout, *dp = DIGITS(mp); mp_digit kin = 0, kout, *dp = DIGITS(mp);
mp_err res; mp_err res;
@ -2970,7 +2970,7 @@ mp_err s_mp_mul_2d(mp_int *mp, mp_digit d)
mp_err res; mp_err res;
mp_digit save, next, mask, *dp; mp_digit save, next, mask, *dp;
mp_size used; mp_size used;
int ix; unsigned int ix;
if((res = s_mp_lshd(mp, d / DIGIT_BIT)) != MP_OKAY) if((res = s_mp_lshd(mp, d / DIGIT_BIT)) != MP_OKAY)
return res; return res;

2
mtest/mpi.h
View File

@ -210,7 +210,7 @@ int mp_count_bits(mp_int *mp);
mp_err mp_read_radix(mp_int *mp, unsigned char *str, int radix); mp_err mp_read_radix(mp_int *mp, unsigned char *str, int radix);
int mp_radix_size(mp_int *mp, int radix); int mp_radix_size(mp_int *mp, int radix);
int mp_value_radix_size(int num, int qty, int radix); int mp_value_radix_size(int num, int qty, int radix);
mp_err mp_toradix(mp_int *mp, unsigned char *str, int radix); mp_err mp_toradix(mp_int *mp, char *str, int radix);
int mp_char2value(char ch, int r); int mp_char2value(char ch, int r);

16
mtest/mtest.c
View File

@ -43,24 +43,32 @@ FILE *rng;
void rand_num(mp_int *a) void rand_num(mp_int *a)
{ {
int n, size; int size;
unsigned char buf[2048]; unsigned char buf[2048];
size_t sz;
size = 1 + ((fgetc(rng)<<8) + fgetc(rng)) % 101; size = 1 + ((fgetc(rng)<<8) + fgetc(rng)) % 101;
buf[0] = (fgetc(rng)&1)?1:0; buf[0] = (fgetc(rng)&1)?1:0;
fread(buf+1, 1, size, rng); sz = fread(buf+1, 1, size, rng);
if (sz != (unsigned)size) {
fprintf(stderr, "\nWarning: fread failed\n\n");
}
while (buf[1] == 0) buf[1] = fgetc(rng); while (buf[1] == 0) buf[1] = fgetc(rng);
mp_read_raw(a, buf, 1+size); mp_read_raw(a, buf, 1+size);
} }
void rand_num2(mp_int *a) void rand_num2(mp_int *a)
{ {
int n, size; int size;
unsigned char buf[2048]; unsigned char buf[2048];
size_t sz;
size = 10 + ((fgetc(rng)<<8) + fgetc(rng)) % 101; size = 10 + ((fgetc(rng)<<8) + fgetc(rng)) % 101;
buf[0] = (fgetc(rng)&1)?1:0; buf[0] = (fgetc(rng)&1)?1:0;
fread(buf+1, 1, size, rng); sz = fread(buf+1, 1, size, rng);
if (sz != (unsigned)size) {
fprintf(stderr, "\nWarning: fread failed\n\n");
}
while (buf[1] == 0) buf[1] = fgetc(rng); while (buf[1] == 0) buf[1] = fgetc(rng);
mp_read_raw(a, buf, 1+size); mp_read_raw(a, buf, 1+size);
} }