X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=pygost%2Fgost28147.py;h=b6f3cf49b6fa80a78918e7c411fab8b72f4effbd;hb=80dd2b2a713366081c2f3e8a10fd7b5bd705e127;hp=a6a819f8bb4a5efa378e887b6204c9f82bcb9fc6;hpb=0fcc8bc147ada51d2a9a912f18ac362d54b7d49a;p=pygost.git diff --git a/pygost/gost28147.py b/pygost/gost28147.py index a6a819f..b6f3cf4 100644 --- a/pygost/gost28147.py +++ b/pygost/gost28147.py @@ -1,11 +1,10 @@ # 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -29,7 +28,7 @@ from pygost.gost3413 import pad_size from pygost.gost3413 import unpad2 from pygost.utils import hexdec from pygost.utils import strxor -from pygost.utils import xrange # pylint: disable=redefined-builtin +from pygost.utils import xrange KEYSIZE = 32 @@ -190,8 +189,7 @@ def ns2block(ns): def addmod(x, y, mod=2 ** 32): """ Modulo adding of two integers """ - r = x + y - return r if r < mod else r - mod + return (x + y) % mod def _shift11(x):