pygost/gost34112012.py | 17 +++++++---------- diff --git a/pygost/gost34112012.py b/pygost/gost34112012.py index 928e104787a2f1598a9f6f6c51b7b9faee39ea1cb7aafdab6a455d4961b58263..ad23993726b941c648d807b5f5451a5d4552b92177901e647f5646e3908dd82e 100644 --- a/pygost/gost34112012.py +++ b/pygost/gost34112012.py @@ -162,14 +162,8 @@ "faf417d5d9b21b9948bc924af11bd720", ), )] -# Trade memory for CPU for part of L() calculations -_Cache = None - -def _cache_ensure(): - global _Cache - if _Cache is not None: - return +def _lcache(): cache = [] for byteN in xrange(8): cache.append([0 for _ in xrange(256)]) @@ -182,7 +176,11 @@ if val & 0x80 > 0: res64 ^= A[(7 - byteN) * 8 + bitN] val <<= 1 cache[byteN][byteVal] = res64 - _Cache = cache + return cache + + +# Trade memory for CPU for part of L() calculations +LCache = _lcache() def add512bit(a, b): @@ -222,12 +220,11 @@ return res def L(data): - _cache_ensure() res = [] for i in range(8): res64 = 0 for j in range(8): - res64 ^= _Cache[j][data[8 * i + j]] + res64 ^= LCache[j][data[8 * i + j]] res.append(pack("