From 90258fdadace50db3ef72a46aa84e9004c7cb61a Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 16 Apr 2013 00:06:18 +0200 Subject: fix binary logarithm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- python3/sha3sum.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'python3') diff --git a/python3/sha3sum.py b/python3/sha3sum.py index 27b9fd1..e331df8 100755 --- a/python3/sha3sum.py +++ b/python3/sha3sum.py @@ -109,7 +109,12 @@ class SHA3: @param x:int The value of which to calculate the binary logarithm @return :int The binary logarithm ''' - return ((0 if (x & 0xFF00) == 0 else 8) + (0 if (x & 0xF0F0) == 0 else 4)) + ((0 if (x & 0xCCCC) == 0 else 2) + (0 if (x & 0xAAAA) == 0 else 1)) + 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 @staticmethod -- cgit v1.2.3-70-g09d2