detect point

Author: gstarovo

.github/workflows/ci.yml

@@ -337,7 +337,7 @@ jobs:
         run: |
           # because tox uses pip, and pip is broken on py2.6, we need run the
           # tests directly on the system
-          coverage run --branch -m pytest -s
+          coverage run --branch -m pytest
       - name: Run unit tests
         if: ${{ matrix.tox-env }}
         run: tox -e ${{ matrix.tox-env }}

src/ecdsa/der.py

@@ -504,44 +504,3 @@ def topem(der, name):
         [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)
-
-
-def octet_string_to_integer(octet_string):
-    """
-    Converts an octet string to an integer
-    based on SECG SEC 1 v2.0, section 2.3.8.
-
-    :param octet_string: a bytes object representing the octet string
-    :type octet_string: bytes
-
-    :return: an integer x, converted from the octet string
-    :rtype: int
-    """
-    return int.from_bytes(octet_string, "big")
-
-
-def integer_to_octet_string(integer):
-    """
-    Converts an integer to an octet string
-
-    :param integer: integer to convert
-    :type integer: int
-
-    :return: a bytes object representing an octet string
-    :rtype: bytes
-    """
-    version = sys.version_info
-    if version[0] < 3 and version[1] < 7:
-        # bit_length() is not present in python 2.6
-        s = bin(integer)
-        s = s.lstrip('-0b')
-        int_len = len(s)
-    else:
-        int_len = integer.bit_length()
-    # For large integer, it is needed to calculate a sufficient length first
-    length = (max(int_len, 1) + 7) // 8
-    # int.to_bytes was added at python 3.2
-    # if version[0] < 3 or (version[0] == 3 and version[1] < 2):
-    return bytes(
-        (integer >> i * 8) & 0xFF for i in reversed(range(length)))
-    # return int.to_bytes(integer, length=length, byteorder="big")

src/ecdsa/ecdsa.py

@@ -194,7 +194,7 @@ def verifies(self, hash, signature, accelerate=False):
         s = signature.s
         if s < 1 or s > n - 1:
             return False
-        if accelerate:
+        if type(r) in {bytearray, bytes, memoryview}:
             point = ellipticcurve.AbstractPoint.from_bytes(
                 self.generator.curve(), r)
             r = point[0] % n

src/ecdsa/test_pyecdsa.py

@@ -490,16 +490,6 @@ def test_sigencode_der_full_r_compressed(self):
         r, s = sigdecode_der_full_r(sig, None)
         point = ellipticcurve.Point.from_bytes(priv1.privkey.public_key.generator.curve(), r)
         sig = sigencode_der_full_r(point, s, None, encoding="compressed")
-        print("print the sig length in r compressed")
-        print(len(sig))
-        r, s = sigdecode_der_full_r(sig, None)
-        print("right length of compressed r")
-        print(len(r))
-        print("right length of compressed s")
-        s_len = bin(s)
-        s_res = s_len.lstrip('-0b')
-        int_len = len(s_res)
-        print(int_len)
 
         self.assertEqual(type(sig), binary_type)
         self.assertTrue(pub1.verify(sig, data, sigdecode=sigdecode_der_full_r, accelerate=True))
@@ -510,17 +500,6 @@ def test_sigencode_der_sig_value_with_y_boolean(self):
         data = b"data"
         sig = priv1.sign(data, sigencode=sigencode_der_sig_value_y_boolean,
                          accelerate=True)
-        order = priv1.privkey.public_key.generator.order()
-        print("print the sig length in y boolean")
-        print(len(sig))
-        r, s = sigdecode_der_ecdsa_sig_value(sig, order)
-        print("length of failing encoded y as boolean")
-        print(len(r))
-        print("length of s failing encoded y as boolean")
-        s_len = bin(s)
-        s_res = s_len.lstrip('-0b')
-        int_len = len(s_res)
-        print(int_len)
         self.assertEqual(type(sig), binary_type)
         self.assertTrue(pub1.verify(sig, data, sigdecode=sigdecode_der_ecdsa_sig_value, accelerate=True))
 

src/ecdsa/util.py

@@ -671,15 +671,11 @@ def sigdecode_der_ecdsa_sig_value(sig_der, order):
     if optional[:1] == b"\x01":
         y, empty = der.remove_boolean(optional)
         r_octet = number_to_string(r, order)
-        print("the r_octet len")
-        print(len(r_octet))
         # In point compression True is odd b"\x03", False is even b"\x02"
         if y:
             r_point = b"\x03" + r_octet
         else:
             r_point = b"\x02" + r_octet
-        print("the r_point len")
-        print(len(r_point))
     elif optional[:1] == b"\x04":
         y, empty = der.remove_octet_string(optional)
         r_octet = number_to_string(r, order)