More addmod simplification

[pygost.git] / pygost / gost28147.py

diff --git a/pygost/gost28147.py b/pygost/gost28147.py
index a6a819f8bb4a5efa378e887b6204c9f82bcb9fc6..b6f3cf49b6fa80a78918e7c411fab8b72f4effbd 100644 (file)
--- 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 <stargrave@stargrave.org>
+# Copyright (C) 2015-2020 Sergey Matveev <stargrave@stargrave.org>
 #
 # 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):