diff options
| author | Giorgio Vazzana <mywing81@gmail.com> | 2015-01-02 16:57:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-02 21:23:56 +0100 |
| commit | fbb792f90fce288ac46adb8a0293ff8b2864aa7c (patch) | |
| tree | 561e2e4aef2e925c6679929f6ce9600e53c0983a /libavutil/camellia.c | |
| parent | 8e38b1539e7d23a75b8a50ab6771ee65f4064d34 (diff) | |
| download | ffmpeg-fbb792f90fce288ac46adb8a0293ff8b2864aa7c.tar.gz | |
avutil/camellia: use K[2] instead of *K in generate_round_keys()
Additionally, change parameters order.
Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/camellia.c')
| -rw-r--r-- | libavutil/camellia.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/camellia.c b/libavutil/camellia.c index 2e719bee2d..15b63f3be9 100644 --- a/libavutil/camellia.c +++ b/libavutil/camellia.c @@ -190,7 +190,7 @@ static const uint8_t vars[2][12] = { {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; 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[1] = D2; } - generate_round_keys(cs, Ka, Kb, Kl, Kr); + generate_round_keys(cs, Kl, Kr, Ka, Kb); return 0; } |