diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-04-16 00:06:18 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-04-16 00:06:18 +0200 |
| commit | 90258fdadace50db3ef72a46aa84e9004c7cb61a (patch) | |
| tree | 4813be3ed649b7bcdb4588aa6cc28613da80576d /pure-java | |
| parent | whoops, read the filesize instead of the blocksize (diff) | |
| download | sha3sum-90258fdadace50db3ef72a46aa84e9004c7cb61a.tar.gz sha3sum-90258fdadace50db3ef72a46aa84e9004c7cb61a.tar.bz2 sha3sum-90258fdadace50db3ef72a46aa84e9004c7cb61a.tar.xz | |
fix binary logarithm
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
| -rw-r--r-- | pure-java/SHA3.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pure-java/SHA3.java b/pure-java/SHA3.java index 0568b1f..6253094 100644 --- a/pure-java/SHA3.java +++ b/pure-java/SHA3.java @@ -150,10 +150,12 @@ public class SHA3 */ private static int lb(int x) { - return (((x & 0xFF00) == 0 ? 0 : 8) + - ((x & 0xF0F0) == 0 ? 0 : 4)) + - (((x & 0xCCCC) == 0 ? 0 : 2) + - ((x & 0xAAAA) == 0 ? 0 : 1)); + int rc = 0; + if ((x & 0xFF00) != 0) { rc += 8; x >>= 8; } + if ((x & 0x00F0) != 0) { rc += 4; x >>= 4; } + if ((x & 0x000C) != 0) { rc += 2; x >>= 2; } + if ((x & 0x0002) != 0) rc += 1; + return rc; } /** |