Mercurial > dropbear

changeset 1092:0e1465709336

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix unused but set variable warnings [-Werror=unused-but-set-variable]
author Gaël PORTAY <gael.portay@gmail.com>
date Sat, 02 May 2015 12:18:22 +0200
parents eef377591301
children aae71c5f7d5b
files libtomcrypt/src/ciphers/aes/aes.c libtomcrypt/src/pk/ecc/ltc_ecc_mulmod_timing.c
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libtomcrypt/src/ciphers/aes/aes.c	Sat May 02 12:16:06 2015 +0200
+++ b/libtomcrypt/src/ciphers/aes/aes.c	Sat May 02 12:18:22 2015 +0200
@@ -122,9 +122,10 @@
  */
 int SETUP(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey)
 {
-    int i, j;
+    int i;
     ulong32 temp, *rk;
 #ifndef ENCRYPT_ONLY
+    int j;
     ulong32 *rrk;
 #endif    
     LTC_ARGCHK(key  != NULL);
@@ -148,7 +149,9 @@
     LOAD32H(rk[2], key +  8);
     LOAD32H(rk[3], key + 12);
     if (keylen == 16) {
+        #ifndef ENCRYPT_ONLY
         j = 44;
+        #endif
         for (;;) {
             temp  = rk[3];
             rk[4] = rk[0] ^ setup_mix(temp) ^ rcon[i];
@@ -161,7 +164,9 @@
             rk += 4;
         }
     } else if (keylen == 24) {
+        #ifndef ENCRYPT_ONLY
         j = 52;   
+        #endif
         LOAD32H(rk[4], key + 16);
         LOAD32H(rk[5], key + 20);
         for (;;) {
@@ -182,7 +187,9 @@
             rk += 6;
         }
     } else if (keylen == 32) {
+        #ifndef ENCRYPT_ONLY
         j = 60;
+        #endif
         LOAD32H(rk[4], key + 16);
         LOAD32H(rk[5], key + 20);
         LOAD32H(rk[6], key + 24);
--- a/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod_timing.c	Sat May 02 12:16:06 2015 +0200
+++ b/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod_timing.c	Sat May 02 12:18:22 2015 +0200
@@ -40,7 +40,7 @@
    int        i, j, err;
    void       *mu, *mp;
    unsigned long buf;
-   int        first, bitbuf, bitcpy, bitcnt, mode, digidx;
+   int        bitcnt, mode, digidx;
 
    LTC_ARGCHK(k       != NULL);
    LTC_ARGCHK(G       != NULL);
@@ -98,8 +98,6 @@
    bitcnt = 1;
    buf    = 0;
    digidx = mp_get_digit_count(k) - 1;
-   bitcpy = bitbuf = 0;
-   first  = 1;
 
    /* perform ops */
    for (;;) {