use number to string

Author: gstarovo

src/ecdsa/test_pyecdsa.py

@@ -475,9 +475,9 @@ def test_sigencode_der_full_r_uncompressed(self):
         pub1 = priv1.get_verifying_key()
         data = b"data"
         sig = priv1.sign(data, sigencode=sigencode_der_full_r, accelerate=True)
-        r, s = sigdecode_der_full_r(sig)
+        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, encoding="uncompressed")
+        sig = sigencode_der_full_r(point, s, None, encoding="uncompressed")
 
         self.assertEqual(type(sig), binary_type)
         self.assertTrue(pub1.verify(sig, data, sigdecode=sigdecode_der_full_r, accelerate=True))
@@ -487,12 +487,12 @@ def test_sigencode_der_full_r_compressed(self):
         pub1 = priv1.get_verifying_key()
         data = b"data"
         sig = priv1.sign(data, sigencode=sigencode_der_full_r, accelerate=True)
-        r, s = sigdecode_der_full_r(sig)
+        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, encoding="compressed")
+        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)
+        r, s = sigdecode_der_full_r(sig, None)
         print("right length of compressed r")
         print(len(r))
         print("right length of compressed s")
@@ -510,9 +510,10 @@ 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)
+        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")

src/ecdsa/util.py

@@ -277,7 +277,7 @@ def sigencode_string(r, s, order):
     return r_str + s_str
 
 
-def sigencode_der(r, s, order=None):
+def sigencode_der(r, s, order):
     """
     Encode the signature into the ECDSA-Sig-Value structure using :term:`DER`.
 
@@ -323,7 +323,7 @@ def sigencode_der_sig_value_y_boolean(r, s, order):
                                der.encode_boolean(b))
 
 
-def sigencode_der_full_r(r, s, order=None, encoding='raw'):
+def sigencode_der_full_r(r, s, order, encoding='raw'):
     """
     Encode the signature into the ECDSA-Sig-Value structure using :term:`DER`.
 
@@ -543,7 +543,7 @@ def sigdecode_strings(rs_strings, order):
     return r, s
 
 
-def sigdecode_der(sig_der, order=None):
+def sigdecode_der(sig_der, order):
     """
     Decoder for DER format of ECDSA signatures.
 
@@ -576,7 +576,7 @@ def sigdecode_der(sig_der, order=None):
     return sigdecode_der_ecdsa_sig_value(sig_der, order)
 
 
-def sigdecode_der_full_r(sig_der, order=None):
+def sigdecode_der_full_r(sig_der, order):
     """
     Decoder for DER format of ECDSA-Full-R signatures.
 
@@ -626,7 +626,7 @@ def sigdecode_der_full_r(sig_der, order=None):
     return r, s
 
 
-def sigdecode_der_ecdsa_sig_value(sig_der, order=None):
+def sigdecode_der_ecdsa_sig_value(sig_der, order):
     """
     Decoder for DER format of ECDSA-Sig-Value signatures.
 
@@ -670,7 +670,7 @@ def sigdecode_der_ecdsa_sig_value(sig_der, order=None):
         )
     if optional[:1] == b"\x01":
         y, empty = der.remove_boolean(optional)
-        r_octet = der.integer_to_octet_string(r)
+        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"
@@ -682,7 +682,7 @@ def sigdecode_der_ecdsa_sig_value(sig_der, order=None):
         print(len(r_point))
     elif optional[:1] == b"\x04":
         y, empty = der.remove_octet_string(optional)
-        r_octet = der.integer_to_octet_string(r)
+        r_octet = number_to_string(r, order)
         r_point = r_octet + y
     if empty != b"":
         raise der.UnexpectedDER(