X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=pygost%2Ftest_pfx.py;h=6f066431eda3f5e32a244ebded8132ea060be82c;hb=5e92533267cb41c42af1243592c530304d18bff5;hp=c4497c916239265277a1c5ca21a74b1ec65e14e5;hpb=a2b4808f6628225be99874bd5f6a0f80a514db82;p=pygost.git diff --git a/pygost/test_pfx.py b/pygost/test_pfx.py index c4497c9..6f06643 100644 --- a/pygost/test_pfx.py +++ b/pygost/test_pfx.py @@ -22,7 +22,6 @@ from unittest import TestCase from pygost.gost28147 import cfb_decrypt from pygost.gost34112012512 import GOST34112012512 from pygost.gost34112012512 import pbkdf2 as gost34112012_pbkdf2 -from pygost.utils import hexdec try: @@ -73,7 +72,7 @@ AwcBAQIDBEAIFX0fyZe20QKKhWm6WYX+S92Gt6zaXroXOvAmayzLfZ5Sd9C2t9zZ JSg6M8RBUYpw/8ym5ou1o2nDa09M5zF3BCCpzyCQBI+rzfISeKvPV1ROfcXiYU93 mwcl1xQV2G5/fgICB9A= """) - password = u'Пароль для PFX' + password = u"Пароль для PFX" def test_shrouded_key_bag(self): private_key_info_expected = b64decode(b""" @@ -163,7 +162,7 @@ ATAMBggqhQMHAQEDAgUAA0EA9oq0Vvk8kkgIwkp0x0J5eKtia4MNTiwKAm7jgnCZIx3O98BThaTX _, outer_safe_contents = pfx["authSafe"]["content"].defined mac_data = pfx["macData"] mac_key = gost34112012_pbkdf2( - password=self.password.encode('utf-8'), + password=self.password.encode("utf-8"), salt=bytes(mac_data["macSalt"]), iterations=int(mac_data["iterations"]), dklen=96,