Commit 84c72fb1 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

cosmetics

Originally committed as revision 7470 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7acc1a27
...@@ -72,7 +72,6 @@ static inline void mix(uint8_t state[4][4], uint32_t multbl[4][256]){ ...@@ -72,7 +72,6 @@ static inline void mix(uint8_t state[4][4], uint32_t multbl[4][256]){
#endif #endif
} }
void av_aes_decrypt(AVAES *a){ void av_aes_decrypt(AVAES *a){
int t, r; int t, r;
...@@ -145,11 +144,11 @@ AVAES *av_aes_init(uint8_t *key, int key_bits) { ...@@ -145,11 +144,11 @@ AVAES *av_aes_init(uint8_t *key, int key_bits) {
memcpy(tk, key, KC*4); memcpy(tk, key, KC*4);
for(t= 0; t < (rounds+1)*4; ) { for(t= 0; t < (rounds+1)*4; ) {
for(j = 0; (j < KC) && (t < (rounds+1)*4); j++, t++) for(j = 0; j < KC && t < (rounds+1)*4; j++, t++)
memcpy(a->round_key[0][t], tk[j], 4); memcpy(a->round_key[0][t], tk[j], 4);
for(i = 0; i < 4; i++) for(i = 0; i < 4; i++)
tk[0][i] ^= sbox[tk[KC-1][(i+1)&3]]; tk[0][i] ^= sbox[tk[KC-1][(i+1)&3]];
tk[0][0] ^= rcon[rconpointer++]; tk[0][0] ^= rcon[rconpointer++];
for(j = 1; j < KC; j++){ for(j = 1; j < KC; j++){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment