virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

unused stuff removial

Browse Source 
Originally committed as revision 7488 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-01-14 18:51:09 +00:00
parent f12cf3d215
commit 179dc91160
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavutil/aes.c
View File

@ -53,9 +53,9 @@ static inline void addkey(uint64_t state[2], uint64_t round_key[2]){
#define SUBSHIFT2(s, box) t=s[0]; s[0]=box[s[ 8]]; s[ 8]=box[ t]; t=s[ 4]; s[ 4]=box[s[12]]; s[12]=box[t];
#define SUBSHIFT3(s, box) t=s[0]; s[0]=box[s[12]]; s[12]=box[s[ 8]]; s[ 8]=box[s[ 4]]; s[ 4]=box[t];
#define SUBSHIFT1x(s, box) t=s[0]; s[0]=s[ 4]; s[ 4]=s[ 8]; s[ 8]=s[12]; s[12]=t;
#define SUBSHIFT2x(s, box) t=s[0]; s[0]=s[ 8]; s[ 8]= t; t=s[ 4]; s[ 4]=s[12]; s[12]=t;
#define SUBSHIFT3x(s, box) t=s[0]; s[0]=s[12]; s[12]=s[ 8]; s[ 8]=s[ 4]; s[ 4]=t;
#define SUBSHIFT1x(s) t=s[0]; s[0]=s[ 4]; s[ 4]=s[ 8]; s[ 8]=s[12]; s[12]=t;
#define SUBSHIFT2x(s) t=s[0]; s[0]=s[ 8]; s[ 8]= t; t=s[ 4]; s[ 4]=s[12]; s[12]=t;
#define SUBSHIFT3x(s) t=s[0]; s[0]=s[12]; s[12]=s[ 8]; s[ 8]=s[ 4]; s[ 4]=t;
#define ROT(x,s) ((x<<s)|(x>>(32-s)))
@ -77,10 +77,9 @@ void av_aes_decrypt(AVAES *a){
addkey(a->state, a->round_enc_key[a->rounds]);
for(r=a->rounds-2; r>=0; r--){
// SUBSHIFT0((a->state[0]+0), inv_sbox)
SUBSHIFT3x((a->state[0]+1), inv_sbox)
SUBSHIFT2x((a->state[0]+2), inv_sbox)
SUBSHIFT1x((a->state[0]+3), inv_sbox)
SUBSHIFT3x((a->state[0]+1))
SUBSHIFT2x((a->state[0]+2))
SUBSHIFT1x((a->state[0]+3))
mix(a->state, dec_multbl);
addkey(a->state, a->round_dec_key[r+1]);
}
@ -96,9 +95,9 @@ void av_aes_encrypt(AVAES *a){
for(r=0; r<a->rounds-1; r++){
addkey(a->state, a->round_enc_key[r]);
SUBSHIFT1x((a->state[0]+1), sbox)
SUBSHIFT2x((a->state[0]+2), sbox)
SUBSHIFT3x((a->state[0]+3), sbox)
SUBSHIFT1x((a->state[0]+1))
SUBSHIFT2x((a->state[0]+2))
SUBSHIFT3x((a->state[0]+3))
mix(a->state, enc_multbl); //FIXME replace log8 by const / optimze mix as this can be simplified alot
}
addkey(a->state, a->round_enc_key[r]);