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

Giorgio Vazzana git at videolan.org
Fri Jan 2 22:34:40 CET 2015


ffmpeg | branch: master | Giorgio Vazzana <mywing81 at gmail.com> | Fri Jan  2 16:57:09 2015 +0100| [fbb792f90fce288ac46adb8a0293ff8b2864aa7c] | committer: Michael Niedermayer

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

Additionally, change parameters order.

Signed-off-by: Giorgio Vazzana <mywing81 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbb792f90fce288ac46adb8a0293ff8b2864aa7c
---

 libavutil/camellia.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/camellia.c b/libavutil/camellia.c
index 2e719be..15b63f3 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;
 }
 



More information about the ffmpeg-cvslog mailing list