From fbb792f90fce288ac46adb8a0293ff8b2864aa7c Mon Sep 17 00:00:00 2001
From: Giorgio Vazzana <mywing81@gmail.com>
Date: Fri, 2 Jan 2015 16:57:09 +0100
Subject: [PATCH] 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>
---
libavutil/camellia.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavutil/camellia.c b/libavutil/camellia.c
index 2e719bee2df..15b63f3be9c 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;
}
--
GitLab