Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use a consistent type for multbl array function parameters.

Browse Source 
Originally committed as revision 23855 to svn://svn.ffmpeg.org/ffmpeg/trunk
oldabi
Reimar Döffinger 15 years ago
parent 7ed06b2be8
commit 17c78b087a
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libavutil/aes.c

6
libavutil/aes.c
Unescape View File

@ -61,7 +61,7 @@ static void subshift(uint8_t s0[2][16], int s, const uint8_t *box){
s3[0][1]=box[s3[1][13]]; s3[0][13]=box[s3[1][ 9]]; s3[0][ 9]=box[s3[1][ 5]]; s3[0][ 5]=box[s3[1][ 1]]; s3[0][1]=box[s3[1][13]]; s3[0][13]=box[s3[1][ 9]]; s3[0][ 9]=box[s3[1][ 5]]; s3[0][ 5]=box[s3[1][ 1]];
} }
static inline int mix_core(uint32_t multbl[4][256], int a, int b, int c, int d){ static inline int mix_core(uint32_t multbl[][256], int a, int b, int c, int d){
#if CONFIG_SMALL #if CONFIG_SMALL
#define ROT(x,s) ((x<<s)|(x>>(32-s))) #define ROT(x,s) ((x<<s)|(x>>(32-s)))
return multbl[0][a] ^ ROT(multbl[0][b], 8) ^ ROT(multbl[0][c], 16) ^ ROT(multbl[0][d], 24); return multbl[0][a] ^ ROT(multbl[0][b], 8) ^ ROT(multbl[0][c], 16) ^ ROT(multbl[0][d], 24);
@ -70,14 +70,14 @@ static inline int mix_core(uint32_t multbl[4][256], int a, int b, int c, int d){
#endif #endif
} }
static inline void mix(uint8_t state[2][4][4], uint32_t multbl[4][256], int s1, int s3){ static inline void mix(uint8_t state[2][4][4], uint32_t multbl[][256], int s1, int s3){
((uint32_t *)(state))[0] = mix_core(multbl, state[1][0][0], state[1][s1 ][1], state[1][2][2], state[1][s3 ][3]); ((uint32_t *)(state))[0] = mix_core(multbl, state[1][0][0], state[1][s1 ][1], state[1][2][2], state[1][s3 ][3]);
((uint32_t *)(state))[1] = mix_core(multbl, state[1][1][0], state[1][s3-1][1], state[1][3][2], state[1][s1-1][3]); ((uint32_t *)(state))[1] = mix_core(multbl, state[1][1][0], state[1][s3-1][1], state[1][3][2], state[1][s1-1][3]);
((uint32_t *)(state))[2] = mix_core(multbl, state[1][2][0], state[1][s3 ][1], state[1][0][2], state[1][s1 ][3]); ((uint32_t *)(state))[2] = mix_core(multbl, state[1][2][0], state[1][s3 ][1], state[1][0][2], state[1][s1 ][3]);
((uint32_t *)(state))[3] = mix_core(multbl, state[1][3][0], state[1][s1-1][1], state[1][1][2], state[1][s3-1][3]); ((uint32_t *)(state))[3] = mix_core(multbl, state[1][3][0], state[1][s1-1][1], state[1][1][2], state[1][s3-1][3]);
} }
static inline void crypt(AVAES *a, int s, const uint8_t *sbox, const uint32_t *multbl){ static inline void crypt(AVAES *a, int s, const uint8_t *sbox, uint32_t multbl[][256]){
int r; int r;
for(r=a->rounds-1; r>0; r--){ for(r=a->rounds-1; r>0; r--){

Write Preview
Loading…
Cancel
Save