X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=pygost%2Fgost341194.py;h=4ffb45e63f189cb4a4c1027b884c68ee54fddf6e;hb=b2e90391aebf713b34023e379803fbf968e5aed8;hp=e1192f3970f1fe6dc5fa0668c13c709ad5289053;hpb=5ecaafbe1a87f9a311a18574653e6dbc75a776b9;p=pygost.git diff --git a/pygost/gost341194.py b/pygost/gost341194.py index e1192f3..4ffb45e 100644 --- a/pygost/gost341194.py +++ b/pygost/gost341194.py @@ -1,6 +1,6 @@ # coding: utf-8 # PyGOST -- Pure Python GOST cryptographic functions library -# Copyright (C) 2015-2019 Sergey Matveev +# Copyright (C) 2015-2020 Sergey Matveev # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ from copy import copy from functools import partial from struct import pack -from pygost.gost28147 import addmod from pygost.gost28147 import block2ns from pygost.gost28147 import encrypt from pygost.gost28147 import ns2block @@ -33,7 +32,7 @@ from pygost.pbkdf2 import pbkdf2 as pbkdf2_base from pygost.utils import hexdec from pygost.utils import hexenc from pygost.utils import strxor -from pygost.utils import xrange # pylint: disable=redefined-builtin +from pygost.utils import xrange DEFAULT_SBOX = "id-GostR3411-94-CryptoProParamSet" @@ -167,7 +166,7 @@ class GOST341194(PEP247): for i in xrange(0, len(m), BLOCKSIZE): part = m[i:i + BLOCKSIZE][::-1] _len += len(part) * 8 - checksum = addmod(checksum, int(hexenc(part), 16), 2 ** 256) + checksum = (checksum + int(hexenc(part), 16)) % (2 ** 256) if len(part) < BLOCKSIZE: part = b"\x00" * (BLOCKSIZE - len(part)) + part h = _step(h, part, self.sbox)