projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
88d19d2
)
avutil/camellia: make LR128() more robust
author
Giorgio Vazzana
<mywing81@gmail.com>
Fri, 2 Jan 2015 15:49:12 +0000
(16:49 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 2 Jan 2015 20:23:50 +0000
(21:23 +0100)
Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/camellia.c
patch
|
blob
|
history
diff --git
a/libavutil/camellia.c
b/libavutil/camellia.c
index
fcbf970
..
2e719be
100644
(file)
--- a/
libavutil/camellia.c
+++ b/
libavutil/camellia.c
@@
-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;