From 8d4ae47c3f21e709ef905717f1420e5eba5191d7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 14 Jan 2007 21:03:15 +0000 Subject: [PATCH] simplify Originally committed as revision 7499 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/aes.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavutil/aes.c b/libavutil/aes.c index 135b931..df3ba03 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -158,7 +158,9 @@ AVAES *av_aes_init(uint8_t *key, int key_bits, int decrypt) { memcpy(tk, key, KC*4); for(t= 0; t < (rounds+1)*4;) { - memcpy(a->round_key[0][t], tk, KC*4); + if(decrypt) memcpy(a->round_key[0 ][ t], tk, KC*4); + else memcpy(a->round_key[rounds][-t], tk, KC*4); + t+= KC; for(i = 0; i < 4; i++) @@ -179,11 +181,6 @@ AVAES *av_aes_init(uint8_t *key, int key_bits, int decrypt) { a->round_key[i][0][j]= sbox[a->round_key[i][0][j]]; mix(a->round_key[i], dec_multbl); } - }else{ - for(i=0; i<(rounds+1)/2; i++){ - for(j=0; j<16; j++) - FFSWAP(int, a->round_key[i][0][j], a->round_key[rounds-i][0][j]); - } } return a; -- 2.7.4