RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avutil/camellia: make LR128() more robust 

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:49:12 +01:00 committed by Michael Niedermayer
parent 88d19d240a
commit 8e38b1539e
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

@ -126,14 +126,14 @@ static const uint8_t SBOX4[256] =
const int av_camellia_size = sizeof(AVCAMELLIA);
static void LR128(uint64_t* d, uint64_t *K, int x)
static void LR128(uint64_t d[2], const uint64_t K[2], int x)
{
int i = 0;
if (x >=64 && x < 128) {
i = 1;
x -= 64;
}
if (!x || x == 128) {
if (x <= 0 || x >= 128) {
d[0] = K[i];
d[1] = K[!i];
return;