X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=pygost%2Fgost341194.py;h=a6a65efbfc9b51784d3217605ffa39bdff2c73f0;hb=a2b4808f6628225be99874bd5f6a0f80a514db82;hp=4bcc60128c29a0f9496fefab83af3b45ac9e7f29;hpb=21a30721c31912c296e1faced73e2fd0db191be9;p=pygost.git diff --git a/pygost/gost341194.py b/pygost/gost341194.py index 4bcc601..a6a65ef 100644 --- a/pygost/gost341194.py +++ b/pygost/gost341194.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 @@ -37,7 +36,7 @@ from pygost.utils import strxor from pygost.utils import xrange # pylint: disable=redefined-builtin -DEFAULT_SBOX = "GostR3411_94_TestParamSet" +DEFAULT_SBOX = "id-GostR3411-94-CryptoProParamSet" BLOCKSIZE = 32 C2 = 32 * b"\x00" C3 = hexdec(b"ff00ffff000000ffff0000ff00ffff0000ff00ff00ff00ffff00ff00ff00ff00") @@ -187,7 +186,7 @@ def new(data=b"", sbox=DEFAULT_SBOX): return GOST341194(data, sbox) -PBKDF2_HASHER = partial(GOST341194, sbox="GostR3411_94_CryptoProParamSet") +PBKDF2_HASHER = partial(GOST341194, sbox="id-GostR3411-94-CryptoProParamSet") def pbkdf2(password, salt, iterations, dklen):