Fix unused but set variable warnings [-Werror=unused-but-set-variable]

This commit is contained in:
Gaël PORTAY 2015-05-02 12:18:22 +02:00
parent 6086851fc1
commit 3e91ec07e4
2 changed files with 9 additions and 4 deletions

View File

@ -122,9 +122,10 @@ static ulong32 setup_mix2(ulong32 temp)
*/ */
int SETUP(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey) int SETUP(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey)
{ {
int i, j; int i;
ulong32 temp, *rk; ulong32 temp, *rk;
#ifndef ENCRYPT_ONLY #ifndef ENCRYPT_ONLY
int j;
ulong32 *rrk; ulong32 *rrk;
#endif #endif
LTC_ARGCHK(key != NULL); LTC_ARGCHK(key != NULL);
@ -148,7 +149,9 @@ int SETUP(const unsigned char *key, int keylen, int num_rounds, symmetric_key *s
LOAD32H(rk[2], key + 8); LOAD32H(rk[2], key + 8);
LOAD32H(rk[3], key + 12); LOAD32H(rk[3], key + 12);
if (keylen == 16) { if (keylen == 16) {
#ifndef ENCRYPT_ONLY
j = 44; j = 44;
#endif
for (;;) { for (;;) {
temp = rk[3]; temp = rk[3];
rk[4] = rk[0] ^ setup_mix(temp) ^ rcon[i]; rk[4] = rk[0] ^ setup_mix(temp) ^ rcon[i];
@ -161,7 +164,9 @@ int SETUP(const unsigned char *key, int keylen, int num_rounds, symmetric_key *s
rk += 4; rk += 4;
} }
} else if (keylen == 24) { } else if (keylen == 24) {
#ifndef ENCRYPT_ONLY
j = 52; j = 52;
#endif
LOAD32H(rk[4], key + 16); LOAD32H(rk[4], key + 16);
LOAD32H(rk[5], key + 20); LOAD32H(rk[5], key + 20);
for (;;) { for (;;) {
@ -182,7 +187,9 @@ int SETUP(const unsigned char *key, int keylen, int num_rounds, symmetric_key *s
rk += 6; rk += 6;
} }
} else if (keylen == 32) { } else if (keylen == 32) {
#ifndef ENCRYPT_ONLY
j = 60; j = 60;
#endif
LOAD32H(rk[4], key + 16); LOAD32H(rk[4], key + 16);
LOAD32H(rk[5], key + 20); LOAD32H(rk[5], key + 20);
LOAD32H(rk[6], key + 24); LOAD32H(rk[6], key + 24);

View File

@ -40,7 +40,7 @@ int ltc_ecc_mulmod(void *k, ecc_point *G, ecc_point *R, void *modulus, int map)
int i, j, err; int i, j, err;
void *mu, *mp; void *mu, *mp;
unsigned long buf; unsigned long buf;
int first, bitbuf, bitcpy, bitcnt, mode, digidx; int bitcnt, mode, digidx;
LTC_ARGCHK(k != NULL); LTC_ARGCHK(k != NULL);
LTC_ARGCHK(G != NULL); LTC_ARGCHK(G != NULL);
@ -98,8 +98,6 @@ int ltc_ecc_mulmod(void *k, ecc_point *G, ecc_point *R, void *modulus, int map)
bitcnt = 1; bitcnt = 1;
buf = 0; buf = 0;
digidx = mp_get_digit_count(k) - 1; digidx = mp_get_digit_count(k) - 1;
bitcpy = bitbuf = 0;
first = 1;
/* perform ops */ /* perform ops */
for (;;) { for (;;) {