X-Git-Url: http://www.git.cypherpunks.ru/?p=pygost.git;a=blobdiff_plain;f=pygost%2Ftest_x509.py;h=00ad25fda8c20590ad20775d0c55c97fd8ba2a59;hp=ce7f3ffbe466a8caf4a52d99af77ed458ca1775a;hb=82af8726ef5d5e2752089a45750e56c9910398c7;hpb=744398c0b6a3ab223d91cbf56a72932a7c87381d

diff --git a/pygost/test_x509.py b/pygost/test_x509.py
index ce7f3ff..00ad25f 100644
--- a/pygost/test_x509.py
+++ b/pygost/test_x509.py
@@ -87,7 +87,7 @@ class TestCertificate(TestCase):
     (TK26IOK.pdf)
     """
 
-    def process_cert(self, curve_name, mode, hasher, prv_key_raw, cert_raw):
+    def process_cert(self, curve_name, hasher, prv_key_raw, cert_raw):
         cert, tail = Certificate().decode(cert_raw, ctx={
             "defines_by_path": (
                 (
@@ -115,14 +115,13 @@ class TestCertificate(TestCase):
         spk = cert["tbsCertificate"]["subjectPublicKeyInfo"]["subjectPublicKey"]
         self.assertIsNotNone(spk.defined)
         _, pub_key_raw = spk.defined
-        pub_key = pub_unmarshal(bytes(pub_key_raw), mode=mode)
+        pub_key = pub_unmarshal(bytes(pub_key_raw))
         self.assertSequenceEqual(pub_key, public_key(curve, prv_key))
         self.assertTrue(verify(
             curve,
             pub_key,
             hasher(cert["tbsCertificate"].encode()).digest()[::-1],
             bytes(cert["signatureValue"]),
-            mode=mode,
         ))
 
     def test_256(self):
@@ -144,7 +143,6 @@ dqQfmHrz6TI6Xojdh/t8ckODv/587NS5/6KsM77vc6Wh90NAT2s=
         prv_key_raw = hexdec("BFCF1D623E5CDD3032A7C6EABB4A923C46E43D640FFEAAF2C3ED39A8FA399924")[::-1]
         self.process_cert(
             "id-GostR3410-2001-CryptoPro-XchA-ParamSet",
-            2001,
             GOST34112012256,
             prv_key_raw,
             cert_raw,
@@ -172,7 +170,6 @@ o3eUNFkNyHJwQCk2WoOlO16zwGk2tdKH4KmD5w==
         prv_key_raw = hexdec("3FC01CDCD4EC5F972EB482774C41E66DB7F380528DFE9E67992BA05AEE462435757530E641077CE587B976C8EEB48C48FD33FD175F0C7DE6A44E014E6BCB074B")[::-1]
         self.process_cert(
             "id-tc26-gost-3410-12-512-paramSetB",
-            2012,
             GOST34112012512,
             prv_key_raw,
             cert_raw,
@@ -187,7 +184,6 @@ class TestRFC4491bis(TestCase):
     def _test_vector(
             self,
             curve_name,
-            mode,
             hsh,
             ai_spki,
             ai_sign,
@@ -204,7 +200,7 @@ class TestRFC4491bis(TestCase):
         prv = prv_unmarshal(prv_raw)
         curve = CURVES[curve_name]
         pub = public_key(curve, prv)
-        pub_raw = pub_marshal(pub, mode=mode)
+        pub_raw = pub_marshal(pub)
         subj = Name(("rdnSequence", RDNSequence([
             RelativeDistinguishedName((
                 AttributeTypeAndValue((
@@ -231,7 +227,6 @@ class TestRFC4491bis(TestCase):
             pub,
             hsh(cri.encode()).digest()[::-1],
             sign,
-            mode=mode,
         ))
         cr = CertificationRequest((
             ("certificationRequestInfo", cri),
@@ -268,7 +263,6 @@ class TestRFC4491bis(TestCase):
             pub,
             hsh(tbs.encode()).digest()[::-1],
             sign,
-            mode=mode,
         ))
         cert = Certificate((
             ("tbsCertificate", tbs),
@@ -291,7 +285,6 @@ class TestRFC4491bis(TestCase):
             pub,
             hsh(tbs.encode()).digest()[::-1],
             sign,
-            mode=mode,
         ))
         crl = CertificateList((
             ("tbsCertList", tbs),
@@ -303,7 +296,6 @@ class TestRFC4491bis(TestCase):
     def test_256_test_paramset(self):
         self._test_vector(
             "id-GostR3410-2001-TestParamSet",
-            2001,
             GOST34112012256,
             AlgorithmIdentifier((
                 ("algorithm", id_tc26_gost3410_2012_256),
@@ -349,7 +341,6 @@ RstQv19CIaADrT0XJ1PJSpw3ox0gQaoo0vGrFIKAzZ7Vb+2kGXQFNVSkJ2e4OtBD
     def test_256a_paramset(self):
         self._test_vector(
             "id-tc26-gost-3410-2012-256-paramSetA",
-            2001,
             GOST34112012256,
             AlgorithmIdentifier((
                 ("algorithm", id_tc26_gost3410_2012_256),
@@ -394,7 +385,6 @@ B/6y571v4JY/VjJnNZ9c2Oq0UFmtHQ4dpb40fG8bUlbHrqwgCtZKx3pvWzoOCXMY
     def test_512_test_paramset(self):
         self._test_vector(
             "id-tc26-gost-3410-2012-512-paramSetTest",
-            2012,
             GOST34112012512,
             AlgorithmIdentifier((
                 ("algorithm", id_tc26_gost3410_2012_512),