Commit 54b78b24 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

make decode look more like encode

Originally committed as revision 7491 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent cc858970
...@@ -75,14 +75,14 @@ static inline void mix(uint8_t state[4][4], uint32_t multbl[4][256]){ ...@@ -75,14 +75,14 @@ static inline void mix(uint8_t state[4][4], uint32_t multbl[4][256]){
void av_aes_decrypt(AVAES *a){ void av_aes_decrypt(AVAES *a){
int t, r; int t, r;
addkey(a->state, a->round_dec_key[a->rounds]); for(r=a->rounds; r>1; r--){
for(r=a->rounds-2; r>=0; r--){ addkey(a->state, a->round_dec_key[r]);
SUBSHIFT3x((a->state[0]+1)) SUBSHIFT3x((a->state[0]+1))
SUBSHIFT2x((a->state[0]+2)) SUBSHIFT2x((a->state[0]+2))
SUBSHIFT1x((a->state[0]+3)) SUBSHIFT1x((a->state[0]+3))
mix(a->state, dec_multbl); mix(a->state, dec_multbl);
addkey(a->state, a->round_dec_key[r+1]);
} }
addkey(a->state, a->round_dec_key[1]);
SUBSHIFT0((a->state[0]+0), inv_sbox) SUBSHIFT0((a->state[0]+0), inv_sbox)
SUBSHIFT3((a->state[0]+1), inv_sbox) SUBSHIFT3((a->state[0]+1), inv_sbox)
SUBSHIFT2((a->state[0]+2), inv_sbox) SUBSHIFT2((a->state[0]+2), inv_sbox)
......
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