]> Cypherpunks.ru repositories - pygost.git/blobdiff - pygost/test_pfx.py
Raise copyright years
[pygost.git] / pygost / test_pfx.py
index c4497c916239265277a1c5ca21a74b1ec65e14e5..77025080a6c471f82f6cd65b9a9cfef8726be5e3 100644 (file)
@@ -1,6 +1,6 @@
 # coding: utf-8
 # PyGOST -- Pure Python GOST cryptographic functions library
-# Copyright (C) 2015-2020 Sergey Matveev <stargrave@stargrave.org>
+# Copyright (C) 2015-2021 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
@@ -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,