formatting

Author: gstarovo

src/ecdsa/der.py

@@ -210,11 +210,13 @@ def remove_implicit(string, exp_class="context-specific"):
     s0 = str_idx_as_int(string, 0)
 
     if (s0 & tag_mask) != tag_class:
-        raise UnexpectedDER("wanted class {0}, got 0x{1:02x} tag".
-                            format(exp_class, s0))
+        raise UnexpectedDER(
+            "wanted class {0}, got 0x{1:02x} tag".format(exp_class, s0)
+        )
     if s0 & 0b00100000 != 0:
-        raise UnexpectedDER("wanted type primitive, got 0x{0:02x} tag".
-                            format(s0))
+        raise UnexpectedDER(
+            "wanted type primitive, got 0x{0:02x} tag".format(s0)
+        )
 
     tag = s0 & 0x1F
     length, llen = read_length(string[1:])
@@ -290,7 +292,8 @@ def remove_boolean(string):
 def remove_object(string):
     if not string:
         raise UnexpectedDER(
-            "Empty string does not encode an object identifier")
+            "Empty string does not encode an object identifier"
+        )
     if string[:1] != b"\x06":
         n = str_idx_as_int(string, 0)
         raise UnexpectedDER("wanted type 'object' (0x06), got 0x%02x" % n)
@@ -322,11 +325,11 @@ def remove_object(string):
 def remove_integer(string):
     if not string:
         raise UnexpectedDER(
-            "Empty string is an invalid encoding of an integer")
+            "Empty string is an invalid encoding of an integer"
+        )
     if string[:1] != b"\x02":
         n = str_idx_as_int(string, 0)
-        raise UnexpectedDER(
-            "wanted type 'integer' (0x02), got 0x%02x" % n)
+        raise UnexpectedDER("wanted type 'integer' (0x02), got 0x%02x" % n)
     length, llen = read_length(string[1:])
     if length > len(string) - 1 - llen:
         raise UnexpectedDER("Length longer than provided buffer")
@@ -510,8 +513,11 @@ def unpem(pem):
         pem = pem.encode()
 
     d = b"".join(
-        [l.strip() for l in pem.split(b"\n") if l
-         and not l.startswith(b"-----")]
+        [
+            l.strip()
+            for l in pem.split(b"\n")
+            if l and not l.startswith(b"-----")
+        ]
     )
     return base64.b64decode(d)
 
@@ -520,6 +526,7 @@ def topem(der, name):
     b64 = base64.b64encode(compat26_str(der))
     lines = [("-----BEGIN %s-----\n" % name).encode()]
     lines.extend(
-        [b64[start : start + 76] + b"\n" for start in range(0, len(b64), 76)])
+        [b64[start : start + 76] + b"\n" for start in range(0, len(b64), 76)]
+    )
     lines.append(("-----END %s-----\n" % name).encode())
     return b"".join(lines)

src/ecdsa/ecdsa.py

@@ -205,7 +205,8 @@ def verifies(self, hash, signature):
             byte_objects = set((bytearray, bytes, memoryview))
         if type(r) in byte_objects:
             point = ellipticcurve.AbstractPoint.from_bytes(
-                self.generator.curve(), r)
+                self.generator.curve(), r
+            )
             r = point[0] % n
 
         if r < 1 or r > n - 1:

src/ecdsa/keys.py

@@ -632,7 +632,7 @@ def verify(
         data,
         hashfunc=None,
         sigdecode=sigdecode_string,
-        allow_truncate=True
+        allow_truncate=True,
     ):
         """
         Verify a signature made over provided data.
@@ -682,15 +682,14 @@ def verify(
 
         hashfunc = hashfunc or self.default_hashfunc
         digest = hashfunc(data).digest()
-        return self.verify_digest(
-            signature, digest, sigdecode, allow_truncate)
+        return self.verify_digest(signature, digest, sigdecode, allow_truncate)
 
     def verify_digest(
         self,
         signature,
         digest,
         sigdecode=sigdecode_string,
-        allow_truncate=False
+        allow_truncate=False,
     ):
         """
         Verify a signature made over provided hash value.
@@ -1319,7 +1318,7 @@ def sign_deterministic(
         hashfunc=None,
         sigencode=sigencode_string,
         extra_entropy=b"",
-        accelerate=False
+        accelerate=False,
     ):
         """
         Create signature over data.
@@ -1379,7 +1378,7 @@ def sign_deterministic(
             sigencode=sigencode,
             extra_entropy=extra_entropy,
             allow_truncate=True,
-            accelerate=accelerate
+            accelerate=accelerate,
         )
 
     def sign_digest_deterministic(
@@ -1389,7 +1388,7 @@ def sign_digest_deterministic(
         sigencode=sigencode_string,
         extra_entropy=b"",
         allow_truncate=False,
-        accelerate=False
+        accelerate=False,
     ):
         """
         Create signature for digest using the deterministic RFC6979 algorithm.
@@ -1459,7 +1458,7 @@ def simple_r_s(r, s, order):
                     sigencode=simple_r_s,
                     k=k,
                     allow_truncate=allow_truncate,
-                    accelerate=accelerate
+                    accelerate=accelerate,
                 )
                 break
             except RSZeroError:
@@ -1475,7 +1474,7 @@ def sign(
         sigencode=sigencode_string,
         k=None,
         allow_truncate=True,
-        accelerate=False
+        accelerate=False,
     ):
         """
         Create signature over data.
@@ -1553,7 +1552,8 @@ def sign(
             return self.sign_deterministic(data)
         h = hashfunc(data).digest()
         return self.sign_digest(
-            h, entropy, sigencode, k, allow_truncate, accelerate)
+            h, entropy, sigencode, k, allow_truncate, accelerate
+        )
 
     def sign_digest(
         self,

src/ecdsa/test_malformed_sigs.py

@@ -29,7 +29,13 @@
 
 from .keys import SigningKey
 from .keys import BadSignatureError
-from .util import number_to_string, sigdecode_der_extended, sigencode_der, sigencode_der_sig_value_a, sigencode_string
+from .util import (
+    number_to_string,
+    sigdecode_der_extended,
+    sigencode_der,
+    sigencode_der_sig_value_a,
+    sigencode_string,
+)
 from .util import sigdecode_der, sigdecode_string
 from .curves import curves, SECP112r2, SECP128r1
 from .der import (
@@ -48,7 +54,9 @@
 """Since the data is hashed for processing, really any string will do."""
 
 
-hash_and_size = [(name, hashlib.new(name).digest_size) for name in algorithms_available]
+hash_and_size = [
+    (name, hashlib.new(name).digest_size) for name in algorithms_available
+]
 """Pairs of hash names and their output sizes.
 Needed for pairing with curves as we don't support hashes
 bigger than order sizes of curves."""
@@ -69,7 +77,9 @@
         for name, size in sorted(hash_and_size, key=lambda x: x[1])
         if 0 < size <= curve.baselen
     ]:
-        sk = SigningKey.generate(curve, hashfunc=partial(hashlib.new, hash_alg))
+        sk = SigningKey.generate(
+            curve, hashfunc=partial(hashlib.new, hash_alg)
+        )
 
         keys_and_sigs.append(
             (
@@ -86,7 +96,9 @@
     [pytest.param(vk, sig, id=name) for name, vk, sig in keys_and_sigs],
 )
 def test_signatures(verifying_key, signature):
-    assert verifying_key.verify(signature, example_data, sigdecode=sigdecode_der)
+    assert verifying_key.verify(
+        signature, example_data, sigdecode=sigdecode_der
+    )
 
 
 @st.composite
@@ -128,7 +140,9 @@ def st_fuzzed_sig(draw, keys_and_sigs):  # pragma: no cover
     insert_data = draw(st.binary(max_size=256))
 
     sig = sig[:insert_pos] + insert_data + sig[insert_pos:]
-    note("Inserted at position {0} bytes: {1!r}".format(insert_pos, insert_data))
+    note(
+        "Inserted at position {0} bytes: {1!r}".format(insert_pos, insert_data)
+    )
 
     sig = bytes(sig)
     # make sure that there was performed at least one mutation on the data
@@ -305,7 +319,8 @@ def test_random_der_ecdsa_sig_value_full_r(params):
 
     with pytest.raises(BadSignatureError):
         verifying_key.verify(
-            sig, example_data, sigdecode=sigdecode_der_extended)
+            sig, example_data, sigdecode=sigdecode_der_extended
+        )
 
 
 @settings(**slow_params)
@@ -319,7 +334,8 @@ def test_random_der_ecdsa_sig_value_a(params):
 
     with pytest.raises(BadSignatureError):
         verifying_key.verify(
-            sig, example_data, sigdecode=sigdecode_der_extended)
+            sig, example_data, sigdecode=sigdecode_der_extended
+        )
 
 
 def st_der_integer(*args, **kwargs):  # pragma: no cover
@@ -375,7 +391,9 @@ def st_der_oid(draw):  # pragma: no cover
         second = draw(st.integers(min_value=0, max_value=39))
     else:
         second = draw(st.integers(min_value=0, max_value=2**512))
-    rest = draw(st.lists(st.integers(min_value=0, max_value=2**512), max_size=50))
+    rest = draw(
+        st.lists(st.integers(min_value=0, max_value=2**512), max_size=50)
+    )
     return encode_oid(first, second, *rest)
 
 
@@ -396,7 +414,9 @@ def st_der():  # pragma: no cover
         | st_der_oid(),
         lambda children: st.builds(encode_octet_string, st.one_of(children))
         | st.builds(lambda x: encode_bitstring(x, 0), st.one_of(children))
-        | st.builds(lambda x: encode_sequence(*x), st.lists(children, max_size=200))
+        | st.builds(
+            lambda x: encode_sequence(*x), st.lists(children, max_size=200)
+        )
         | st.builds(
             encode_constructed,
             st.integers(min_value=0, max_value=0x3F),
@@ -418,7 +438,9 @@ def test_random_der_as_signature(params, der):
 
 @settings(**slow_params)
 @given(st.sampled_from(keys_and_sigs), st.binary(max_size=1024**2))
-@example(keys_and_sigs[0], encode_sequence(encode_integer(0), encode_integer(0)))
+@example(
+    keys_and_sigs[0], encode_sequence(encode_integer(0), encode_integer(0))
+)
 @example(
     keys_and_sigs[0],
     encode_sequence(encode_integer(1), encode_integer(1)) + b"\x00",

src/ecdsa/test_pyecdsa.py

@@ -32,15 +32,15 @@
     sigencode_der_canonize,
     sigencode_der_full_r,
     sigencode_der_sig_value_y_boolean,
-    sigencode_der_sig_value_y_field_elem
+    sigencode_der_sig_value_y_field_elem,
 )
 from .util import (
     sigdecode_der,
     sigdecode_strings,
     sigdecode_string,
     sigdecode_der_full_r,
-    sigdecode_der_extended
-    )
+    sigdecode_der_extended,
+)
 from .util import number_to_string, encoded_oid_ecPublicKey, MalformedSignature
 from .curves import Curve, UnknownCurveError
 from .curves import (
@@ -476,7 +476,9 @@ def test_sigencode_der_full_r_uncompressed(self):
         data = b"data"
         sig = priv1.sign(data, sigencode=sigencode_der_full_r, accelerate=True)
         r, s = sigdecode_der_full_r(sig, None)
-        point = ellipticcurve.Point.from_bytes(priv1.privkey.public_key.generator.curve(), r)
+        point = ellipticcurve.Point.from_bytes(
+            priv1.privkey.public_key.generator.curve(), r
+        )
         sig = sigencode_der_full_r(point, s, None, encoding="uncompressed")
 
         self.assertEqual(type(sig), binary_type)
@@ -488,7 +490,9 @@ def test_sigencode_der_full_r_compressed(self):
         data = b"data"
         sig = priv1.sign(data, sigencode=sigencode_der_full_r, accelerate=True)
         r, s = sigdecode_der_full_r(sig, None)
-        point = ellipticcurve.Point.from_bytes(priv1.privkey.public_key.generator.curve(), r)
+        point = ellipticcurve.Point.from_bytes(
+            priv1.privkey.public_key.generator.curve(), r
+        )
         sig = sigencode_der_full_r(point, s, None, encoding="compressed")
 
         self.assertEqual(type(sig), binary_type)
@@ -498,19 +502,27 @@ def test_sigencode_der_sig_value_with_y_boolean(self):
         priv1 = SigningKey.generate()
         pub1 = priv1.get_verifying_key()
         data = b"data"
-        sig = priv1.sign(data, sigencode=sigencode_der_sig_value_y_boolean,
-                         accelerate=True)
+        sig = priv1.sign(
+            data, sigencode=sigencode_der_sig_value_y_boolean, accelerate=True
+        )
         self.assertEqual(type(sig), binary_type)
-        self.assertTrue(pub1.verify(sig, data, sigdecode=sigdecode_der_extended))
+        self.assertTrue(
+            pub1.verify(sig, data, sigdecode=sigdecode_der_extended)
+        )
 
     def test_sigencode_der_sig_value_with_y_field_elem(self):
         priv1 = SigningKey.generate()
         pub1 = priv1.get_verifying_key()
         data = b"data"
-        sig = priv1.sign(data, sigencode=sigencode_der_sig_value_y_field_elem,
-                         accelerate=True)
+        sig = priv1.sign(
+            data,
+            sigencode=sigencode_der_sig_value_y_field_elem,
+            accelerate=True,
+        )
         self.assertEqual(type(sig), binary_type)
-        self.assertTrue(pub1.verify(sig, data, sigdecode=sigdecode_der_extended))
+        self.assertTrue(
+            pub1.verify(sig, data, sigdecode=sigdecode_der_extended)
+        )
 
     def test_sigencode_string_canonize_no_change(self):
         r = 12
@@ -2013,7 +2025,8 @@ def _do(self, generator, secexp, hsh, hash_func, expected):
 
     def test_SECP256k1(self):
         """RFC doesn't contain test vectors for SECP256k1 used in bitcoin.
-        This vector has been computed by Golang reference implementation instead."""
+        This vector has been computed by Golang reference implementation instead.
+        """
         self._do(
             generator=SECP256k1.generator,
             secexp=int("9d0219792467d7d37b4d43298a7d0c05", 16),