RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity

avutil/aes: Rename crypt()

Browse Source 
This avoids a potential conflict with the equally named function from XOPEN
It also could reduce confusion in debugger backtraces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-28 13:12:02 +01:00
parent ccaa5dcb31
commit 0d37ca150c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/aes.c
View File

@ -127,7 +127,7 @@ static inline void mix(av_aes_block state[2], uint32_t multbl[][256], int s1, in
state[0].u32[3] = mix_core(multbl, src[3][0], src[s1-1][1], src[1][2], src[s3-1][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, static inline void aes_crypt(AVAES *a, int s, const uint8_t *sbox,
uint32_t multbl[][256]) uint32_t multbl[][256])
{ {
int r; int r;
@ -146,7 +146,7 @@ void av_aes_crypt(AVAES *a, uint8_t *dst, const uint8_t *src,
while (count--) { while (count--) {
addkey_s(&a->state[1], src, &a->round_key[a->rounds]); addkey_s(&a->state[1], src, &a->round_key[a->rounds]);
if (decrypt) { if (decrypt) {
crypt(a, 0, inv_sbox, dec_multbl); aes_crypt(a, 0, inv_sbox, dec_multbl);
if (iv) { if (iv) {
addkey_s(&a->state[0], iv, &a->state[0]); addkey_s(&a->state[0], iv, &a->state[0]);
memcpy(iv, src, 16); memcpy(iv, src, 16);
@ -155,7 +155,7 @@ void av_aes_crypt(AVAES *a, uint8_t *dst, const uint8_t *src,
} else { } else {
if (iv) if (iv)
addkey_s(&a->state[1], iv, &a->state[1]); addkey_s(&a->state[1], iv, &a->state[1]);
crypt(a, 2, sbox, enc_multbl); aes_crypt(a, 2, sbox, enc_multbl);
addkey_d(dst, &a->state[0], &a->round_key[0]); addkey_d(dst, &a->state[0], &a->round_key[0]);
if (iv) if (iv)
memcpy(iv, dst, 16); memcpy(iv, dst, 16);