Mercurial > dropbear
comparison libtomcrypt/src/ciphers/aes/aes.c @ 1092:0e1465709336
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 | f849a5ca2efc |
comparison
equal
deleted
inserted
replaced
1091:eef377591301 | 1092:0e1465709336 |
---|---|
120 @param skey The key in as scheduled by this function. | 120 @param skey The key in as scheduled by this function. |
121 @return CRYPT_OK if successful | 121 @return CRYPT_OK if successful |
122 */ | 122 */ |
123 int SETUP(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey) | 123 int SETUP(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey) |
124 { | 124 { |
125 int i, j; | 125 int i; |
126 ulong32 temp, *rk; | 126 ulong32 temp, *rk; |
127 #ifndef ENCRYPT_ONLY | 127 #ifndef ENCRYPT_ONLY |
128 int j; | |
128 ulong32 *rrk; | 129 ulong32 *rrk; |
129 #endif | 130 #endif |
130 LTC_ARGCHK(key != NULL); | 131 LTC_ARGCHK(key != NULL); |
131 LTC_ARGCHK(skey != NULL); | 132 LTC_ARGCHK(skey != NULL); |
132 | 133 |
146 LOAD32H(rk[0], key ); | 147 LOAD32H(rk[0], key ); |
147 LOAD32H(rk[1], key + 4); | 148 LOAD32H(rk[1], key + 4); |
148 LOAD32H(rk[2], key + 8); | 149 LOAD32H(rk[2], key + 8); |
149 LOAD32H(rk[3], key + 12); | 150 LOAD32H(rk[3], key + 12); |
150 if (keylen == 16) { | 151 if (keylen == 16) { |
152 #ifndef ENCRYPT_ONLY | |
151 j = 44; | 153 j = 44; |
154 #endif | |
152 for (;;) { | 155 for (;;) { |
153 temp = rk[3]; | 156 temp = rk[3]; |
154 rk[4] = rk[0] ^ setup_mix(temp) ^ rcon[i]; | 157 rk[4] = rk[0] ^ setup_mix(temp) ^ rcon[i]; |
155 rk[5] = rk[1] ^ rk[4]; | 158 rk[5] = rk[1] ^ rk[4]; |
156 rk[6] = rk[2] ^ rk[5]; | 159 rk[6] = rk[2] ^ rk[5]; |
159 break; | 162 break; |
160 } | 163 } |
161 rk += 4; | 164 rk += 4; |
162 } | 165 } |
163 } else if (keylen == 24) { | 166 } else if (keylen == 24) { |
167 #ifndef ENCRYPT_ONLY | |
164 j = 52; | 168 j = 52; |
169 #endif | |
165 LOAD32H(rk[4], key + 16); | 170 LOAD32H(rk[4], key + 16); |
166 LOAD32H(rk[5], key + 20); | 171 LOAD32H(rk[5], key + 20); |
167 for (;;) { | 172 for (;;) { |
168 #ifdef _MSC_VER | 173 #ifdef _MSC_VER |
169 temp = skey->rijndael.eK[rk - skey->rijndael.eK + 5]; | 174 temp = skey->rijndael.eK[rk - skey->rijndael.eK + 5]; |
180 rk[10] = rk[ 4] ^ rk[ 9]; | 185 rk[10] = rk[ 4] ^ rk[ 9]; |
181 rk[11] = rk[ 5] ^ rk[10]; | 186 rk[11] = rk[ 5] ^ rk[10]; |
182 rk += 6; | 187 rk += 6; |
183 } | 188 } |
184 } else if (keylen == 32) { | 189 } else if (keylen == 32) { |
190 #ifndef ENCRYPT_ONLY | |
185 j = 60; | 191 j = 60; |
192 #endif | |
186 LOAD32H(rk[4], key + 16); | 193 LOAD32H(rk[4], key + 16); |
187 LOAD32H(rk[5], key + 20); | 194 LOAD32H(rk[5], key + 20); |
188 LOAD32H(rk[6], key + 24); | 195 LOAD32H(rk[6], key + 24); |
189 LOAD32H(rk[7], key + 28); | 196 LOAD32H(rk[7], key + 28); |
190 for (;;) { | 197 for (;;) { |