Mercurial > libavutil.hg
changeset 974:90ee1cca76a2 libavutil
Make mix function more readable.
Compiler output unchanged with gcc 4.4.
| author | reimar |
|---|---|
| date | Fri, 02 Jul 2010 17:33:45 +0000 |
| parents | 877139dadde8 |
| children | c0a0cf0c61c7 |
| files | aes.c |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/aes.c Fri Jul 02 14:23:17 2010 +0000 +++ b/aes.c Fri Jul 02 17:33:45 2010 +0000 @@ -78,10 +78,11 @@ } static inline void mix(av_aes_block state[2], uint32_t multbl[][256], int s1, int s3){ - state[0].u32[0] = mix_core(multbl, state[1].u8x4[0][0], state[1].u8x4[s1 ][1], state[1].u8x4[2][2], state[1].u8x4[s3 ][3]); - state[0].u32[1] = mix_core(multbl, state[1].u8x4[1][0], state[1].u8x4[s3-1][1], state[1].u8x4[3][2], state[1].u8x4[s1-1][3]); - state[0].u32[2] = mix_core(multbl, state[1].u8x4[2][0], state[1].u8x4[s3 ][1], state[1].u8x4[0][2], state[1].u8x4[s1 ][3]); - state[0].u32[3] = mix_core(multbl, state[1].u8x4[3][0], state[1].u8x4[s1-1][1], state[1].u8x4[1][2], state[1].u8x4[s3-1][3]); + uint8_t (*src)[4] = state[1].u8x4; + state[0].u32[0] = mix_core(multbl, src[0][0], src[s1 ][1], src[2][2], src[s3 ][3]); + state[0].u32[1] = mix_core(multbl, src[1][0], src[s3-1][1], src[3][2], src[s1-1][3]); + state[0].u32[2] = mix_core(multbl, src[2][0], src[s3 ][1], src[0][2], src[s1 ][3]); + state[0].u32[3] = mix_core(multbl, src[3][0], src[s1-1][1], src[1][2], src[s3-1][3]); } static inline void crypt(AVAES *a, int s, const uint8_t *sbox, uint32_t multbl[][256]){