Commit fbb792f9 authored by Giorgio Vazzana's avatar Giorgio Vazzana Committed by Michael Niedermayer

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

Additionally, change parameters order.
Signed-off-by: 's avatarGiorgio Vazzana <mywing81@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 8e38b153
...@@ -190,7 +190,7 @@ static const uint8_t vars[2][12] = { ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment