virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity

avutil/camellia: use K[2] instead of *K in generate_round_keys()

Browse Source 
Additionally, change parameters order.

Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Giorgio Vazzana 2015-01-02 16:57:09 +01:00 committed by Michael Niedermayer
parent 8e38b1539e
commit fbb792f90f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/camellia.c
View File

@ -190,7 +190,7 @@ static const uint8_t vars[2][12] = {
{3,1,2,3,0,2,1,3,0,1,2,0} {3,1,2,3,0,2,1,3,0,1,2,0}
}; };
static void generate_round_keys(AVCAMELLIA* cs, uint64_t *Ka, uint64_t *Kb, uint64_t *Kl, uint64_t *Kr) static void generate_round_keys(AVCAMELLIA* cs, uint64_t Kl[2], uint64_t Kr[2], uint64_t Ka[2], uint64_t Kb[2])
{ {
int i; int i;
uint64_t *Kd[4], d[2]; uint64_t *Kd[4], d[2];
@ -374,7 +374,7 @@ av_cold int av_camellia_init(AVCAMELLIA* cs, const uint8_t *key, int key_bits)
Kb[0] = D1; Kb[0] = D1;
Kb[1] = D2; Kb[1] = D2;
} }
generate_round_keys(cs, Ka, Kb, Kl, Kr); generate_round_keys(cs, Kl, Kr, Ka, Kb);
return 0; return 0;
} }